X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java b/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java index eadc984..971e90e 100644 --- a/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java +++ b/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java @@ -15,6 +15,7 @@ import java.io.File; import java.io.FileNotFoundException; import net.sourceforge.phpdt.internal.corext.Assert; +import net.sourceforge.phpeclipse.PHPeclipsePlugin; /** @@ -24,14 +25,28 @@ public class PHPParserTestCase2 extends TestCase { PHPParser parser; - public PHPParserTestCase2(String name) { + public PHPParserTestCase2(final String name) { super(name); } + public void testPHPParserWithFiles() { + final String folderName = "phpfiles"; + final File dirName = new File(folderName); + Assert.isTrue(dirName.isDirectory() || dirName.exists()); + testDirectory(dirName); + } + + /** * Test the PHP Parser with different PHP snippets */ public void testPHPParser() { + checkHTML("$a;", true); + checkPHP("for ($this->i = 0;$this->i<2;$this->i++) {}", true); + checkPHP("for ($i = 2;$i<3;$i+= 3) {}", true); + checkPHP("function c($a,$b) {}", true); checkPHP("$a = $$tata;", true); checkPHP("$$tata=2;", true); checkPHP("$tata;", true); @@ -44,28 +59,28 @@ public class PHPParserTestCase2 extends TestCase { //checkHTML(new File("class.adm_gestuser.php")); checkHTML("", true); checkHTML("", true); + "echo $a; } ?>", true); checkHTML("" + - "\n dfgdfgfdfg" + - "\n" + - "\n" + - "" + - "dfgdfg" + - "\ndsfgdf", false); + "\n dfgdfgfdfg" + + "\n" + + "\n" + + "" + + "dfgdfg" + + "\ndsfgdf", false); checkHTML("" + - "\n dfgdfgfdfg" + - "\n" + - "\n" + - "", true); + "\n dfgdfgfdfg" + + "\n" + + "\n" + + "", true); checkHTML("sdfsdf ", true); checkHTML("\n\n\n\n ", true); checkHTML("", true); checkHTML(" foo ", true); - checkHTML(" ",true); + checkHTML(" ", true); //todo : fix this checkHTML("'; ?>",true); checkHTML("", true); checkHTML("", true); @@ -77,7 +92,7 @@ public class PHPParserTestCase2 extends TestCase { checkPHP("$a = array();", true); checkPHP("'caca';", true); checkPHP("if $cac a) echo 'coucou';", false); - checkPHP("$oka dd = 'a'.$i;$val = $$add;", false); + // checkPHP("$oka dd = 'a'.$i;$val = $$add;", false); checkPHP("($a==\"b\") || (c($this->x)==\"d\");", true); checkPHP("(substr($this->file, 0, 2) == \"MM\");", true); checkPHP("(substr($this->file, 0, 2) == \"MM\") || substr($this->file, 0, 2) == \"II\";", true); @@ -93,11 +108,11 @@ public class PHPParserTestCase2 extends TestCase { // checkPHP("$a == 0 ? print \"true\" : print \"false\";"); checkPHP("if(!$result = mysql_query($sql)) return(array());", true); checkPHP("class test { " + - " var $t;" + - " var $tutu,$toto;" + - " var $a = 2;" + - "function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) { }" + - "}", true); + " var $t;" + + " var $tutu,$toto;" + + " var $a = 2;" + + "function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) { }" + + "}", true); checkPHP("call_user_method_array($function_name[1], ${$objectname}, $arguments);", true); checkPHP("@$connect_function($dbhost, $user, $pw);", true); checkPHP("$conn = @$connect_function($dbhost, $user, $pw);", true); @@ -136,25 +151,25 @@ public class PHPParserTestCase2 extends TestCase { checkPHP("$AllowableHTML = array(\"b\"=>1,\n \"i\"=>1);", true); checkPHP("if ($term{0}!=$firstChar) {}", true); checkPHP( - "echo \"
\"._NOADMINYET.\"


\"\n" - + ".\"
\"\n" - + ".\"\"._NICKNAME.\":\"\n" - + ";", true); + "echo \"
\"._NOADMINYET.\"


\"\n" + + ".\"\"\n" + + ".\"\"._NICKNAME.\":\"\n" + + ";", true); checkPHP("/* \n overLib is from Eric Bosrup (http://www.bosrup.com/web/overlib/) \n */;", true); checkPHP("if ($arrAtchCookie[1]==0 && $IdAtchPostId!=null){ } ", true); checkPHP("$arrAtchCookie[1] -= filesize(realpath($AtchTempDir).\"/\".$xattachlist)/ 1024; ", true); 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 } ", true); + "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 } ", true); checkPHP("do {$array[] = array(\"$myrow[uid]\" => \"$myrow[uname]\"); } while($myrow = mysql_fetch_array($result));", true); checkPHP("$ol = new Overlib();", true); checkPHP("$risultato = mysql_query($sql) or\n die(mysql_error());", true); } - private void checkPHP(String strEval, boolean good) { + private void checkPHP(final String strEval, final boolean good) { ParseException ex = null; try { System.out.println("strEval = " + strEval); @@ -174,7 +189,7 @@ public class PHPParserTestCase2 extends TestCase { } } - private void checkHTML(String strEval, boolean good) { + private void checkHTML(final String strEval, final boolean good) { ParseException ex = null; try { System.out.println("strEval = " + strEval); @@ -194,7 +209,7 @@ public class PHPParserTestCase2 extends TestCase { } } - private void checkHTML(File strEval, boolean good) { + private void checkHTML(final File strEval, final boolean good) { ParseException ex = null; try { System.out.println("strEval = " + strEval.toString()); @@ -216,10 +231,25 @@ public class PHPParserTestCase2 extends TestCase { } } + private void testDirectory(final File file) { + if (file.isDirectory()) { + final File[] files = file.listFiles(); + for (int i = 0; i < files.length; i++) { + testDirectory(files[i]); + } + } else { + if (file.getName().toUpperCase().endsWith(".PHP")) { + checkHTML(file, true); + } + } + } + /** - * The JUnit setup method + * The JUnit setup method. */ protected void setUp() { + Assert.isTrue(PHPeclipsePlugin.PHPPARSER == PHPeclipsePlugin.PHPPARSER_NEW); + Assert.isTrue(PHPParser.PARSER_DEBUG); parser = (test.PHPParser) PHPParserManager.getParser(); }