Merge pull request #1699 from NathanJPhillips/feature/reset-main-in-tests

Allow callers of load_java_class to pass the name of the main function

Author: smowton

unit/testing-utils/load_java_class.cpp

@@ -19,24 +19,39 @@
 
 #include <java_bytecode/java_bytecode_language.h>
 
-/// Go through the process of loading, typechecking and finalising loading a
+/// Go through the process of loading, type-checking and finalising loading a
 /// specific class file to build the symbol table.
 /// \param java_class_name: The name of the class file to load. It should not
 ///   include the .class extension.
 /// \param class_path: The path to load the class from. Should be relative to
 ///   the unit directory.
+/// \param main: The name of the main function or "" to use the default
+///   behaviour to find a main function.
 /// \return The symbol table that is generated by parsing this file.
 symbol_tablet load_java_class(
   const std::string &java_class_name,
-  const std::string &class_path)
+  const std::string &class_path,
+  const std::string &main)
 {
   return load_java_class(
-    java_class_name, class_path, new_java_bytecode_language());
+    java_class_name, class_path, main, new_java_bytecode_language());
 }
 
+/// Go through the process of loading, type-checking and finalising loading a
+/// specific class file to build the symbol table.
+/// \param java_class_name: The name of the class file to load. It should not
+///   include the .class extension.
+/// \param class_path: The path to load the class from. Should be relative to
+///   the unit directory.
+/// \param main: The name of the main function or "" to use the default
+///   behaviour to find a main function.
+/// \param java_lang: The language implementation to use for the loading,
+///   which will be destroyed by this function.
+/// \return The symbol table that is generated by parsing this file.
 symbol_tablet load_java_class(
   const std::string &java_class_name,
   const std::string &class_path,
+  const std::string &main,
   std::unique_ptr<languaget> &&java_lang)
 {
   // We expect the name of the class without the .class suffix to allow us to
@@ -58,6 +73,7 @@ symbol_tablet load_java_class(
   command_line.set("java-cp-include-files", class_path);
   config.java.classpath.clear();
   config.java.classpath.push_back(class_path);
+  config.main = main;
 
   // Add the language to the model
   language_filet &lf=lazy_goto_model.add_language_file(filename);

unit/testing-utils/load_java_class.h

@@ -19,11 +19,13 @@
 
 symbol_tablet load_java_class(
   const std::string &java_class_name,
-  const std::string &class_path);
+  const std::string &class_path,
+  const std::string &main = "");
 
 symbol_tablet load_java_class(
   const std::string &java_class_name,
   const std::string &class_path,
+  const std::string &main,
   std::unique_ptr<languaget> &&java_lang);
 
 #endif // CPROVER_TESTING_UTILS_LOAD_JAVA_CLASS_H