Use CATCH's REQUIRE_THROWS_AS

tautschnig · tautschnig · commit f3d8b29b773b · 2018-12-21T11:10:05.000Z
This avoids warnings about unused local variables and also is more concise. Also
change one use of REQUIRE_THROWS to the more precise REQUIRE_THROWS_AS to make
sure we are seeing the expected kind of exception.
diff --git a/unit/goto-programs/goto_model_function_type_consistency.cpp b/unit/goto-programs/goto_model_function_type_consistency.cpp
@@ -52,16 +52,9 @@ SCENARIO(
 
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_model.validate(validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_model.validate(validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-programs/goto_program_assume.cpp b/unit/goto-programs/goto_program_assume.cpp
@@ -53,16 +53,9 @@ SCENARIO(
       instructions.back().targets.push_back(instructions.begin());
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_function.body.validate(ns, validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_function.body.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-programs/goto_program_dead.cpp b/unit/goto-programs/goto_program_dead.cpp
@@ -56,16 +56,9 @@ SCENARIO(
 
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_function.body.validate(ns, validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_function.body.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-programs/goto_program_declaration.cpp b/unit/goto-programs/goto_program_declaration.cpp
@@ -55,16 +55,9 @@ SCENARIO(
 
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_function.body.validate(ns, validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_function.body.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-programs/goto_program_function_call.cpp b/unit/goto-programs/goto_program_function_call.cpp
@@ -69,16 +69,9 @@ SCENARIO(
 
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_function.body.validate(ns, validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_function.body.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-programs/goto_program_goto_target.cpp b/unit/goto-programs/goto_program_goto_target.cpp
@@ -58,16 +58,9 @@ SCENARIO(
     {
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_function.body.validate(ns, validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_function.body.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-programs/goto_program_symbol_type_table_consistency.cpp b/unit/goto-programs/goto_program_symbol_type_table_consistency.cpp
@@ -59,16 +59,9 @@ SCENARIO(
 
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_function.validate(ns, validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_function.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-programs/goto_program_table_consistency.cpp b/unit/goto-programs/goto_program_table_consistency.cpp
@@ -51,16 +51,9 @@ SCENARIO(
       const namespacet ns(symbol_table);
       THEN("The consistency check fails")
       {
-        bool caught = false;
-        try
-        {
-          goto_function.validate(ns, validation_modet::EXCEPTION);
-        }
-        catch(incorrect_goto_program_exceptiont &e)
-        {
-          caught = true;
-        }
-        REQUIRE(caught);
+        REQUIRE_THROWS_AS(
+          goto_function.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }
diff --git a/unit/goto-symex/ssa_equation.cpp b/unit/goto-symex/ssa_equation.cpp
@@ -46,7 +46,9 @@ SCENARIO("Validation of well-formed SSA steps", "[core][goto-symex][validate]")
 
       THEN("The consistency check fails")
       {
-        REQUIRE_THROWS(equation.validate(ns, validation_modet::EXCEPTION));
+        REQUIRE_THROWS_AS(
+          equation.validate(ns, validation_modet::EXCEPTION),
+          incorrect_goto_program_exceptiont);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -52,16 +52,9 @@ SCENARIO(`
`52`	`52`
`53`	`53`	`THEN("The consistency check fails")`
`54`	`54`	`{`
`55`		`- bool caught = false;`
`56`		`- try`
`57`		`- {`
`58`		`- goto_model.validate(validation_modet::EXCEPTION);`
`59`		`- }`
`60`		`- catch(incorrect_goto_program_exceptiont &e)`
`61`		`- {`
`62`		`- caught = true;`
`63`		`- }`
`64`		`- REQUIRE(caught);`
	`55`	`+ REQUIRE_THROWS_AS(`
	`56`	`+ goto_model.validate(validation_modet::EXCEPTION),`
	`57`	`+ incorrect_goto_program_exceptiont);`
`65`	`58`	`}`
`66`	`59`	`}`
`67`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,16 +53,9 @@ SCENARIO(`
`53`	`53`	`instructions.back().targets.push_back(instructions.begin());`
`54`	`54`	`THEN("The consistency check fails")`
`55`	`55`	`{`
`56`		`- bool caught = false;`
`57`		`- try`
`58`		`- {`
`59`		`- goto_function.body.validate(ns, validation_modet::EXCEPTION);`
`60`		`- }`
`61`		`- catch(incorrect_goto_program_exceptiont &e)`
`62`		`- {`
`63`		`- caught = true;`
`64`		`- }`
`65`		`- REQUIRE(caught);`
	`56`	`+ REQUIRE_THROWS_AS(`
	`57`	`+ goto_function.body.validate(ns, validation_modet::EXCEPTION),`
	`58`	`+ incorrect_goto_program_exceptiont);`
`66`	`59`	`}`
`67`	`60`	`}`
`68`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,16 +56,9 @@ SCENARIO(`
`56`	`56`
`57`	`57`	`THEN("The consistency check fails")`
`58`	`58`	`{`
`59`		`- bool caught = false;`
`60`		`- try`
`61`		`- {`
`62`		`- goto_function.body.validate(ns, validation_modet::EXCEPTION);`
`63`		`- }`
`64`		`- catch(incorrect_goto_program_exceptiont &e)`
`65`		`- {`
`66`		`- caught = true;`
`67`		`- }`
`68`		`- REQUIRE(caught);`
	`59`	`+ REQUIRE_THROWS_AS(`
	`60`	`+ goto_function.body.validate(ns, validation_modet::EXCEPTION),`
	`61`	`+ incorrect_goto_program_exceptiont);`
`69`	`62`	`}`
`70`	`63`	`}`
`71`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,16 +55,9 @@ SCENARIO(`
`55`	`55`
`56`	`56`	`THEN("The consistency check fails")`
`57`	`57`	`{`
`58`		`- bool caught = false;`
`59`		`- try`
`60`		`- {`
`61`		`- goto_function.body.validate(ns, validation_modet::EXCEPTION);`
`62`		`- }`
`63`		`- catch(incorrect_goto_program_exceptiont &e)`
`64`		`- {`
`65`		`- caught = true;`
`66`		`- }`
`67`		`- REQUIRE(caught);`
	`58`	`+ REQUIRE_THROWS_AS(`
	`59`	`+ goto_function.body.validate(ns, validation_modet::EXCEPTION),`
	`60`	`+ incorrect_goto_program_exceptiont);`
`68`	`61`	`}`
`69`	`62`	`}`
`70`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,16 +69,9 @@ SCENARIO(`
`69`	`69`
`70`	`70`	`THEN("The consistency check fails")`
`71`	`71`	`{`
`72`		`- bool caught = false;`
`73`		`- try`
`74`		`- {`
`75`		`- goto_function.body.validate(ns, validation_modet::EXCEPTION);`
`76`		`- }`
`77`		`- catch(incorrect_goto_program_exceptiont &e)`
`78`		`- {`
`79`		`- caught = true;`
`80`		`- }`
`81`		`- REQUIRE(caught);`
	`72`	`+ REQUIRE_THROWS_AS(`
	`73`	`+ goto_function.body.validate(ns, validation_modet::EXCEPTION),`
	`74`	`+ incorrect_goto_program_exceptiont);`
`82`	`75`	`}`
`83`	`76`	`}`
`84`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,16 +58,9 @@ SCENARIO(`
`58`	`58`	`{`
`59`	`59`	`THEN("The consistency check fails")`
`60`	`60`	`{`
`61`		`- bool caught = false;`
`62`		`- try`
`63`		`- {`
`64`		`- goto_function.body.validate(ns, validation_modet::EXCEPTION);`
`65`		`- }`
`66`		`- catch(incorrect_goto_program_exceptiont &e)`
`67`		`- {`
`68`		`- caught = true;`
`69`		`- }`
`70`		`- REQUIRE(caught);`
	`61`	`+ REQUIRE_THROWS_AS(`
	`62`	`+ goto_function.body.validate(ns, validation_modet::EXCEPTION),`
	`63`	`+ incorrect_goto_program_exceptiont);`
`71`	`64`	`}`
`72`	`65`	`}`
`73`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,16 +59,9 @@ SCENARIO(`
`59`	`59`
`60`	`60`	`THEN("The consistency check fails")`
`61`	`61`	`{`
`62`		`- bool caught = false;`
`63`		`- try`
`64`		`- {`
`65`		`- goto_function.validate(ns, validation_modet::EXCEPTION);`
`66`		`- }`
`67`		`- catch(incorrect_goto_program_exceptiont &e)`
`68`		`- {`
`69`		`- caught = true;`
`70`		`- }`
`71`		`- REQUIRE(caught);`
	`62`	`+ REQUIRE_THROWS_AS(`
	`63`	`+ goto_function.validate(ns, validation_modet::EXCEPTION),`
	`64`	`+ incorrect_goto_program_exceptiont);`
`72`	`65`	`}`
`73`	`66`	`}`
`74`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,16 +51,9 @@ SCENARIO(`
`51`	`51`	`const namespacet ns(symbol_table);`
`52`	`52`	`THEN("The consistency check fails")`
`53`	`53`	`{`
`54`		`- bool caught = false;`
`55`		`- try`
`56`		`- {`
`57`		`- goto_function.validate(ns, validation_modet::EXCEPTION);`
`58`		`- }`
`59`		`- catch(incorrect_goto_program_exceptiont &e)`
`60`		`- {`
`61`		`- caught = true;`
`62`		`- }`
`63`		`- REQUIRE(caught);`
	`54`	`+ REQUIRE_THROWS_AS(`
	`55`	`+ goto_function.validate(ns, validation_modet::EXCEPTION),`
	`56`	`+ incorrect_goto_program_exceptiont);`
`64`	`57`	`}`
`65`	`58`	`}`
`66`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@ SCENARIO("Validation of well-formed SSA steps", "[core][goto-symex][validate]")`
`46`	`46`
`47`	`47`	`THEN("The consistency check fails")`
`48`	`48`	`{`
`49`		`- REQUIRE_THROWS(equation.validate(ns, validation_modet::EXCEPTION));`
	`49`	`+ REQUIRE_THROWS_AS(`
	`50`	`+ equation.validate(ns, validation_modet::EXCEPTION),`
	`51`	`+ incorrect_goto_program_exceptiont);`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`	`}`