Move the pretty printing function from generate_java_generic_type to java_utils.

Author: NlightNFotis

src/java_bytecode/generate_java_generic_type.cpp

@@ -11,30 +11,9 @@
 
 #include "generate_java_generic_type.h"
 #include <util/namespace.h>
-#include <util/prefix.h>
 #include <java_bytecode/java_types.h>
 #include <java_bytecode/java_utils.h>
 
-/// Strip the package name from a java type, for the type to be
-/// pretty printed (java::java.lang.Integer -> Integer).
-/// \param fqn_java_type The java type we want to pretty print.
-/// \return The pretty printed type if there was a match of the
-//  qualifiers, or the type as it was passed otherwise.
-std::string pretty_print_java_type(const std::string &fqn_java_type)
-{
-  std::string result(fqn_java_type);
-  const std::string java_cbmc_string("java::");
-  // Remove the java internal cbmc identifier
-  if(has_prefix(fqn_java_type, java_cbmc_string))
-    result = fqn_java_type.substr(java_cbmc_string.length());
-  // If the class is in package java.lang strip
-  // package name due to default import
-  const std::string java_lang_string("java.lang.");
-  if(has_prefix(result, java_lang_string))
-    result = result.substr(java_lang_string.length());
-  return result;
-}
-
 generate_java_generic_typet::generate_java_generic_typet(
   message_handlert &message_handler):
     message_handler(message_handler)

src/java_bytecode/generate_java_generic_type.h

@@ -43,6 +43,4 @@ class generate_java_generic_typet
   message_handlert &message_handler;
 };
 
-std::string pretty_print_java_type(const std::string &fqn_java_type);
-
 #endif // CPROVER_JAVA_BYTECODE_GENERATE_JAVA_GENERIC_TYPE_H

src/java_bytecode/java_utils.cpp

@@ -305,3 +305,23 @@ irep_idt strip_java_namespace_prefix(const irep_idt &to_strip)
   PRECONDITION(has_prefix(to_strip_str, prefix));
   return to_strip_str.substr(prefix.size(), std::string::npos);
 }
+
+/// Strip the package name from a java type, for the type to be
+/// pretty printed (java::java.lang.Integer -> Integer).
+/// \param fqn_java_type The java type we want to pretty print.
+/// \return The pretty printed type if there was a match of the
+//  qualifiers, or the type as it was passed otherwise.
+std::string pretty_print_java_type(const std::string &fqn_java_type)
+{
+  std::string result(fqn_java_type);
+  const std::string java_cbmc_string("java::");
+  // Remove the CBMC internal java identifier
+  if(has_prefix(fqn_java_type, java_cbmc_string))
+    result = fqn_java_type.substr(java_cbmc_string.length());
+  // If the class is in package java.lang strip
+  // package name due to default import
+  const std::string java_lang_string("java.lang.");
+  if(has_prefix(result, java_lang_string))
+    result = result.substr(java_lang_string.length());
+  return result;
+}

src/java_bytecode/java_utils.h

@@ -94,4 +94,6 @@ exprt make_function_application(
 
 irep_idt strip_java_namespace_prefix(const irep_idt &to_strip);
 
+std::string pretty_print_java_type(const std::string &fqn_java_type);
+
 #endif // CPROVER_JAVA_BYTECODE_JAVA_UTILS_H

unit/java_bytecode/generate_concrete_generic_type/generate_java_generic_type.cpp

@@ -392,32 +392,3 @@ SCENARIO(
     }
   }
 }
-
-SCENARIO(
-  "Test pretty printing auxiliary function",
-  "[core][java_bytecode][generate_java_generic_type]")
-{
-  using std::map;
-  using std::string;
-
-  WHEN("We have a series of cbmc internal java types")
-  {
-    // NOLINTNEXTLINE
-    const map<string, string> types{
-      // map<Input, Output>
-      {"java::java.lang.Integer", "Integer"},
-      {"java::CustomClass", "CustomClass"},
-      {"java.lang.String", "String"},
-      {"Hashmap", "Hashmap"},
-      // We shouldn't prune types not imported in default import
-      {"java.util.HashSet", "java.util.HashSet"}};
-
-    THEN("We need to make sure that the types get pruned correctly.")
-    {
-      for(const auto &pair : types)
-      {
-        REQUIRE(pretty_print_java_type(pair.first) == pair.second);
-      }
-    }
-  }
-}

unit/java_bytecode/java_utils_test.cpp

@@ -341,3 +341,30 @@ SCENARIO("find_closing_semi_colon_for_reference_type", "[core][java_util_test]")
     REQUIRE(find_closing_semi_colon_for_reference_type(descriptor, 10) == 19);
   }
 }
+
+SCENARIO("Test pretty printing auxiliary function", "[core][java_util_test]")
+{
+  using std::map;
+  using std::string;
+
+  WHEN("We have a series of cbmc internal java types")
+  {
+    // NOLINTNEXTLINE
+    const map<string, string> types{
+      // map<Input, Output>
+      {"java::java.lang.Integer", "Integer"},
+      {"java::CustomClass", "CustomClass"},
+      {"java.lang.String", "String"},
+      {"Hashmap", "Hashmap"},
+      // We shouldn't prune types not imported in default import
+      {"java.util.HashSet", "java.util.HashSet"}};
+
+    THEN("We need to make sure that the types get pruned correctly.")
+    {
+      for(const auto &pair : types)
+      {
+        REQUIRE(pretty_print_java_type(pair.first) == pair.second);
+      }
+    }
+  }
+}