Renaming java files

Author: svorenova

unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.class

@@ -0,0 +1,4 @@
+public abstract class AbstractGeneric<T>
+{
+
+}

unit/java_bytecode/java_bytecode_parse_generics/AbstractGeneric.java

@@ -1,4 +1,4 @@
-class DerivedGeneric extends SimpleGeneric<Foo>
+class DerivedGeneric extends Generic<Interface_Implementation>
 {
 
 }

unit/java_bytecode/java_bytecode_parse_generics/AbstractGenericClass.class

@@ -0,0 +1,11 @@
+class Generic<T>
+{
+  public T t;
+
+  public static <T> Generic<T> makeGeneric(T value)
+  {
+    Generic<T> newST = new Generic<T>();
+    newST.t = value;
+    return newST;
+  }
+}

unit/java_bytecode/java_bytecode_parse_generics/AbstractGenericClass.java

@@ -1,26 +1,26 @@
 public class GenericFunctions
 {
-  public static <T> void processSimpleGeneric(SimpleGeneric<T> x) {
+  public static <T> void processSimpleGeneric(Generic<T> x) {
     assert(x.t==null);
   }
 
   // Test a wildcard generic bound by an interface
-  public static <T extends BasicInterface> void processUpperBoundInterfaceGeneric(SimpleGeneric<T> x) {
+  public static <T extends Interface> void processUpperBoundInterfaceGeneric(Generic<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) {
+  public static <T extends Interface_Implementation> void processUpperBoundClassGeneric(Generic<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) {
+  public static <T extends Interface_Implementation & Interface> void processDoubleUpperBoundClassGeneric(Generic<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) {
+  public static <T extends Interface & Interface_Copy> void processDoubleUpperBoundInterfaceGeneric(Generic<T> x) {
       assert(x.t.getX() == 4);
   }
 }

unit/java_bytecode/java_bytecode_parse_generics/Bar.class

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

unit/java_bytecode/java_bytecode_parse_generics/Bar.java

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

unit/java_bytecode/java_bytecode_parse_generics/BasicInterface.java

@@ -1,4 +1,4 @@
-class Foo implements BasicInterface
+class Interface_Implementation implements Interface
 {
   public int x;
 

unit/java_bytecode/java_bytecode_parse_generics/BasicInterfaceCopy.class

@@ -0,0 +1,4 @@
+class Interface_Implementation_Derived extends Interface_Implementation
+{
+
+}

unit/java_bytecode/java_bytecode_parse_generics/BasicInterfaceCopy.java

@@ -2,9 +2,9 @@ public class Outer<T>
 {
   private class Inner
   {
-    private final AbstractGenericClass<T> u;
+    private final AbstractGeneric<T> u;
 
-    Inner (AbstractGenericClass<T> t)
+    Inner (AbstractGeneric<T> t)
     {
       this.u = t;
     }

unit/java_bytecode/java_bytecode_parse_generics/DerivedGeneric.class

@@ -1,4 +1,4 @@
-class RecursiveGeneric extends SimpleRecursiveGeneric<RecursiveGeneric>
+class RecursiveGeneric<T extends RecursiveGeneric<T>>
 {
-
+  public T t;
 }

unit/java_bytecode/java_bytecode_parse_generics/DerivedGeneric.java

@@ -0,0 +1,4 @@
+class RecursiveGeneric_Derived extends RecursiveGeneric<RecursiveGeneric_Derived>
+{
+
+}

unit/java_bytecode/java_bytecode_parse_generics/Foo.class

@@ -1,54 +1,57 @@
 public class WildcardGenericFunctions
 {
   // Test a wild card generic type
-  public static void processSimpleGeneric(SimpleGeneric<?> x) {
+  public static void processSimpleGeneric(Generic<?> x) {
     assert(x.t.equals(null));
   }
 
   // Test a wildcard generic bound by an interface
-  public static void processUpperBoundInterfaceGeneric(SimpleGeneric<? extends BasicInterface> x) {
+  public static void processUpperBoundInterfaceGeneric(Generic<? extends
+  Interface> x) {
     assert(x.t.getX() == 4);
   }
 
   // Test a wild card generic bound by a class
-  public static void processUpperBoundClassGeneric(SimpleGeneric<? extends Foo> x) {
+  public static void processUpperBoundClassGeneric(Generic<? extends
+  Interface_Implementation> x) {
     assert(x.t.getX() == 4);
   }
 
-  // It isn't legal to have an wild card with two upper bounds
+  // It isn't legal to have a wild card with two upper bounds
   // Per language spec on intersection types
 
-  public static void processLowerBoundGeneric(SimpleGeneric<? super Foo> x, Foo assign) {
+  public static void processLowerBoundGeneric(Generic<? super
+  Interface_Implementation> x, Interface_Implementation assign) {
     x.t = assign;
   }
 
   // It is not legal Java to specify both an upper and lower bound
-  // public static void processBoundSuperClassGeneric(SimpleGeneric<? extends Object super Foo> x, Foo assign) {
+  // public static void processBoundSuperClassGeneric(Generic<? extends Object super Interface_Implementation> x, Interface_Implementation assign) {
   //   x.t = assign;
   // }
 
   // Test a wild card generic bound by a class
-  // public static void processBoundClassGenericDoubleBound(SimpleGeneric<? extends Foo & BasicInterface> x) {
+  // public static void processBoundClassGenericDoubleBound(Generic<? extends Interface_Implementation & Interface> x) {
   //   assert(x.t.getX() == 4);
   // }
 
   public static void test()
   {
-    SimpleGeneric<Foo> myGenericValue = new SimpleGeneric<Foo>();
+    Generic<Interface_Implementation> myGenericValue = new Generic<Interface_Implementation>();
     myGenericValue.t = null;
     processSimpleGeneric(myGenericValue);
 
-    myGenericValue.t = new Foo();
+    myGenericValue.t = new Interface_Implementation();
     myGenericValue.t.x = 4;
     processUpperBoundInterfaceGeneric(myGenericValue);
 
-    SimpleGeneric<Bar> anotherGenericValue = new SimpleGeneric<Bar>();
-    anotherGenericValue.t = new Bar();
+    Generic<Interface_Implementation_Derived> anotherGenericValue = new Generic<Interface_Implementation_Derived>();
+    anotherGenericValue.t = new Interface_Implementation_Derived();
     anotherGenericValue.t.x = 4;
     processUpperBoundClassGeneric(anotherGenericValue);
 
 
-    SimpleGeneric<Object> baseGenericValue = new SimpleGeneric<Object>();
-    processLowerBoundGeneric(baseGenericValue, new Foo());
+    Generic<Object> baseGenericValue = new Generic<Object>();
+    processLowerBoundGeneric(baseGenericValue, new Interface_Implementation());
   }
 }

unit/java_bytecode/java_bytecode_parse_generics/Generic.class

@@ -31,7 +31,7 @@ SCENARIO(
   THEN("There should be a symbol for processSimpleGeneric")
   {
     const std::string func_name=".processSimpleGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));
@@ -40,7 +40,7 @@ SCENARIO(
   THEN("There should be a symbol for processUpperBoundInterfaceGeneric")
   {
     const std::string func_name=".processUpperBoundInterfaceGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));
@@ -49,7 +49,7 @@ SCENARIO(
   THEN("There should be a symbol for processUpperBoundClassGeneric")
   {
     const std::string func_name=".processUpperBoundClassGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));
@@ -58,7 +58,7 @@ SCENARIO(
   THEN("There should be a symbol for processDoubleUpperBoundClassGeneric")
   {
     const std::string func_name=".processDoubleUpperBoundClassGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));
@@ -67,7 +67,7 @@ SCENARIO(
   THEN("There should be a symbol for processDoubleUpperBoundInterfaceGeneric")
   {
     const std::string func_name=".processDoubleUpperBoundInterfaceGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));

unit/java_bytecode/java_bytecode_parse_generics/Generic.java

@@ -32,7 +32,7 @@ SCENARIO(
   THEN("There should be a symbol for processSimpleGeneric")
   {
     const std::string func_name=".processSimpleGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));
@@ -41,7 +41,7 @@ SCENARIO(
   THEN("There should be a symbol for processUpperBoundInterfaceGeneric")
   {
     const std::string func_name=".processUpperBoundInterfaceGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));
@@ -50,7 +50,7 @@ SCENARIO(
   THEN("There should be a symbol for processUpperBoundClassGeneric")
   {
     const std::string func_name=".processUpperBoundClassGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;)V";
+    const std::string func_descriptor = ":(LGeneric;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));
@@ -59,7 +59,8 @@ SCENARIO(
   THEN("There should be a symbol for processLowerBoundGeneric")
   {
     const std::string func_name=".processLowerBoundGeneric";
-    const std::string func_descriptor=":(LSimpleGeneric;LFoo;)V";
+    const std::string func_descriptor =
+      ":(LGeneric;LInterface_Implementation;)V";
     const std::string process_func_name=class_prefix+func_name+func_descriptor;
 
     REQUIRE(new_symbol_table.has_symbol(process_func_name));

unit/java_bytecode/java_bytecode_parse_generics/GenericFunctions.class

@@ -43,7 +43,7 @@ SCENARIO(
          " descriptor")
   {
     const std::string func_name=".<init>";
-    const std::string func_descriptor=":(LOuter;LAbstractGenericClass;)V";
+    const std::string func_descriptor = ":(LOuter;LAbstractGeneric;)V";
     const std::string process_func_name=
       inner_prefix+func_name+func_descriptor;
     REQUIRE(new_symbol_table.has_symbol(process_func_name));