Dev added unit tests for strings containing embedded newlines - shows…

… that they aren't being properly handled
LimeSurvey · Apr 4, 2012 · b07a0f9 · b07a0f9
1 parent 28fd390
commit b07a0f9
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/application/helpers/expressions/em_core_helper.php b/application/helpers/expressions/em_core_helper.php
@@ -1319,9 +1319,11 @@ public function GetJavascriptTestforExpression($expected,$num)
         if (is_null($expr) || $expr == '') {
             $expr = "'NULL'";
         }
+        $jsmultiline_expr = str_replace("\n","\\\n",$expr);
+        $jsmultiline_expected = str_replace("\n","\\\n",addslashes($expected));
         $jsParts = array();
-        $jsParts[] = "val = " . $expr . ";\n";
-        $jsParts[] = "klass = (LEMeq(addslashes(val),'" . addslashes($expected) . "')) ? 'ok' : 'error';\n";
+        $jsParts[] = "val = " . $jsmultiline_expr . ";\n";
+        $jsParts[] = "klass = (LEMeq(addslashes(val),'" . $jsmultiline_expected . "')) ? 'ok' : 'error';\n";
         $jsParts[] = "document.getElementById('test_" . $num . "').innerHTML=(val);\n";
         $jsParts[] = "document.getElementById('test_" . $num . "').className=klass;\n";
         return implode('',$jsParts);
@@ -2306,6 +2308,7 @@ private function RDP_Tokenize($src)
                         if ($this->RDP_TokenType[$i] == 'DQ_STRING' || $this->RDP_TokenType[$i] == 'SQ_STRING')
                         {
                             // remove outside quotes
+//                            $unquotedToken = str_replace(array('\"',"\'","\\\\",'\n','\r','\t'),array('"',"'",'\\',"\n","\n","\t"),substr($token,1,-1));
                             $unquotedToken = str_replace(array('\"',"\'","\\\\"),array('"',"'",'\\'),substr($token,1,-1));
                             $tokens0[$j][0] = $unquotedToken;
                         }
@@ -2353,7 +2356,10 @@ static function UnitTestStringSplitter()
 
         $em = new ExpressionManager();
 
-        foreach(explode("\n",$tests) as $test)
+        $atests = explode("\n",$tests);
+        array_push($atests,'"hi\nthere\nhow\nare\nyou?\n"');
+
+        foreach($atests as $test)
         {
             $tokens = $em->asSplitStringOnExpressions($test);
             print '<b>' . $test . '</b><hr/>';
@@ -2460,7 +2466,7 @@ static function UnitTestEvaluator()
 '12X3X5lab1_ber#1' => array('sgqa'=>'12X3X5lab1_ber#1', 'code'=> 15, 'jsName'=>'', 'readWrite'=>'N', 'gseq'=>1,'qseq'=>1),
 'zero' => array('sgqa'=>'zero', 'code'=>0, 'jsName'=>'java_zero', 'gseq'=>0,'qseq'=>0),
 'empty' => array('sgqa'=>'empty', 'code'=>'', 'jsName'=>'java_empty', 'gseq'=>0,'qseq'=>0),
-'BREAKS' => array('sgqa'=>'BREAKS', 'code'=>'1\n2\n3', 'jsName'=>'', 'readWrite'=>'N'),
+'BREAKS' => array('sgqa'=>'BREAKS', 'code'=>"1\n2\n3", 'jsName'=>'', 'readWrite'=>'N'),
         );
 
         // Syntax for $tests is
@@ -2585,7 +2591,6 @@ static function UnitTestEvaluator()
 1~min(five,four,one,two,three)
 1344765967~mktime(5,6,7,8)
 1144191723~mktime(1,2,3,4,5,6)
-1\\n2\\n3~nl2br(BREAKS)
 1,000~number_format(1000)
 1,000.23~number_format(1000.23)
 1,234,567~number_format(1234567)
@@ -2594,7 +2599,6 @@ static function UnitTestEvaluator()
 4~pow(2,2)
 27~pow(3,3)
 =~quoted_printable_decode(quoted_printable_encode('='))
-1\\n2\\n3=~nl2br(quoted_printable_decode(quoted_printable_encode(BREAKS)+'='))
 \\$~quotemeta('$')
 IGNORE THIS ERROR~rand(3,5)
 0~(a=rand())-a
@@ -2835,6 +2839,12 @@ static function UnitTestEvaluator()
 NULL~max()
 EOD;
 
+        $atests = explode("\n",$tests);
+        $atests[] = "1\n2\n3~BREAKS";
+        $atests[] = "1<br />\n2<br />\n3~nl2br(BREAKS)";
+        $atests[] = "hi<br />\nthere<br />\nhow<br />\nare<br />\nyou?~nl2br('hi\\nthere\\nhow\\nare\\nyou?')";
+        $atests[] = "hi<br />\nthere,<br />\nuser!~nl2br(implode('\\n','hi','there,','user!'))";
+
         $LEM =& LimeExpressionManager::singleton();
         $em = new ExpressionManager();
         $LEM->setTempVars($vars);
@@ -2854,7 +2864,7 @@ static function UnitTestEvaluator()
         $body .= '<table border="1"><tr><th>Expression</th><th>PHP Result</th><th>Expected</th><th>JavaScript Result</th><th>VarNames</th><th>JavaScript Eqn</th></tr>';
         $i=0;
         $javaScript = array();
-        foreach(explode("\n",$tests)as $test)
+        foreach($atests as $test)
         {
             ++$i;
             $values = explode("~",$test);