Pull out common generic classes/interfaces for unit tests

Author: svorenova

unit/goto-programs/goto_program_generics/GenericBases.java

@@ -1,21 +1,3 @@
-// Helper classes
-class Wrapper<T> {
-  public T field;
-}
-
-class IntWrapper {
-  public int i;
-}
-
-class TwoWrapper<K, V> {
-  public K first;
-  public V second;
-}
-
-interface InterfaceWrapper<T> {
-  public T method(T t);
-}
-
 // A class extending a generic class instantiated with a standard library class
 class SuperclassInst extends Wrapper<Integer> {
   public void foo() {
@@ -24,14 +6,14 @@ public void foo() {
 }
 
 // A class extending a generic class instantiated with a user-defined class
-class SuperclassInst2 extends Wrapper<IntWrapper> {
+class SuperclassInst2 extends Wrapper<IWrapper> {
   public void foo() {
     this.field.i = 5;
   }
 }
 
 // A class extending an instantiated nested generic class
-class SuperclassInst3 extends Wrapper<Wrapper<IntWrapper>> {
+class SuperclassInst3 extends Wrapper<Wrapper<IWrapper>> {
   public void foo() {
     this.field.field.i = 5;
   }
@@ -54,7 +36,7 @@ public void foo() {
 
 // A generic class extending a generic class with both instantiated and
 // uninstantiated parameters
-class SuperclassMixed<U> extends TwoWrapper<U,IntWrapper> {
+class SuperclassMixed<U> extends PairWrapper<U,IWrapper> {
   public void foo(U value) {
     this.first = value;
     this.second.i = 5;
@@ -99,7 +81,7 @@ public void foo(U value) {
   }
   public Inner inner;
 
-  class InnerGen<T> extends TwoWrapper<U,T> {
+  class InnerGen<T> extends PairWrapper<U,T> {
     public void foo(U uvalue, T tvalue) {
       this.first = uvalue;
       this.second = tvalue;
@@ -113,9 +95,9 @@ class InnerThree extends Inner {
 }
 class SuperclassInnerUninstTest
 {
-  SuperclassInnerUninst<IntWrapper> f;
+  SuperclassInnerUninst<IWrapper> f;
   public void foo() {
-    IntWrapper x = new IntWrapper();
+    IWrapper x = new IWrapper();
     f.inner.foo(x);
     f.inner_gen.foo(x,true);
     f.inner_three.foo(x);

unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter$Outer$InnerClass.class

@@ -1,41 +1,25 @@
-class SimpleWrapper<T> {
-  public T field;
-  public T[] array_field;
-
-  public int int_field;
-}
-
-class IWrapper {
-  public int i;
-}
-
-class PairWrapper<K, V> {
-  public K key;
-  public V value;
-}
-
 public class GenericFields
 {
   IWrapper field;
   class SimpleGenericField  {
-    SimpleWrapper<IWrapper> field_input;
+    Wrapper<IWrapper> field_input;
     public void foo() {
         field_input.field.i = 5;
         field_input.array_field = new IWrapper[2];
     }
   }
 
   class MultipleGenericFields {
-    SimpleWrapper<IWrapper> field_input1;
-    SimpleWrapper<IWrapper> field_input2;
+    Wrapper<IWrapper> field_input1;
+    Wrapper<IWrapper> field_input2;
     public void foo() {
         field_input1.field.i = 10;
         field_input2.field.i = 20;
     }
   }
 
   class NestedGenericFields {
-    SimpleWrapper<SimpleWrapper<IWrapper>> field_input1;
+    Wrapper<Wrapper<IWrapper>> field_input1;
     public void foo() {
         field_input1.field.field.i = 30;
     }
@@ -44,19 +28,19 @@ public void foo() {
   class PairGenericField {
     PairWrapper<IWrapper, IWrapper> field_input;
     public void foo() {
-        field_input.key.i = 40;
-        field_input.value.i = 50;
+        field_input.first.i = 40;
+        field_input.second.i = 50;
     }
   }
 
   class GenericMethodParameter {
-    public void foo(SimpleWrapper<IWrapper> v) {
+    public void foo(Wrapper<IWrapper> v) {
         v.field.i = 20;
     }
   }
 
   class GenericMethodUninstantiatedParameter {
-    public <T> void foo_unspec(SimpleWrapper<T> v) {
+    public <T> void foo_unspec(Wrapper<T> v) {
         v.int_field=10;
     }
   }

unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter$Outer.class

@@ -0,0 +1,25 @@
+// int wrapper
+class IWrapper {
+  public int i;
+  public IWrapper(int ii) {
+    i = ii;
+  }
+}
+
+// simple generic class
+class Wrapper<T> {
+  public T field;
+  public T[] array_field;
+  public int int_field;
+}
+
+// generic class with two parameters
+class PairWrapper<K, V> {
+  public K first;
+  public V second;
+}
+
+// simple generic interface
+interface InterfaceWrapper<T> {
+  public T method(T t);
+}

unit/goto-programs/goto_program_generics/GenericFields$GenericInnerOuter.class

@@ -86,7 +86,7 @@ SCENARIO(
           this_tmp_name,
           {"Wrapper"},
           "field",
-          "java::IntWrapper",
+          "java::IWrapper",
           {"java::java.lang.Object"},
           entry_point_code);
       }
@@ -128,7 +128,7 @@ SCENARIO(
             wrapper_tmp_name,
             {},
             "field",
-            "java::IntWrapper",
+            "java::IWrapper",
             {},
             entry_point_code);
         }
@@ -214,17 +214,17 @@ SCENARIO(
         {
           require_goto_statements::require_struct_component_assignment(
             f_tmp_name,
-            {"TwoWrapper"},
+            {"PairWrapper"},
             "first",
             "java::java.lang.Boolean",
             {"java::java.lang.Object"},
             entry_point_code);
 
           require_goto_statements::require_struct_component_assignment(
             f_tmp_name,
-            {"TwoWrapper"},
+            {"PairWrapper"},
             "second",
-            "java::IntWrapper",
+            "java::IWrapper",
             {"java::java.lang.Object"},
             entry_point_code);
         }
@@ -354,7 +354,7 @@ SCENARIO(
               inner_tmp_name,
               {"Wrapper"},
               "field",
-              "java::IntWrapper",
+              "java::IWrapper",
               {"java::java.lang.Object"},
               entry_point_code);
           }
@@ -373,14 +373,14 @@ SCENARIO(
           {
             require_goto_statements::require_struct_component_assignment(
               inner_gen_tmp_name,
-              {"TwoWrapper"},
+              {"PairWrapper"},
               "first",
-              "java::IntWrapper",
+              "java::IWrapper",
               {"java::java.lang.Object"},
               entry_point_code);
             require_goto_statements::require_struct_component_assignment(
               inner_gen_tmp_name,
-              {"TwoWrapper"},
+              {"PairWrapper"},
               "second",
               "java::java.lang.Boolean",
               {"java::java.lang.Object"},
@@ -403,7 +403,7 @@ SCENARIO(
               inner_three_tmp_name,
               {"Wrapper"},
               "field",
-              "java::IntWrapper",
+              "java::IWrapper",
               {"java::java.lang.Object"},
               entry_point_code);
           }

unit/goto-programs/goto_program_generics/GenericFields$GenericMethodParameter.class

@@ -39,14 +39,14 @@ SCENARIO(
         require_goto_statements::require_entry_point_argument_assignment(
           "this", entry_point_code);
 
-      THEN("Object 'this' has field 'field_input' of type SimpleWrapper")
+      THEN("Object 'this' has field 'field_input' of type Wrapper")
       {
         const auto &field_input_name =
           require_goto_statements::require_struct_component_assignment(
             tmp_object_name,
             {},
             "field_input",
-            "java::SimpleWrapper",
+            "java::Wrapper",
             {},
             entry_point_code);
 
@@ -100,14 +100,14 @@ SCENARIO(
         require_goto_statements::require_entry_point_argument_assignment(
           "this", entry_point_code);
 
-      THEN("Object 'this' has field 'field_input1' of type SimpleWrapper")
+      THEN("Object 'this' has field 'field_input1' of type Wrapper")
       {
         const auto &field_input1_name =
           require_goto_statements::require_struct_component_assignment(
             tmp_object_name,
             {},
             "field_input1",
-            "java::SimpleWrapper",
+            "java::Wrapper",
             {},
             entry_point_code);
 
@@ -123,14 +123,14 @@ SCENARIO(
         }
       }
 
-      THEN("Object 'this' has field 'field_input2' of type SimpleWrapper")
+      THEN("Object 'this' has field 'field_input2' of type Wrapper")
       {
         const auto &field_input2_name =
           require_goto_statements::require_struct_component_assignment(
             tmp_object_name,
             {},
             "field_input2",
-            "java::SimpleWrapper",
+            "java::Wrapper",
             {},
             entry_point_code);
 
@@ -167,25 +167,25 @@ SCENARIO(
         require_goto_statements::require_entry_point_argument_assignment(
           "this", entry_point_code);
 
-      THEN("Object 'this' has field 'field_input1' of type SimpleWrapper")
+      THEN("Object 'this' has field 'field_input1' of type Wrapper")
       {
         const auto &field_input1_name =
           require_goto_statements::require_struct_component_assignment(
             tmp_object_name,
             {},
             "field_input1",
-            "java::SimpleWrapper",
+            "java::Wrapper",
             {},
             entry_point_code);
 
-        THEN("Object 'field_input1' has field 'field' of type SimpleWrapper")
+        THEN("Object 'field_input1' has field 'field' of type Wrapper")
         {
           const auto &field_name =
             require_goto_statements::require_struct_component_assignment(
               field_input1_name,
               {},
               "field",
-              "java::SimpleWrapper",
+              "java::Wrapper",
               {},
               entry_point_code);
 
@@ -233,7 +233,7 @@ SCENARIO(
           require_goto_statements::require_struct_component_assignment(
             field_input_name,
             {},
-            "key",
+            "first",
             "java::IWrapper",
             {},
             entry_point_code);
@@ -244,7 +244,7 @@ SCENARIO(
           require_goto_statements::require_struct_component_assignment(
             field_input_name,
             {},
-            "value",
+            "second",
             "java::IWrapper",
             {},
             entry_point_code);
@@ -274,7 +274,7 @@ SCENARIO(
         require_goto_statements::require_entry_point_argument_assignment(
           "v", entry_point_code);
 
-      THEN("Object 'v' is of type SimpleWrapper")
+      THEN("Object 'v' is of type Wrapper")
       {
         const auto &tmp_object_declaration =
           require_goto_statements::require_declaration_of_name(
@@ -284,7 +284,7 @@ SCENARIO(
         // and verify that it is what we expect.
         const auto &tmp_object_struct =
           to_struct_type(tmp_object_declaration.symbol().type());
-        REQUIRE(tmp_object_struct.get_tag() == "SimpleWrapper");
+        REQUIRE(tmp_object_struct.get_tag() == "Wrapper");
 
         THEN("Object 'v' has field 'field' of type IWrapper")
         {
@@ -323,7 +323,7 @@ SCENARIO(
         require_goto_statements::require_entry_point_argument_assignment(
           "v", entry_point_code);
 
-      THEN("Object 'v' is of type SimpleWrapper")
+      THEN("Object 'v' is of type Wrapper")
       {
         const auto &tmp_object_declaration =
           require_goto_statements::require_declaration_of_name(
@@ -333,7 +333,7 @@ SCENARIO(
         // and verify that it is what we expect.
         const auto &tmp_object_struct =
           to_struct_type(tmp_object_declaration.symbol().type());
-        REQUIRE(tmp_object_struct.get_tag() == "SimpleWrapper");
+        REQUIRE(tmp_object_struct.get_tag() == "Wrapper");
 
         THEN(
           "Object 'v' has field 'field' of type Object (upper bound of the "