From ab9347921abd784e2abea36dd0a7ede5bbe6f489 Mon Sep 17 00:00:00 2001 From: kpouer Date: Sat, 9 Aug 2003 18:31:09 +0000 Subject: [PATCH 1/1] when you check php or html you have now to tell if the parser should throw an exception or not (is it good or bad syntax ?) --- .../src/test/PHPParserTestCase2.java | 201 +++++++++++--------- 1 files changed, 112 insertions(+), 89 deletions(-) diff --git a/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java b/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java index 28f2a6e..6029b6e 100644 --- a/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java +++ b/net.sourceforge.phpeclipse.tests/src/test/PHPParserTestCase2.java @@ -9,11 +9,12 @@ package test; **********************************************************************/ -import org.eclipse.core.runtime.CoreException; import junit.framework.TestCase; -import java.io.CharArrayReader; import java.io.File; +import java.io.FileNotFoundException; + +import net.sourceforge.phpdt.internal.corext.Assert; /** @@ -31,10 +32,12 @@ public class PHPParserTestCase2 extends TestCase { * Test the PHP Parser with different PHP snippets */ public void testPHPParser() { + checkPHP("$tata = $bobo;",true); + checkPHP("function test() { $tata = $b; echo $b;}",true); //checkHTML(new File("class.adm_gestuser.php")); - checkHTML(""); + checkHTML("",true); checkHTML(""); + "echo $a; } ?>",true); checkHTML("" + "\n dfgdfgfdfg" + "\n" + @@ -43,127 +46,147 @@ public class PHPParserTestCase2 extends TestCase { "\necho ' caca';" + "\n?>" + "dfgdfg" + - "\ndsfgdf"); + "\ndsfgdf",false); 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\");"); + "\n?>",true); + checkHTML("sdfsdf ",true); + checkHTML("\n\n\n\n ",true); + checkHTML("",true); + checkHTML(" foo ",true); + //todo : fix this checkHTML(" "); +//todo : fix this checkHTML("'; ?>",true); + checkHTML("",true); + checkHTML("",true); + checkHTML("",true); + checkHTML("",true); + checkHTML("",true); + checkHTML("",true); + + checkPHP("$a = array();",true); + checkPHP("'caca';",true); + checkPHP("if $cac a) echo 'coucou';",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); + checkPHP("return (substr($this->file, 0, 2) == \"MM\") || substr($this->file, 0, 2) == \"II\";",true); + checkPHP("$this->highlightfile->linkscripts{$category};",true); + checkPHP("$code = call_user_method($this->highlightfile->linkscripts{$category}, $this->highlightfile, $oldword, $this->output_module);",true); + checkPHP("$this->startmap[$startcurrtag]();",true); + checkPHP("new $this->startmap[$startcurrtag]();",true); + checkPHP("$this->highlightfile = new $this->startmap[$startcurrtag]();",true); + checkPHP("echo \"Test\", \"me\";",true); + checkPHP("print (\"Test me\");",true); // checkPHP("$s = <<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));"); - checkPHP("define('MAIL_MIME_CRLF', $crlf, true);"); - checkPHP("static $last_run = 0;"); - checkPHP("unset($headers['Subject']);"); - checkPHP("switch($func) {\n case \"f0\":\n case \"f1\":\n f1();\n break; \n case \"tt\": \n default: \n f0(); \n break;\n }"); - 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("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);}"); - checkPHP("$bresult = sql_query(\"select * from \".$prefix.\"_banner WHERE type='0' AND active='1'\", $dbi);"); - checkPHP("switch($func) {\n case \"f1\":\n f1();\n break; \n default: \n f0(); \n break;\n }"); - checkPHP("list ($catid) = sql_fetch_row($result, $dbi);"); - checkPHP("if (!$name) { \n }"); - checkPHP("mt_srand((double)microtime()*1000000);"); - checkPHP("\"\\\"\";"); - checkPHP("$v->read();"); - checkPHP("$alttext = ereg_replace(\"\\\"\", \"\", $alttext);"); - 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("if(!$result = mysql_query($sql)) return(array());",true); + checkPHP("class test { function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) \n{ \n } \n }",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); + checkPHP("global ${$objectname}; ",true); + checkPHP("class DB_mssql extends DB_common { var $connection; var $phptype, $dbsyntax; } ",true); + checkPHP("unset($this->blockvariables[$block][$varname]);",true); + checkPHP("new IT_Error(\"The block '$block' was not found in the template.\", __FILE__, __LINE__);",true); + checkPHP("for ($i=156, $j=0; $i<512; $i++, $j++) $v_checksum += ord(substr($v_binary_data_last,$j,1));",true); + checkPHP("define('MAIL_MIME_CRLF', $crlf, true);",false); + checkPHP("static $last_run = 0;",true); + checkPHP("unset($headers['Subject']);",true); + checkPHP("switch($func) {\n case \"f0\":\n case \"f1\":\n f1();\n break; \n case \"tt\": \n default: \n f0(); \n break;\n }",true); + checkPHP("function validateAndParseResponse($code, &$arguments) { }",true); + checkPHP("$options = Console_Getopt::getopt($argv, \"h?v:e:p:d:\");",true); + checkPHP("$this->container = new $container_class($container_options);",true); + checkPHP("class Cmd extends PEAR { var $arrSetting = array(); }",true); + checkPHP("class Cmd extends PEAR { var $arrSetting = array(), $i=10; }",true); + checkPHP("if (isset($test)) { } elseif (isset($lang)) { }",true); + checkPHP("require_once(\"mainfile.php\"); ",true); + checkPHP("if (eregi(\"footer.php\",$PHP_SELF)) {\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n",true); + checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) {\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n",true); + checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) :\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "endwhile;\n",true); + checkPHP("$tipath = \"images/topics/\";",true); + checkPHP("$reasons = array(\"1\", \"2\",\"test\");",true); + checkPHP("if ($home == 1) { message_box(); blocks(Center);}",true); + checkPHP("$bresult = sql_query(\"select * from \".$prefix.\"_banner WHERE type='0' AND active='1'\", $dbi);",true); + checkPHP("switch($func) {\n case \"f1\":\n f1();\n break; \n default: \n f0(); \n break;\n }",true); + checkPHP("list ($catid) = sql_fetch_row($result, $dbi);",true); + checkPHP("if (!$name) { \n }",true); + checkPHP("mt_srand((double)microtime()*1000000);",true); + checkPHP("\"\\\"\";",true); + checkPHP("$v->read();",true); + checkPHP("$alttext = ereg_replace(\"\\\"\", \"\", $alttext);",true); + checkPHP("$message .= \"\"._THISISAUTOMATED.\"\\n\\n\";",true); + checkPHP("if (!empty($pass) AND $pass==$passwd) { }",true); + checkPHP("$AllowableHTML = array(\"b\"=>1,\n \"i\"=>1);",true); + checkPHP("if ($term{0}!=$firstChar) {}",true); checkPHP( "echo \"
\"._NOADMINYET.\"


\"\n" + ".\"
\"\n" + ".\"\"._NICKNAME.\":\"\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; "); + + ";",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 } "); - 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());"); + + "$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) { + private void checkPHP(String strEval, boolean good) { + ParseException ex = null; try { System.out.println("strEval = " + strEval); - parser.phpParserTester(strEval); - } catch (CoreException e) { - e.printStackTrace(); + PHPParser.phpParserTester(strEval); } catch (ParseException e) { - e.printStackTrace(); + ex = e; + } + if (good) { + Assert.isTrue(ex == null); + } else { + Assert.isNotNull(ex); } - } - private void checkHTML(String strEval) { + private void checkHTML(String strEval, boolean good) { + ParseException ex = null; try { System.out.println("strEval = " + strEval); - parser.htmlParserTester(strEval); - } catch (CoreException e) { - e.printStackTrace(); + PHPParser.htmlParserTester(strEval); } catch (ParseException e) { - e.printStackTrace(); + ex = e; + } + if (good) { + Assert.isTrue(ex == null); + } else { + Assert.isNotNull(ex); } - } - private void checkHTML(File strEval) { + private void checkHTML(File strEval, boolean good) { + ParseException ex = null; try { System.out.println("strEval = " + strEval.toString()); - parser.htmlParserTester(strEval); - } catch (CoreException e) { + PHPParser.htmlParserTester(strEval); + } catch (FileNotFoundException e) { e.printStackTrace(); } catch (ParseException e) { - e.printStackTrace(); + ex = e; + } + if (good) { + Assert.isTrue(ex == null); + } else { + Assert.isNotNull(ex); } - } /** -- 1.7.1