1436190 - Test additions & refactoring
authoraxelcl <axelcl>
Mon, 10 Apr 2006 18:31:03 +0000 (18:31 +0000)
committeraxelcl <axelcl>
Mon, 10 Apr 2006 18:31:03 +0000 (18:31 +0000)
* These 2 JUnit test fail (invalid in PHP5 syntax - see Bug 1431425)
public void testMIInterfaceExtendsInterface();
public void testMIInterfaceImplementsInterface();

net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/internal/compiler/batch/CompilationUnit.java [deleted file]
net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/OverlibTestCase.java
net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/ShortTagTestCase.java
net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/SmartyCompilerTestCase.java

index 8659637..c334f5f 100644 (file)
@@ -251,6 +251,18 @@ public class AbstractCompilerTest extends TestCase {
                }
                return name;
        }
+       
+       protected void checkPHP(String strEval) {
+               checkPHP(strEval,"");
+       }
+       protected void checkPHP(String strEval, String expectedSyntaxErrorDiagnosis ) {
+               if (Scanner.DEBUG) {
+                       System.out.println("\n------------------------------------");
+                       System.out.println(strEval);
+               }
+               checkParsePHP(strEval.toCharArray(), expectedSyntaxErrorDiagnosis);
+       }
+
        protected void checkHTML(String strEval) {
            if (Scanner.DEBUG) {
              System.out.println("\n------------------------------------");
@@ -259,23 +271,5 @@ public class AbstractCompilerTest extends TestCase {
            checkParseHTML(
                strEval.toCharArray(),
                        "");
-       //    parser.phpParserTester(strEval, 1);
          }
-       //  private void checkHTML(String strEval) {
-       //    if (Scanner.DEBUG) {
-       //      System.out.println("\n------------------------------------");
-       //      System.out.println(strEval);
-       //    }
-       //    parser.parse(strEval);
-       //  }
-       //  /**
-       //   * The JUnit setup method
-       //   */
-       //  protected void setUp() {
-       //    parser = new Parser(null);
-       //  }
-
-//     public void initialize(CompilerTestSetup setUp) {
-//             this.complianceLevel = setUp.complianceLevel;
-//     }
 }
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/internal/compiler/batch/CompilationUnit.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/internal/compiler/batch/CompilationUnit.java
deleted file mode 100644 (file)
index 36ba8e7..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/***********************************************************************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **********************************************************************************************************************************/
-package net.sourceforge.phpdt.internal.compiler.batch;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.resources.IResource;
-
-import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
-import net.sourceforge.phpdt.internal.compiler.util.Util;
-
-public class CompilationUnit implements ICompilationUnit {
-  public char[] contents;
-
-  public char[] fileName;
-
-  public char[] mainTypeName;
-
-  String encoding;
-
-  public CompilationUnit(char[] contents, String fileName, String encoding) {
-    this.contents = contents;
-    if (File.separator.equals("/")) { //$NON-NLS-1$
-      if (fileName.indexOf("\\") != -1) { //$NON-NLS-1$
-        fileName = fileName.replace('\\', File.separatorChar);
-      }
-    } else {
-      // the file separator is \
-      if (fileName.indexOf('/') != -1) {
-        fileName = fileName.replace('/', File.separatorChar);
-      }
-    }
-    this.fileName = fileName.toCharArray();
-
-    int start = fileName.lastIndexOf("/") + 1; //$NON-NLS-1$
-    if (start == 0 || start < fileName.lastIndexOf("\\")) //$NON-NLS-1$
-      start = fileName.lastIndexOf("\\") + 1; //$NON-NLS-1$
-
-    int end = fileName.lastIndexOf("."); //$NON-NLS-1$
-    if (end == -1)
-      end = fileName.length();
-
-    this.mainTypeName = fileName.substring(start, end).toCharArray();
-    this.encoding = encoding;
-  }
-
-  public char[] getContents() {
-    if (this.contents != null)
-      return this.contents; // answer the cached source
-
-    // otherwise retrieve it
-    try {
-      return Util.getFileCharContent(new File(new String(this.fileName)), this.encoding);
-    } catch (IOException e) {
-      // assume no content then
-    }
-    return CharOperation.NO_CHAR;
-  }
-
-  public char[] getFileName() {
-    return this.fileName;
-  }
-
-  public char[] getMainTypeName() {
-    return this.mainTypeName;
-  }
-
-  public char[][] getPackageName() {
-    return null;
-  }
-
-  public String toString() {
-    return "CompilationUnit[" + new String(this.fileName) + "]"; //$NON-NLS-2$ //$NON-NLS-1$
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit#getResource()
-   */
-  public IResource getResource() {
-    return null;
-  }
-}
\ No newline at end of file
index 66b7d5d..44df779 100644 (file)
@@ -125,18 +125,18 @@ public class DualParseSyntaxErrorTest extends AbstractCompilerTest {
                        "       }                                                                               \n"+
                        "}                                                                                      \n";    
 
-               String expectedSyntaxErrorDiagnosis =
-                       "----------\n" + 
-                       "1. ERROR in  (at line 1)\n" + 
-                       "       murks;                                        \n" + 
-                       "       ^^^^^\n" + 
-                       "Parser error \"\'public\' \'private\' or \'protected\' modifier expected for field declarations.\"\n" + 
-                       "----------\n" + 
-                       "2. ERROR in  (at line 1)\n" + 
-                       "       }                                                                                       \n" + 
-                       "       ^\n" + 
-                       "Parser error \"Too many closing \'}\'; end-of-file not reached.\"\n" + 
-                       "----------\n";
+               String expectedSyntaxErrorDiagnosis = "----------\n" 
+                       + "1. ERROR in  (at line 1)\n"
+                       + "     murks;                                        \n" 
+                       + "     ^^^^^^\n"
+                       + "Parser error \"\'public\' \'private\' or \'protected\' modifier expected for field declarations.\"\n" 
+                       + "----------\n"
+//                     + "2. ERROR in  (at line 1)\n"
+//                     + "     }                                                                                       \n" 
+//                     + "     ^\n"
+//                     + "Parser error \"Too many closing \'}\'; end-of-file not reached.\"\n" 
+//                     + "----------\n"
+                       ;
 
                checkParsePHP(
                        s.toCharArray(),
index db9099e..54011e6 100644 (file)
@@ -477,24 +477,4 @@ public class OverlibTestCase extends AbstractCompilerTest {
                "\r\n" +
                "");
   }
-  private void checkPHP(String strEval) {
-    if (Scanner.DEBUG) {
-      System.out.println("\n------------------------------------");
-      System.out.println(strEval);
-    }
-    checkParsePHP(
-        strEval.toCharArray(),
-               "");
-//    parser.phpParserTester(strEval, 1);
-  }
-//  private void checkHTML(String strEval) {
-//    if (Scanner.DEBUG) {
-//      System.out.println("\n------------------------------------");
-//      System.out.println(strEval);
-//    }
-//    checkParseHTML(
-//        strEval.toCharArray(),
-//             "");
-////    parser.phpParserTester(strEval, 1);
-//  }
 }
index 5d2c0b7..3dd624b 100644 (file)
@@ -213,27 +213,4 @@ public class PHPManualTestCase extends AbstractCompilerTest {
     checkPHP("");
     checkPHP("");
   }
-  private void checkPHP(String strEval) {
-    if (Scanner.DEBUG) {
-      System.out.println("\n------------------------------------");
-      System.out.println(strEval);
-    }
-    checkParsePHP(
-        strEval.toCharArray(),
-               "");
-//    parser.phpParserTester(strEval, 1);
-  }
-//  private void checkHTML(String strEval) {
-//    if (Scanner.DEBUG) {
-//      System.out.println("\n------------------------------------");
-//      System.out.println(strEval);
-//    }
-//    parser.parse(strEval);
-//  }
-  /**
-   * The JUnit setup method
-   */
-//  protected void setUp() {
-//    parser = new Parser(null);
-//  }
 }
index ff9c420..0f9e6b8 100644 (file)
@@ -7,22 +7,151 @@ package net.sourceforge.phpeclipse.tests.parser;
  * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
  ******************************************************************************/
 import net.sourceforge.phpdt.core.tests.util.AbstractCompilerTest;
-import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 
 /**
  * Tests the php parser
  */
 public class PHPParserTestCase extends AbstractCompilerTest {
-       // Parser parser;
+
        public PHPParserTestCase(String name) {
                super(name);
        }
 
        /**
+        * Test the PHP Parser with failing PHP snippets
+        *
+        */
+       public void testPHPParserFailingSyntax() {
+               checkPHP("i=10;",
+                               "----------\n" + 
+                               "1. ERROR in  (at line 1)\n" + 
+                               "       i=10;\n" + 
+                               "        ^^\n" + 
+                               "Parser error \"Assignment operator \'=\' not allowed after identifier \'i\' (use \'define(...)\' to define constants).\"\n" + 
+                               "----------\n");
+       }
+       
+       /**
+        * Test Interface Extending multiple Interfaces
+        * 
+        * This is valid PHP5 syntax
+        * Bug 1431425
+        */
+       public void testMIInterfaceExtendsInterface() {
+               // valid PHP5
+               checkPHP("interface a {}\n"
+                               + "interface b {}\n"
+                               + "\n"
+                               + "interface c extends a, b\n"
+                               + "{}\n");
+       }
+       
+       /**
+        * Test Interface implementing multiple Interfaces
+        * 
+        * This is invalid PHP5 syntax
+        * Bug 1431425
+        */
+       public void testMIInterfaceImplementsInterface() {
+               // invalid PHP5
+               checkPHP("interface a {}\n"
+                               + "interface b {}\n"
+                               + "\n"
+                               + "interface c implements a, b\n"
+                               + "{}\n"
+                               ,
+                               "----------\n"
+                               + "1. ERROR in  (at line 1)\n"
+                               + "     interface c implements a, b\n"
+                               + "                 ^^^^^^^^^^^\n"
+                               + "Parser error \"'{' expected at start of class body.\"\n"
+                               + "----------\n"
+                               + "2. ERROR in  (at line 1)\n"
+                               + "     {}\n"
+                               + "\n"
+                               + "      ^^\n"
+                               + "Parser error \"Too many closing '}'; end-of-file not reached.\"\n"
+                               + "----------\n");
+               
+       }
+       
+       /**
+        * Test Class Extending multiple Interfaces
+        * 
+        * This is invalid PHP5 syntax
+        * Bug 1431425
+        */
+       public void testMIClassExtendsInterface() {
+               // invalid PHP5
+               checkPHP("interface a {}\n"
+                               + "interface b {}\n"
+                               + "\n"
+                               + "class c extends a, b\n"
+                               + "{}\n"
+                               ,"----------\n" + 
+                               "1. ERROR in  (at line 1)\n" + 
+                               "       class c extends a, b\n" + 
+                               "                        ^^\n" +  
+                               "Parser error \"No multiple inheritence allowed. Expected token \'implements\' or \'{\'.\"\n" + 
+                               "----------\n");
+       }
+       
+       /**
+        * Test Class implementing multiple Interfaces
+        * 
+        * This is valid PHP5 syntax
+        * Bug 1431425
+        */
+       public void testMIClassImplementsInterfaces() {
+               // valid PHP5
+               checkPHP("interface a {}\n"
+                               + "interface b {}\n"
+                               + "\n"
+                               + "class c implements a, b\n"
+                               + "{}\n");
+       }
+       
+       /**
+        * Test Class Implementing multiple classes
+        * 
+        * This is invalid PHP5 syntax
+        * Bug 1431425
+        */
+       public void testMIClassImplementsClasses() {
+               // invalid PHP5
+               checkPHP("class a {}\n"
+                               + "class b {}\n"
+                               + "\n"
+                               + "class c implements a, b\n"
+                               + "{}\n"
+                               ,"This should fail, but doesn't currently.");
+       }
+       
+       /**
+        * Test Class Extending multiple Classes
+        * 
+        * This is invalid PHP5 syntax
+        * Bug 1431425
+        */
+       public void testMIClassExtendsClasses() {
+               // invalid PHP5
+               checkPHP("class a {}\n"
+                               + "class b {}\n"
+                               + "\n"
+                               + "class c extends a, b\n"
+                               + "{}\n"
+                               ,"----------\n" + 
+                               "1. ERROR in  (at line 1)\n" + 
+                               "       class c extends a, b\n" + 
+                               "                        ^^\n" + 
+                               "Parser error \"No multiple inheritence allowed. Expected token \'implements\' or \'{\'.\"\n" + 
+                               "----------\n");
+       }
+       
+       /**
         * Test the PHP Parser with different PHP snippets
         */
-       public void testPHPParser() {
-               // checkPHP("i=10;"); // should get an error !
+       public void testPHPParserGoodSyntax() {
                checkPHP("$y=self::$x->huba;");
                checkPHP("self::x()->set();");
                checkPHP("$test=\"{4IP}/{$include}\";");
@@ -30,34 +159,49 @@ public class PHPParserTestCase extends AbstractCompilerTest {
                checkPHP("$schema_create .= \" DEFAULT \'$row[Default]\'\";");
                checkPHP("$stringVar=\"ein normaler $varText\";");
                checkPHP("$stringVar=\'ein normaler $varText\';");
-               checkPHP("switch ($aItem[ELM_NAME]) {\r\n" + "                case \'channel\':\r\n"
-                               + "                    $this->readChannel($aItem);\r\n" + "                    break;\r\n"
-                               + "                case \'item\':\r\n" + "                    $this->readItem($aItem);\r\n"
-                               + "                    break;\r\n" + "                default:\r\n" + "                    //printr($aItem);\r\n"
+               checkPHP("switch ($aItem[ELM_NAME]) {\r\n" 
+                               + "                case \'channel\':\r\n"
+                               + "                    $this->readChannel($aItem);\r\n" 
+                               + "                    break;\r\n"
+                               + "                case \'item\':\r\n" 
+                               + "                    $this->readItem($aItem);\r\n"
+                               + "                    break;\r\n" 
+                               + "                default:\r\n" 
+                               + "                    //printr($aItem);\r\n"
                                + "            }");
-               checkPHP("try {echo $Stream->readAll(); } catch (Exception $e) {\r\n" + "            // Swallow exception\r\n" + "        }");
+               checkPHP("try {echo $Stream->readAll(); } catch (Exception $e) {\r\n" 
+                               + "            // Swallow exception\r\n" + "        }");
 
-               checkHTML("<?php\n" + "   function overLib($path = \"\") {\n" + "\n" + "                if (strlen($path)) $this->ol_path = $path;\n"
-                               + "\n" + "?>\n" + "\n" + "<nolink rel=\'stylesheet\' href=<?php echo \"\'$this->ol_path/overlib.css\' \"; ?> \n" + "\n"
+               checkHTML("<?php\n" + "   function overLib($path = \"\") {\n" 
+                               + "\n" 
+                               + "             if (strlen($path)) $this->ol_path = $path;\n"
+                               + "\n" 
+                               + "?>\n" 
+                               + "\n" + "<nolink rel=\'stylesheet\' href=<?php echo \"\'$this->ol_path/overlib.css\' \"; ?> \n" 
+                               + "\n"
                                + "      type=\'text/css\'>\n" + "\n"
-                               + "<div id=\'overDiv\' style=\'position:absolute; visibility:hide; z-index: 1000;\'>\n" + "\n" + "</div>\n" + "\n"
-                               + "<script language=\'javascript\' src=<?php echo \"\'$this->ol_path/overlib.js\'\"; ?>>\n" + "\n" + "</script>\n" + "\n"
-                               + "<?php\n" + "\n" + "    } \n" + "?>");
+                               + "<div id=\'overDiv\' style=\'position:absolute; visibility:hide; z-index: 1000;\'>\n" 
+                               + "\n" + "</div>\n" 
+                               + "\n"
+                               + "<script language=\'javascript\' src=<?php echo \"\'$this->ol_path/overlib.js\'\"; ?>>\n" 
+                               + "\n" + "</script>\n" 
+                               + "\n"
+                               + "<?php\n" + "\n" 
+                               + "       } \n" 
+                               + "?>");
                checkPHP("$t = \') {$ya[]=\'.$this->iFunc.\';$xa[]=\'.$this->iXFunc.\';}\';");
                checkPHP("$output .=  \n" + "            \"\\$_smarty_tpl_vars = \\$this->_tpl_vars;\\n\" . \n"
                                + "            \"\\$this->_smarty_include(\".$include_file.\", array(\".implode(\',\', (array)$arg_list).\"));\\n\" .\n"
-                               + "            \"\\$this->_tpl_vars = \\$_smarty_tpl_vars;\\n\" .\n" + "            \"unset(\\$_smarty_tpl_vars);\\n\";");
+                               + "            \"\\$this->_tpl_vars = \\$_smarty_tpl_vars;\\n\" .\n" 
+                               + "            \"unset(\\$_smarty_tpl_vars);\\n\";");
                checkPHP("$test=\"=$post_id#$post_id\"");
                checkPHP("$comments .= \"        \\${$attrname}[\'xmlns\'] = \'{$this->namespaces[$_argtype[\'namespace\']]}\';\\n\";");
                checkPHP("$this->_raiseSoapFault(\"method \'{{$this->method_namespace}}$this->methodname\' not defined in service\",\'\',\'\',\'Server\');");
 
-               // checkPHP("$emailer->assign_vars(array(\r\n" +
-               // " \'U_TOPIC\' => $server_protocol . POST_POST_URL .
-               // \"=$post_id#$post_id\",\r\n" +
-               // " \'U_STOP_WATCHING_TOPIC\' => $server_protocol . $server_name .
-               // $server_port . $script_name . \'&\' . POST_TOPIC_URL .
-               // \"=$topic_id&unwatch=topic\")\r\n" +
-               // " );");
+               checkPHP("$emailer->assign_vars(array(\r\n" 
+                               + " \'U_TOPIC\' => $server_protocol . POST_POST_URL . \"=$post_id#$post_id\",\r\n"
+                               + " \'U_STOP_WATCHING_TOPIC\' => $server_protocol . $server_name . $server_port . $script_name . \'&\' . POST_TOPIC_URL . \"=$topic_id&unwatch=topic\")\r\n" 
+                               + " );");
                checkPHP("$_compile_data = \'<?php $_config_vars = unserialize(\\\'\' . str_replace(\'\\\'\',\'\\\\\\\'\', serialize($_config_vars)) . \'\\\'); return true; ?>\';");
                checkPHP("$output = \'<?php \';");
                checkPHP("$key_part = \'\';");
@@ -81,7 +225,7 @@ public class PHPParserTestCase extends AbstractCompilerTest {
                checkPHP("$this->raiseError(\"The auth mode: $mode isn\'t implemented\");");
                checkPHP("\'<img src=\"\'");
                checkPHP("$test=\"values(\'$user\',\'${res[\"name\"]}\',\'${res[\"position\"]}\',\'${res[\"ord\"]}\',\'${res[\"type\"]}\',\'${res[\"title\"]}\',\'${res[\"cache_time\"]}\',\'${res[\"rows\"]}\',\'${res[\"groups\"]}\',\'${res[\"params\"]}\')\";");
-               checkPHP("class tiki_phpOpenTracker extends TikiLib, phpOpenTracker { }");
+//             checkPHP("class tiki_phpOpenTracker extends TikiLib, phpOpenTracker { }");
                checkPHP("$template_source = $prefilter[0]($template_source, $this);");
                checkPHP("$keyval[] = $this->{$this->_keycolumn[$i]};");
                checkPHP("$this->_reg_objects[$object] =\n" + "     array(&$object_impl, $allowed, $smarty_args);");
@@ -134,7 +278,7 @@ public class PHPParserTestCase extends AbstractCompilerTest {
                checkPHP("$this->result_field_names[$result_id][] = odbc_field_name($result_id, $i);");
                checkPHP("$db->sql_query($sql);");
                checkPHP("$val = $$add;");
-               // checkPHP("if(!$result = mysql_query($sql)) return(array());");
+               checkPHP("if(!$result = mysql_query($sql)) return(array());");
                checkPHP("class test { function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) \n{ \n } \n }");
                // Bugs item #690938
                checkPHP("$ebus_sql['sel_url_list'] = <<<EOS\n" + "select rtrim(URL_NAME) as url_name\n" + "    , rtrim(URL) as url\n"
@@ -162,8 +306,7 @@ public class PHPParserTestCase extends AbstractCompilerTest {
                checkPHP("@$connect_function($dbhost, $user, $pw);");
                checkPHP("$conn = @$connect_function($dbhost, $user, $pw);");
                checkPHP("global ${$objectname}; ");
-               // checkPHP("class DB_mssql extends DB_common { var $connection; var
-               // $phptype, $dbsyntax; } ");
+               checkPHP("class DB_mssql extends DB_common { var $connection; var $phptype, $dbsyntax; } ");
                checkPHP("unset($this->blockvariables[$block][$varname]);");
                checkPHP("new IT_Error(\"The block '$block' was not found in the template.\", __FILE__, __LINE__);");
                checkPHP("for ($i=156, $j=0; $i<512; $i++, $j++) $v_checksum += ord(substr($v_binary_data_last,$j,1));");
@@ -174,8 +317,8 @@ public class PHPParserTestCase extends AbstractCompilerTest {
                checkPHP("function validateAndParseResponse($code, &$arguments) { }");
                checkPHP("$options = Console_Getopt::getopt($argv, \"h?v:e:p:d:\");");
                checkPHP("$this->container = new $container_class($container_options);");
-               // checkPHP("class Cmd extends PEAR { var $arrSetting = array(); }");
-               // checkPHP("class Cmd extends PEAR { var $arrSetting = array(), $i=10; }");
+               checkPHP("class Cmd extends PEAR { var $arrSetting = array(); }");
+               checkPHP("class Cmd extends PEAR { var $arrSetting = array(), $i=10; }");
                checkPHP("if (isset($test)) { } elseif (isset($lang)) { }");
                checkPHP("require_once(\"mainfile.php\");  ");
                checkPHP("if (eregi(\"footer.php\",$PHP_SELF)) {\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
@@ -206,30 +349,11 @@ public class PHPParserTestCase extends AbstractCompilerTest {
                                + "$message = str_replace(\"<BR>\", \"\\n\", $message); \n" + "$message = str_replace(\"<br>\", \"\\n\", $message); \n } ");
                checkPHP("$ol = new Overlib();");
                checkPHP("$risultato = mysql_query($sql) or\n    die(mysql_error());");
-               // checkHTML("\n\n\n\n <?php print \"Hello world\" ?>");
-               // checkHTML("<?php phpinfo(); ?>");
-               // checkHTML("<?php phpinfo()?>");
-               // checkHTML("<?php phpinfo(); ?> foo <?php phpinfo(); ?>");
-               // checkHTML(" <?php //this is a line comment ?>");
-               // checkHTML("<?php echo $module_name ?>");
-       }
-
-       private void checkPHP(String strEval) {
-               if (Scanner.DEBUG) {
-                       System.out.println("\n------------------------------------");
-                       System.out.println(strEval);
-               }
-               checkParsePHP(strEval.toCharArray(), "");
-               // parser.phpParserTester(strEval, 1);
+               checkHTML("\n\n\n\n <?php print \"Hello world\" ?>");
+               checkHTML("<?php phpinfo(); ?>");
+               checkHTML("<?php phpinfo()?>");
+               checkHTML("<?php phpinfo(); ?> foo <?php phpinfo(); ?>");
+               checkHTML(" <?php //this is a line comment ?>");
+               checkHTML("<?php echo $module_name ?>");
        }
-
-//     private void checkHTML(String strEval) {
-//             if (Scanner.DEBUG) {
-//                     System.out.println("\n------------------------------------");
-//                     System.out.println(strEval);
-//             }
-//             checkParseHTML(strEval.toCharArray(), "");
-//             // parser.phpParserTester(strEval, 1);
-//     }
-
 }
index 6924876..7351671 100644 (file)
@@ -21,7 +21,7 @@ public class ShortTagTestCase extends AbstractCompilerTest {
         */
        public void testPHPParser() {
                checkHTML("<?=$var?>");
-               checkHTML("<?=\"a\"; someOtherPHPCode(); ?>");
+               checkHTML("<?=\"a\", someOtherPHPCode(); ?>");
                checkHTML("<?= \"a\", \"b\" ?> text <?= \"a\", \"b\" ?>");
        }
 
index 6b1abb5..423d0de 100644 (file)
@@ -1903,14 +1903,4 @@ public class SmartyCompilerTestCase extends AbstractCompilerTest {
                "?>\r\n" +
                "");
   }
-  private void checkPHP(String strEval) {
-    if (Scanner.DEBUG) {
-      System.out.println("\n------------------------------------");
-      System.out.println(strEval);
-    }
-    checkParsePHP(
-        strEval.toCharArray(),
-               "");
-//    parser.phpParserTester(strEval, 1);
-  }
 }