Pulling out a utility function to a separate file

Author: svorenova

unit/java_bytecode/java_bytecode_parser/java_bytecode_parse_lambda_method_table.cpp

@@ -18,19 +18,11 @@
 
 #include <java_bytecode/java_bytecode_parse_tree.h>
 #include <java_bytecode/java_types.h>
+#include <testing-utils/run_test_with_compilers.h>
 
 typedef java_bytecode_parse_treet::classt::lambda_method_handlet
   lambda_method_handlet;
 
-void run_test_with_compilers(
-  const std::function<void(std::string)> &test_with_compiler)
-{
-  test_with_compiler("openjdk_8");
-  test_with_compiler("eclipse");
-  test_with_compiler("oracle_8");
-  test_with_compiler("oracle_9");
-}
-
 SCENARIO(
   "lambda_method_handle_map with static lambdas",
   "[core][java_bytecode][java_bytecode_parse_lambda_method_handle]")

unit/testing-utils/Makefile

@@ -4,7 +4,10 @@ SRC = \
   load_java_class.cpp \
   require_expr.cpp \
   require_goto_statements.cpp \
+  require_parse_tree.cpp \
+  require_symbol.cpp \
   require_type.cpp \
+  run_test_with_compilers.cpp \
   # Empty last line (please keep above list sorted!)
 
 INCLUDES = -I .. -I . -I ../../src

unit/testing-utils/run_test_with_compilers.cpp

@@ -0,0 +1,18 @@
+/*******************************************************************\
+
+ Module: Unit test utilities
+
+ Author: Diffblue Ltd.
+
+\*******************************************************************/
+
+#include "run_test_with_compilers.h"
+
+void run_test_with_compilers(
+  const std::function<void(const std::string &)> &test_with_compiler)
+{
+  test_with_compiler(std::string("openjdk_8"));
+  test_with_compiler(std::string("eclipse"));
+  test_with_compiler(std::string("oracle_8"));
+  test_with_compiler(std::string("oracle_9"));
+}

unit/testing-utils/run_test_with_compilers.h

@@ -0,0 +1,21 @@
+/*******************************************************************\
+
+ Module: Unit test utilities
+
+ Author: Diffblue Ltd.
+
+\*******************************************************************/
+
+/// \file
+/// Utility for running a test with different compilers.
+
+#ifndef CPROVER_TESTING_UTILS_RUN_TEST_WITH_COMPILERS_H
+#define CPROVER_TESTING_UTILS_RUN_TEST_WITH_COMPILERS_H
+
+#include <functional>
+#include <string>
+
+void run_test_with_compilers(
+  const std::function<void(const std::string &)> &test_with_compiler);
+
+#endif // CPROVER_TESTING_UTILS_RUN_TEST_WITH_COMPILERS_H