Adjust more test results for invalid code

amai2012 · amai2012 · commit 361fc44005be · 2019-04-19T20:53:07.000+02:00
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
@@ -143,10 +143,10 @@ class TestAstUtils : public TestFixture {
 
     void isVariableChanged() {
         // #8211 - no lhs for >> , do not crash
-        ASSERT_THROW(isVariableChanged("void f() {\n"
-                                       "  int b;\n"
-                                       "  if (b) { (int)((INTOF(8))result >> b); }\n"
-                                       "}", "if", "}"), InternalError);;
+        isVariableChanged("void f() {\n"
+                          "  int b;\n"
+                          "  if (b) { (int)((INTOF(8))result >> b); }\n"
+                          "}", "if", "}");
     }
 
     bool isVariableChangedByFunctionCall(const char code[], const char pattern[], bool *inconclusive) {
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -990,7 +990,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    return sizeof...(args);\n"
                             "  }();\n"
                             "}";
-        tok(code);
+        ASSERT_THROW(tok(code), InternalError);
     }
 
     void template43() { // #5097 - Assert due to '>>' in 'B<A<C>>' not being treated as end of template instantiation
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -1100,33 +1100,33 @@ class TestTokenizer : public TestFixture {
 
     // #4725 - ^{}
     void simplifyAsm2() {
-        ASSERT_EQUALS("void f ( ) { asm ( \"^{}\" ) ; }", tokenizeAndStringify("void f() { ^{} }"));
-        ASSERT_EQUALS("void f ( ) { x ( asm ( \"^{}\" ) ) ; }", tokenizeAndStringify("void f() { x(^{}); }"));
-        ASSERT_EQUALS("void f ( ) { foo ( A ( ) , asm ( \"^{bar();}\" ) ) ; }", tokenizeAndStringify("void f() { foo(A(), ^{ bar(); }); }"));
-        ASSERT_EQUALS("int f0 ( Args args ) { asm ( \"asm(\"return^{returnsizeof...(Args);}()\")+^{returnsizeof...(args);}()\" )\n"
-                      "2:\n"
-                      "|\n"
-                      "5:\n"
-                      "6: ;\n"
-                      "} ;", tokenizeAndStringify("int f0(Args args) {\n"
-                              "    return ^{\n"
-                              "        return sizeof...(Args);\n"
-                              "    }() + ^ {\n"
-                              "        return sizeof...(args);\n"
-                              "    }();\n"
-                              "};"));
-        ASSERT_EQUALS("int ( ^ block ) ( void ) = asm ( \"^{staticinttest=0;returntest;}\" )\n\n\n;",
-                      tokenizeAndStringify("int(^block)(void) = ^{\n"
+        ASSERT_THROW(ASSERT_EQUALS("void f ( ) { asm ( \"^{}\" ) ; }", tokenizeAndStringify("void f() { ^{} }")), InternalError);
+        ASSERT_THROW(ASSERT_EQUALS("void f ( ) { x ( asm ( \"^{}\" ) ) ; }", tokenizeAndStringify("void f() { x(^{}); }")), InternalError);
+        ASSERT_THROW(ASSERT_EQUALS("void f ( ) { foo ( A ( ) , asm ( \"^{bar();}\" ) ) ; }", tokenizeAndStringify("void f() { foo(A(), ^{ bar(); }); }")), InternalError);
+        ASSERT_THROW(ASSERT_EQUALS("int f0 ( Args args ) { asm ( \"asm(\"return^{returnsizeof...(Args);}()\")+^{returnsizeof...(args);}()\" )\n"
+                                   "2:\n"
+                                   "|\n"
+                                   "5:\n"
+                                   "6: ;\n"
+                                   "} ;", tokenizeAndStringify("int f0(Args args) {\n"
+                                           "    return ^{\n"
+                                           "        return sizeof...(Args);\n"
+                                           "    }() + ^ {\n"
+                                           "        return sizeof...(args);\n"
+                                           "    }();\n"
+                                           "};")), InternalError);
+        ASSERT_THROW(ASSERT_EQUALS("int ( ^ block ) ( void ) = asm ( \"^{staticinttest=0;returntest;}\" )\n\n\n;",
+                                   tokenizeAndStringify("int(^block)(void) = ^{\n"
                                            "    static int test = 0;\n"
                                            "    return test;\n"
-                                           "};"));
+                                           "};")), InternalError);
 
-        ASSERT_EQUALS("; return f ( a [ b = c ] , asm ( \"^{}\" ) ) ;",
-                      tokenizeAndStringify("; return f(a[b=c],^{});")); // #7185
+        ASSERT_THROW(ASSERT_EQUALS("; return f ( a [ b = c ] , asm ( \"^{}\" ) ) ;",
+                                   tokenizeAndStringify("; return f(a[b=c],^{});")), InternalError); // #7185
         ASSERT_EQUALS("; return f ( asm ( \"^(void){somecode}\" ) ) ;",
                       tokenizeAndStringify("; return f(^(void){somecode});"));
-        ASSERT_EQUALS("; asm ( \"a?(b?(c,asm(\"^{}\")):0):^{}\" ) ;",
-                      tokenizeAndStringify(";a?(b?(c,^{}):0):^{};"));
+        ASSERT_THROW(ASSERT_EQUALS("; asm ( \"a?(b?(c,asm(\"^{}\")):0):^{}\" ) ;",
+                                   tokenizeAndStringify(";a?(b?(c,^{}):0):^{};")), InternalError);
         ASSERT_EQUALS("template < typename T > "
                       "CImg < T > operator| ( const char * const expression , const CImg < T > & img ) { "
                       "return img | expression ; "

Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,7 @@ class TestSimplifyTemplate : public TestFixture {`
`990`	`990`	`" return sizeof...(args);\n"`
`991`	`991`	`" }();\n"`
`992`	`992`	`"}";`
`993`		`- tok(code);`
	`993`	`+ ASSERT_THROW(tok(code), InternalError);`
`994`	`994`	`}`
`995`	`995`
`996`	`996`	`void template43() { // #5097 - Assert due to '>>' in 'B<A<C>>' not being treated as end of template instantiation`