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 04cf8cc..72fe1ff 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java @@ -9,13 +9,11 @@ package test; **********************************************************************/ import junit.framework.TestCase; -import test.PHPParser2; -import test.ParseException; import java.io.CharArrayReader; import java.io.InputStream; -import net.sourceforge.phpeclipse.phpeditor.phpparser.PHPParser; + import org.eclipse.core.runtime.CoreException; /** @@ -97,7 +95,6 @@ public class PHPParserTestCase2 extends TestCase { 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("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());"); checkPHP( @@ -109,14 +106,16 @@ public class PHPParserTestCase2 extends TestCase { 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("$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("global ${$objectname};"); + checkPHP("do {$array[] = array(\"$myrow[uid]\" => \"$myrow[uname]\"); } while($myrow = mysql_fetch_array($result));"); } private void checkPHP(String strEval) { try { + System.out.println("strEval = " + strEval); phpparser.ReInit(new CharArrayReader(strEval.toCharArray())); phpparser.parse(); } catch (ParseException e) {