Adding tests for generic functions

Author: Thomas Kiley

unit/java_bytecode/java_bytecode_parse_generics/BasicInterfaceCopy.class

@@ -0,0 +1,4 @@
+interface BasicInterfaceCopy
+{
+  int getX();
+}

unit/java_bytecode/java_bytecode_parse_generics/BasicInterfaceCopy.java

@@ -0,0 +1,26 @@
+public class GenericFunctions
+{
+  public static <T> void processSimpleGeneric(SimpleGeneric<T> x) {
+    assert(x.t==null);
+  }
+
+  // Test a wildcard generic bound by an interface
+  public static <T extends BasicInterface> void processUpperBoundInterfaceGeneric(SimpleGeneric<T> x) {
+    assert(x.t.getX() == 4);
+  }
+
+  // Test a wild card generic bound by a class
+  public static <T extends Foo> void processUpperBoundClassGeneric(SimpleGeneric<T> x) {
+    assert(x.t.getX() == 4);
+  }
+
+  // Test a wild card generic bound by a class and an interface
+  public static <T extends Foo & BasicInterface> void processDoubleUpperBoundClassGeneric(SimpleGeneric<T> x) {
+    assert(x.t.getX() == 4);
+  }
+
+  // Test a wild card generic bound by two interfaces
+  public static <T extends BasicInterface & BasicInterfaceCopy> void processDoubleUpperBoundInterfaceGeneric(SimpleGeneric<T> x) {
+      assert(x.t.getX() == 4);
+  }
+}

unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.class

@@ -0,0 +1,75 @@
+/*******************************************************************\
+
+ Module: Unit tests for parsing generic classes
+
+ Author: DiffBlue Limited. All rights reserved.
+
+\*******************************************************************/
+
+#include <catch.hpp>
+
+#include <util/config.h>
+#include <util/cmdline.h>
+#include <util/language.h>
+#include <util/prefix.h>
+
+#include <java_bytecode/java_bytecode_language.h>
+
+#include <iostream>
+#include <src/java_bytecode/load_java_class.h>
+
+SCENARIO(
+  "java_bytecode_parse_generic_function",
+  "[core][java_bytecode][java_bytecode_parse_generics]")
+{
+  const symbol_tablet &new_symbol_table=
+    load_java_class(
+      "GenericFunctions",
+      "./java_bytecode/java_bytecode_parse_generics");
+
+  std::string class_prefix="java::GenericFunctions";
+  THEN("There should be a symbol for processSimpleGeneric")
+  {
+    const std::string func_name=".processSimpleGeneric";
+    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string process_func_name=class_prefix+func_name+func_descriptor;
+
+    REQUIRE(new_symbol_table.has_symbol(process_func_name));
+  }
+
+  THEN("There should be a symbol for processUpperBoundInterfaceGeneric")
+  {
+    const std::string func_name=".processUpperBoundInterfaceGeneric";
+    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string process_func_name=class_prefix+func_name+func_descriptor;
+
+    REQUIRE(new_symbol_table.has_symbol(process_func_name));
+  }
+
+  THEN("There should be a symbol for processUpperBoundClassGeneric")
+  {
+    const std::string func_name=".processUpperBoundClassGeneric";
+    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string process_func_name=class_prefix+func_name+func_descriptor;
+
+    REQUIRE(new_symbol_table.has_symbol(process_func_name));
+  }
+
+  THEN("There should be a symbol for processDoubleUpperBoundClassGeneric")
+  {
+    const std::string func_name=".processDoubleUpperBoundClassGeneric";
+    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string process_func_name=class_prefix+func_name+func_descriptor;
+
+    REQUIRE(new_symbol_table.has_symbol(process_func_name));
+  }
+
+  THEN("There should be a symbol for processDoubleUpperBoundInterfaceGeneric")
+  {
+    const std::string func_name=".processDoubleUpperBoundInterfaceGeneric";
+    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string process_func_name=class_prefix+func_name+func_descriptor;
+
+    REQUIRE(new_symbol_table.has_symbol(process_func_name));
+  }
+}