Changeset 1000

Timestamp:

06/21/08 17:55:53 (2 months ago)

Author:

laurentj

Message:

added some tests for jTplCompiler and added an alias for 'assign' : eval

Files:

• trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/jtpl.expressions_parsing.html_cli.php (modified) (3 diffs)

trunk/lib/jelix/tpl/jTplCompiler.class.php

@@ -346 +346 @@
-
-            case 'assign':
+            case 'eval':
-                $res = $this->_parseFinal($args,$this->_allowedAssign).';';
-                break;

trunk/testapp/modules/jelix_tests/tests/jtpl.expressions_parsing.html_cli.php

@@ -11 +11 @@
-
-require_once(JELIX_LIB_PATH.'tpl/jTplCompiler.class.php');
+define('TEST_JTPL_COMPILER_ASSIGN',1);
-
-class testJtplCompiler extends jTplCompiler {
@@ -109 +110 @@
-
-
-
-
-    function testVarExprTrustedMode() {
-        $compil = new testJtplCompiler();
@@ -289 +288 @@
-    }
-
+
+    protected $varAssign = array(
+        '$aa=$bb'=>'$t->_vars[\'aa\']=$t->_vars[\'bb\']',
+        '$aa+=$bb'=>'$t->_vars[\'aa\']+=$t->_vars[\'bb\']',
+        '$aa-=$bb'=>'$t->_vars[\'aa\']-=$t->_vars[\'bb\']',
+        '$aa/=$bb'=>'$t->_vars[\'aa\']/=$t->_vars[\'bb\']',
+        '$aa*=$bb'=>'$t->_vars[\'aa\']*=$t->_vars[\'bb\']',
+        'TEST_JTPL_COMPILER_ASSIGN'=>'TEST_JTPL_COMPILER_ASSIGN'
+    );
+
+    protected $varAssignUnTrustedMode = array(
+        'TEST_JTPL_COMPILER_ASSIGN'=>array('jelix~errors.tpl.tag.constant.notallowed',array('','TEST_JTPL_COMPILER_ASSIGN','')),
+    );
+
+
+    function testAssign() {
+        $compil = new testJtplCompiler();
+        $compil->trusted = true;
+
+        foreach($this->varAssign as $k=>$t){
+            try{
+                $res = $compil->testParseAssignExpr($k);
+                $this->assertEqualOrDiff($t, $res);
+            }catch(jException $e){
+                $this->fail("Test '$k', Unknown Jelix Exception : ".$e->getMessage().' ('.$e->getLocaleKey().')');
+            }catch(Exception $e){
+                $this->fail("Test '$k', Unknown Exception: ".$e->getMessage());
+            }
+        }
+
+        $compil->trusted = false;
+
+        foreach($this->varAssignUnTrustedMode as $k=>$t){
+            try{
+                $res = $compil->testParseAssignExpr($k);
+                $this->fail("No Exception for this test '$k' ");
+            }catch(jException $e){
+                $this->assertEqualOrDiff($t[0], $e->getLocaleKey());
+                $this->assertEqual($t[1], $e->getLocaleParameters());
+            }catch(Exception $e){
+                $this->pass("Unknown Exception: ".$e->getMessage());
+            }
+
+        }
+    }
+
+
-}
-