X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java
index 72fe1ff..d921054 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java
@@ -1,27 +1,25 @@
 package test;
-
 /**********************************************************************
- Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de
- 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
- **********************************************************************/
+Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de
+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
+**********************************************************************/
+
 
+import org.eclipse.core.runtime.CoreException;
 import junit.framework.TestCase;
 
 import java.io.CharArrayReader;
-import java.io.InputStream;
-
 
-import org.eclipse.core.runtime.CoreException;
 
 /**
  *  Tests the php parser
  */
 public class PHPParserTestCase2 extends TestCase {
 
-  PHPParser2 phpparser;
+  PHPParser parser;
 
   public PHPParserTestCase2(String name) {
     super(name);
@@ -31,32 +29,84 @@ public class PHPParserTestCase2 extends TestCase {
    *  Test the PHP Parser with different PHP snippets
    */
   public void testPHPParser() {
-    checkPHP("$b = $c;");
-    checkPHP("$b = ($c);");
-    checkPHP("$b = ($b) ? $a : $c;");
-    checkPHP("$b = $b.$a && $f.'a' || 'n '.$b;");
-    checkPHP("$toto = 0;");
-    checkPHP("$toto = \"tata\";");
-    checkPHP("$toto = 'tata';");
-    checkPHP("$$a = 'toto';");
-    checkPHP("$add = 'a'.$i;");
-    checkPHP("$add = 'a'.$i;$val = $$add;");
-    checkPHP("$a==2;");
-    checkPHP("($a==\"b\") || c($this->x)==\"d\";");
+    checkHTML("<?php  $a = &$b; ?>");
+    checkHTML("<?php ec ho 'coucou'; ?>" +
+              "\n dfgdfgfdfg" +
+              "\n" +
+              "\n" +
+              "<?php" +
+              "\necho ' caca';" +
+              "\n?>" +
+              "dfgdfg" +
+              "\ndsfgdf");
+    checkHTML("<?php echo 'coucou'; ?>" +
+              "\n dfgdfgfdfg" +
+              "\n" +
+              "\n" +
+              "<?php" +
+              "\necho ' caca';" +
+              "\n?>");
+    checkHTML("<?php" +
+              "\n//if (!isset($AtreidesLanguage)) $AtreidesLanguage='french';" +
+              "\n$AtreidesLanguage='french';" +
+              "\n$for = 1;" +
+              "\n\ninclude_once('php/template.inc');" +
+              "\ninclude ' php/class.PHPLIBTemplateAdaptor.php';" +
+              "\ninclude 'php/class.CachedTemplate.php';" +
+              "\n$_PHPLIB['libdir']='php/';" +
+              "\ninclude 'php/oohforms.inc';" +
+              "\n include 'objet/outil.php';" +
+              "\ninclude 'objet/metier.php';" +
+              "\ninclude 'php/db_mysql.inc';" +
+              "\ninclude 'objet/db5.php';" +
+              "\ninclude 'objet/gui.php';" +
+              "\ninclude 'objet/application.php';" +
+              "\n//----------------------------------------------------" +
+              "\n//                    Objets du site" +
+              "\n//----------------------------------------------------" +
+              "\n//             Objets de base de donnée" +
+              "\ninclude 'atreides/db_soft.php';" +
+              "\n//             Objets metier" +
+              "\ninclude 'atreides/soft.php';" +
+              "\n//             Objets application" +
+              "\ninclude 'atreides/atreides.php';" +
+              "\n$AtreidesTheme='normal/$AtreidesLanguage';" +
+              "\nif(Vide($oCentral)) $oCentral='Soft';" +
+              "\nif (vide($oModeCentral)) $oModeCentral = 'recherche';" +
+              "\nif (Vide($theme)) $theme='normal';" +
+              "\nif (Vide($mode)) $mode='visu';" +
+              "\n$Atreides=new Atreides($mode,$ini);" +
+              "\n$Atreides->tabAffich['oModeCentral']=$oModeCentral;" +
+              "\nob_start('ob_gzhandler');" +
+              "\necho $Atreides->vueMetier('visu',$AtreidesTheme);" +
+              "\n?>");
+    checkHTML("<html>sdfsdf  <?php phpinfo(); ?>");
+    checkHTML("\n\n\n\n  <?php print \"Hello world\"?> ");
+    checkHTML("<?php phpinfo()?>");
+    checkHTML("<?php phpinfo(); ?> foo <?php phpinfo(); ?>");
+    checkHTML(" <?php //this is a line comment ?>");
+    checkPHP("'caca'");
+    checkPHP("if $cac a) echo 'coucou';");
+    checkPHP("$oka dd = 'a'.$i;$val = $$add;");
+    checkPHP("($a==\"b\") || (c($this->x)==\"d\");");
     checkPHP("(substr($this->file, 0, 2) == \"MM\");");
     checkPHP("(substr($this->file, 0, 2) == \"MM\") || substr($this->file, 0, 2) == \"II\";");
     checkPHP("return (substr($this->file, 0, 2) == \"MM\") || substr($this->file, 0, 2) == \"II\";");
+    checkPHP("$this->highlightfile->linkscripts{$category};");
+    checkPHP("$code = call_user_method($this->highlightfile->linkscripts{$category}, $this->highlightfile, $oldword, $this->output_module);");
     checkPHP("$this->startmap[$startcurrtag]();");
     checkPHP("new $this->startmap[$startcurrtag]();");
     checkPHP("$this->highlightfile = new $this->startmap[$startcurrtag]();");
     checkPHP("echo \"Test\", \"me\";");
     checkPHP("print (\"Test me\");");
-//    checkPHP("$s = <<<HEREDOC \n dskjfhskj\n \n\nHEREDOC;"); invalid
-    checkPHP("$a == 0 ? print (\"true\") : print (\"false\");");
+//    checkPHP("$s = <<<HEREDOC \n dskjfhskj\n \n\nHEREDOC;");
+//    checkPHP("$a == 0 ? print \"true\" : print \"false\";");
     checkPHP("if(!$result = mysql_query($sql)) return(array());");
     checkPHP("class test { function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) \n{ \n } \n }");
+    checkPHP("call_user_method_array($function_name[1], ${$objectname}, $arguments);");
     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("unset($this->blockvariables[$block][$varname]);");
     checkPHP("new IT_Error(\"The block '$block' was not found in the template.\", __FILE__, __LINE__);");
@@ -73,6 +123,8 @@ public class PHPParserTestCase2 extends TestCase {
     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");
+    checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) {\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
+    checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) :\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "endwhile;\n");
     checkPHP("$tipath = \"images/topics/\";");
     checkPHP("$reasons = array(\"1\", \"2\",\"test\");");
     checkPHP("if ($home == 1) { message_box(); blocks(Center);}");
@@ -87,47 +139,54 @@ public class PHPParserTestCase2 extends TestCase {
     checkPHP("$message .= \"\"._THISISAUTOMATED.\"\\n\\n\";");
     checkPHP("if (!empty($pass) AND $pass==$passwd) { }");
     checkPHP("$AllowableHTML = array(\"b\"=>1,\n \"i\"=>1);");
+    checkPHP("if ($term{0}!=$firstChar) {}");
     checkPHP(
       "echo \"<center><b>\"._NOADMINYET.\"</b></center><br><br>\"\n"
         + ".\"<form action=\\\"admin.php\\\" method=\\\"post\\\">\"\n"
         + ".\"<tr><td><b>\"._NICKNAME.\":</b></td><td><input type=\\\"text\\\" name=\\\"name\\\" size=\\\"30\\\" maxlength=\\\"25\\\"></td></tr>\"\n"
         + ";");
-    checkPHP("/* \n overLib is from Eric Bosrup (http://www.bosrup.com/web/overlib/) \n */");
+    checkPHP("/* \n overLib is from Eric Bosrup (http://www.bosrup.com/web/overlib/) \n */;");
     checkPHP("if ($arrAtchCookie[1]==0 && $IdAtchPostId!=null){  } ");
     checkPHP("$arrAtchCookie[1] -= filesize(realpath($AtchTempDir).\"/\".$xattachlist)/ 1024; ");
-    checkPHP("$ol = new Overlib();");
-    checkPHP("$risultato = mysql_query($sql) or\n    die(mysql_error());");
     checkPHP(
       "if (!isset($message)){ \n"
         + "$message = $myrow[post_text];\n"
         + "$message = eregi_replace(\"\\[addsig]\", \"\\n-----------------\\n\" .    $myrow[user_sig], $message); \n"
         + "$message = str_replace(\"<BR>\", \"\\n\", $message); \n"
         + "$message = str_replace(\"<br>\", \"\\n\", $message); \n } ");
-    checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) {\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
-    checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) :\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "endwhile;\n");
-    checkPHP("if ($term{0}!=$firstChar) {}");
-    checkPHP("$this->highlightfile->linkscripts{$category};");
-    checkPHP("$code = call_user_method($this->highlightfile->linkscripts{$category}, $this->highlightfile, $oldword, $this->output_module);");
-    checkPHP("call_user_method_array($function_name[1], ${$objectname}, $arguments);");
-    checkPHP("global ${$objectname};");
     checkPHP("do {$array[] = array(\"$myrow[uid]\" => \"$myrow[uname]\"); } while($myrow = mysql_fetch_array($result));");
+    checkPHP("$ol = new Overlib();");
+    checkPHP("$risultato = mysql_query($sql) or\n    die(mysql_error());");
   }
 
   private void checkPHP(String strEval) {
     try {
       System.out.println("strEval = " + strEval);
-      phpparser.ReInit(new CharArrayReader(strEval.toCharArray()));
-      phpparser.parse();
+      parser.phpParserTester(strEval);
+    } catch (CoreException e) {
+      e.printStackTrace();
+    } catch (ParseException e) {
+      e.printStackTrace();
+    }
+
+  }
+  private void checkHTML(String strEval) {
+    try {
+      System.out.println("strEval = " + strEval);
+      parser.htmlParserTester(strEval);
+    } catch (CoreException e) {
+      e.printStackTrace();
     } catch (ParseException e) {
-      System.out.println(strEval);
       e.printStackTrace();
     }
+
   }
 
   /**
    *  The JUnit setup method
    */
   protected void setUp() {
-    phpparser = new PHPParser2(new CharArrayReader("".toCharArray()));
+    parser = (test.PHPParser) PHPParserManager.getParser();
   }
+
 }