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

diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
index 6091e18..d7759ea 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
@@ -1,44 +1,39 @@
 package net.sourceforge.phpeclipse.tests.parser;
-/**********************************************************************
-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 junit.framework.*;
-import net.sourceforge.phpdt.internal.compiler.parser.*;
-
-import org.eclipse.core.runtime.*;
-
+/*******************************************************************************
+ * 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 net.sourceforge.phpdt.core.tests.util.AbstractCompilerTest;
+import net.sourceforge.phpdt.internal.compiler.parser.Parser;
+import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 /**
- *  Tests the php parser
+ * Tests the php parser
  */
-public class PHPParserTestCase extends TestCase {
-
-  Parser parser;
-
+public class PHPParserTestCase extends AbstractCompilerTest {
+//  Parser parser;
   public PHPParserTestCase(String name) {
     super(name);
   }
-
   /**
-   *  Test the PHP Parser with different PHP snippets
+   * Test the PHP Parser with different PHP snippets
    */
   public void testPHPParser() {
+    checkHTML("<?php echo $bgcolor2?>");
+    checkPHP("if ($topic<1) { $topic = 1;}");
+    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("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"
-        + "	, rtrim(URL_DESC) as url_desc\n"
-        + "from appl_url\n"
+    checkPHP("$ebus_sql['sel_url_list'] = <<<EOS\n"
+        + "select rtrim(URL_NAME) as url_name\n" + "	, rtrim(URL) as url\n"
+        + "	, rtrim(URL_DESC) as url_desc\n" + "from appl_url\n"
         + "where appl_instnc_sk = <<INSTNC>>\n"
-        + "and appl_sect_deftn_sk = <<SECT>>\n"
-        + "order by url_ord\n"
+        + "and appl_sect_deftn_sk = <<SECT>>\n" + "order by url_ord\n"
         + "EOS;\n");
-
     checkPHP("foreach ($HTTP_GET_VARS as $secvalue) { }");
     checkPHP("\"\\\"\";");
     checkPHP("\"\\[addsig]\"");
@@ -57,13 +52,11 @@ public class PHPParserTestCase extends TestCase {
     checkPHP("print (\"Test me\");");
     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("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));");
@@ -74,25 +67,16 @@ public class PHPParserTestCase extends TestCase {
     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");
-    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 (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);}");
@@ -106,16 +90,14 @@ public class PHPParserTestCase extends TestCase {
     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"
+    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("if ($arrAtchCookie[1]==0 && $IdAtchPostId!=null){  } ");
     checkPHP("$arrAtchCookie[1] -= filesize(realpath($AtchTempDir).\"/\".$xattachlist)/ 1024; ");
-    checkPHP(
-      "if (!isset($message)){ \n"
+    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"
@@ -123,42 +105,44 @@ public class PHPParserTestCase extends TestCase {
     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());");
-
-    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 ?>");
+//    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) {
-    try {
-      if (Scanner.DEBUG) {
-        System.out.println("\n------------------------------------");
-        System.out.println(strEval);
-      }
-      parser.phpParserTester(strEval, 1);
-    } catch (CoreException e) {
+    if (Scanner.DEBUG) {
+      System.out.println("\n------------------------------------");
+      System.out.println(strEval);
     }
+    checkParsePHP(
+        strEval.toCharArray(),
+		"");
+//    parser.phpParserTester(strEval, 1);
   }
-
   private void checkHTML(String strEval) {
-    try {
-      if (Scanner.DEBUG) {
-        System.out.println("\n------------------------------------");
-        System.out.println(strEval);
-      }
-      parser.parse(strEval);
-    } catch (CoreException e) {
+    if (Scanner.DEBUG) {
+      System.out.println("\n------------------------------------");
+      System.out.println(strEval);
     }
+    checkParseHTML(
+        strEval.toCharArray(),
+		"");
+//    parser.phpParserTester(strEval, 1);
   }
-
-  /**
-   *  The JUnit setup method
-   */
-  protected void setUp() {
-    parser = new Parser(null);
-  }
-
+//  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);
+//  }
 }