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..b566bf6 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTestCase2.java @@ -1,29 +1,26 @@ 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 test.PHPParser2; -import test.ParseException; import java.io.CharArrayReader; -import java.io.InputStream; +import java.io.File; -import net.sourceforge.phpeclipse.phpeditor.phpparser.PHPParser; -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); @@ -33,32 +30,50 @@ 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(new File("class.adm_gestuser.php")); + checkHTML("" + + "\n dfgdfgfdfg" + + "\n" + + "\n" + + "" + + "dfgdfg" + + "\ndsfgdf"); + checkHTML("" + + "\n dfgdfgfdfg" + + "\n" + + "\n" + + ""); + checkHTML("sdfsdf "); + checkHTML("\n\n\n\n "); + checkHTML(""); + checkHTML(" foo "); + checkHTML(" "); + 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 = <<blockvariables[$block][$varname]);"); checkPHP("new IT_Error(\"The block '$block' was not found in the template.\", __FILE__, __LINE__);"); @@ -75,6 +90,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);}"); @@ -89,46 +106,65 @@ 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 \"
\"._NOADMINYET.\"


\"\n" + ".\"
\"\n" + ".\"\"._NICKNAME.\":\"\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("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( "if (!isset($message)){ \n" + "$message = $myrow[post_text];\n" + "$message = eregi_replace(\"\\[addsig]\", \"\\n-----------------\\n\" . $myrow[user_sig], $message); \n" + "$message = str_replace(\"
\", \"\\n\", $message); \n" + "$message = str_replace(\"
\", \"\\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 { - phpparser.ReInit(new CharArrayReader(strEval.toCharArray())); - phpparser.parse(); + System.out.println("strEval = " + strEval); + 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(); } + } + private void checkHTML(File strEval) { + try { + System.out.println("strEval = " + strEval.toString()); + parser.htmlParserTester(strEval); + } catch (CoreException e) { + e.printStackTrace(); + } catch (ParseException e) { + e.printStackTrace(); + } + + } /** * The JUnit setup method */ protected void setUp() { - phpparser = new PHPParser2(new CharArrayReader("".toCharArray())); + parser = (test.PHPParser) PHPParserManager.getParser(); } + }