Extending test for derived generics

Author: svorenova

unit/java_bytecode/java_bytecode_parse_generics/DerivedGeneric.class

@@ -0,0 +1,4 @@
+class DerivedGenericInst extends Generic<Interface_Implementation>
+{
+
+}

unit/java_bytecode/java_bytecode_parse_generics/DerivedGeneric.java

@@ -0,0 +1,4 @@
+class DerivedGenericUninst<T> extends Generic<T>
+{
+
+}

unit/java_bytecode/java_bytecode_parse_generics/DerivedGenericInst.class

@@ -8,30 +8,47 @@
 
 #include <testing-utils/catch.hpp>
 #include <testing-utils/load_java_class.h>
-
-#include <util/config.h>
-#include <util/language.h>
-#include <java_bytecode/java_bytecode_language.h>
-#include <iostream>
+#include <testing-utils/require_type.h>
 
 SCENARIO(
-  "parse_derived_generic_class",
+  "parse_derived_generic_class_inst",
   "[core][java_bytecode][java_bytecode_parse_generics]")
 {
   const symbol_tablet &new_symbol_table = load_java_class(
-    "DerivedGeneric", "./java_bytecode/java_bytecode_parse_generics");
+    "DerivedGenericInst", "./java_bytecode/java_bytecode_parse_generics");
 
-  THEN("There should be a symbol for the DerivedGeneric class")
+  THEN("There should be a symbol for the DerivedGenericInst class")
   {
-    std::string class_prefix = "java::DerivedGeneric";
+    std::string class_prefix = "java::DerivedGenericInst";
     REQUIRE(new_symbol_table.has_symbol(class_prefix));
 
     const symbolt &derived_symbol = new_symbol_table.lookup_ref(class_prefix);
-    derived_symbol.show(std::cout);
     const class_typet &derived_class_type =
-      require_symbol::require_complete_class(derived_symbol);
+      require_type::require_java_non_generic_class(derived_symbol.type);
+
+    // TODO: Currently we do not support extracting information
+    // about the base classes generic information - issue TG-1287
+  }
+}
+
+SCENARIO(
+  "parse_derived_generic_class_uninst",
+  "[core][java_bytecode][java_bytecode_parse_generics]")
+{
+  const symbol_tablet &new_symbol_table = load_java_class(
+    "DerivedGenericUninst", "./java_bytecode/java_bytecode_parse_generics");
+
+  THEN("There should be a symbol for the DerivedGenericUninst class")
+  {
+    std::string class_prefix = "java::DerivedGenericUninst";
+    REQUIRE(new_symbol_table.has_symbol(class_prefix));
+
+    const symbolt &derived_symbol = new_symbol_table.lookup_ref(class_prefix);
+    const java_generics_class_typet &derived_class_type =
+      require_type::require_java_generic_class(
+        derived_symbol.type, {class_prefix + "::T"});
 
-    // TODO(tkiley): Currently we do not support extracting information
+    // TODO: Currently we do not support extracting information
     // about the base classes generic information - issue TG-1287
   }
 }