raising the head after a three-weeks refactoring

[m6w6/ext-psi] / tests / parser / validate001.phpt

diff --git a/tests/parser/validate001.phpt b/tests/parser/validate001.phpt
index f9869a830b1231f300143926057db8c442b721e6..1f6113aa0f7fc2b638114d7bc45989c9695bf419 100644 (file)
--- a/tests/parser/validate001.phpt
+++ b/tests/parser/validate001.phpt
@@ -7,11 +7,13 @@ extension_loaded("psi") or die("skip - need ext/psi");
 --FILE--
 ===TEST===
 <?php 
+
 function validate($check, $psi) {
        $file = __DIR__."/001.psi";
        file_put_contents($file, $psi);
        if ($check !== psi_validate($file)) {
-               echo "Assertion failed!\n";
+               printf("Assertion failed!\nExpected: %s\n\n%s\n\n",
+                               $check ? "true" : "false", $psi);
        }
 }
 
@@ -19,11 +21,11 @@ validate(false, "typedef void foo;");
 validate(true, "typedef void *bar;");
 validate(false, "typedef long int;");
 validate(true, "typedef long foo;");
-validate(false, "typedef struct foo bar;");
+validate(true, "typedef struct foo bar;");
 validate(true, "typedef struct {int a;} foo;");
-validate(false, "struct a; \n typedef struct a a_t;");
-validate(true, "struct a::(8,8); \n typedef struct a a_t;");
-validate(true, "typedef struct a a_t; \n struct a::(8,8);");
+validate(false, "struct a; \ntypedef struct a a_t;");
+validate(true, "struct a::(8,8); \ntypedef struct a a_t;");
+validate(true, "typedef struct a a_t; \nstruct a::(8,8);");
 
 validate(true,
 <<<PSI
@@ -72,8 +74,8 @@ validate(true, "typedef int (foo)(int bar);");
 validate(true, "typedef int (*foo)(int bar);");
 validate(true, "typedef int *(*foo)(int bar);");
 validate(false, "typedef int *(*foo)(int *(*bar)(int baz));");
-validate(true, "typedef int *(*bar)(int baz); \n typedef int *(*foo)(bar bar);");
-validate(false, "typedef int bar(int baz); \n typedef int *(*foo)(bar bar);");
+validate(true, "typedef int *(*bar)(int baz); \ntypedef int *(*foo)(bar bar);");
+validate(true, "typedef int bar(int baz); \ntypedef int *(*foo)(bar bar);");
 
 ?>
 ===DONE===
@@ -84,15 +86,15 @@ validate(false, "typedef int bar(int baz); \n typedef int *(*foo)(bar bar);");
 --EXPECTF--
 ===TEST===
 
-Warning: PSI syntax error: Unexpected token ';' in %s001.psi on line 1
-
-Warning: PSI syntax error: Unexpected token 'int' in %s001.psi on line 1
+Warning: PSI syntax error: Unexpected token ';' at pos 17 in %s001.psi on line 1
 
-Warning: Type 'bar' cannot be aliased to struct 'foo' in %s001.psi on line 1
+Warning: PSI syntax error: Unexpected token 'int' at pos 14 in %s001.psi on line 1
 
 Warning: Cannot compute size of empty struct 'a' in %s001.psi on line 1
 
 Warning: Unknown variable 'X' in numeric expression in %s001.psi on line 4
 
-Warning: PSI syntax error: Unexpected token '(' in %s001.psi on line 1
+Warning: PSI syntax error: Unexpected token '(' at pos 26 in %s001.psi on line 1
+
+Warning: PSI syntax error: Unexpected token '(' at pos 32 in %s001.psi on line 1
 ===DONE===