Extend unit tests to test for nested generics

Author: svorenova

unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp

@@ -77,10 +77,16 @@ SCENARIO(
           field.type(), symbol_typet("java::Generic"));
         THEN("The pointer should be generic")
         {
+          const java_generic_typet &generic_field =
+            require_type::require_java_generic_type(
+              field.type(),
+              {{require_type::type_argument_kindt::Inst, "java::Generic"}});
+
+          const typet &type_argument_1 =
+            generic_field.generic_type_arguments().at(0);
           require_type::require_java_generic_type(
-            field.type(),
-            {{require_type::type_argument_kindt::Inst, "java::Generic"}});
-          // TODO extend when nested generics are parsed correctly - TG-1301
+            type_argument_1,
+            {{require_type::type_argument_kindt::Var, class_prefix + "::T"}});
         }
       }
 
@@ -92,10 +98,24 @@ SCENARIO(
           field.type(), symbol_typet("java::Generic"));
         THEN("The pointer should be generic")
         {
+          const java_generic_typet &generic_field =
+            require_type::require_java_generic_type(
+              field.type(),
+              {{require_type::type_argument_kindt::Inst, "java::Generic"}});
+
+          const typet &type_argument_1 =
+            generic_field.generic_type_arguments().at(0);
+          const java_generic_typet &generic_type_argument_1 =
+            require_type::require_java_generic_type(
+              type_argument_1,
+              {{require_type::type_argument_kindt::Inst, "java::Generic"}});
+
+          const typet &type_argument_1_1 =
+            generic_type_argument_1.generic_type_arguments().at(0);
           require_type::require_java_generic_type(
-            field.type(),
-            {{require_type::type_argument_kindt::Inst, "java::Generic"}});
-          // TODO extend when nested generics are parsed correctly - TG-1301
+            type_argument_1_1,
+            {{require_type::type_argument_kindt::Inst,
+               "java::java.lang.Integer"}});
         }
       }
 
@@ -188,13 +208,29 @@ SCENARIO(
           field.type(), symbol_typet("java::GenericTwoParam"));
         THEN("The pointer should be generic")
         {
+          const java_generic_typet &generic_field =
+            require_type::require_java_generic_type(
+              field.type(),
+              {{require_type::type_argument_kindt::Inst,
+                 "java::Generic"},
+               {require_type::type_argument_kindt::Inst,
+                 "java::GenericTwoParam"}});
+
+          const typet &type_argument_1 =
+            generic_field.generic_type_arguments().at(0);
           require_type::require_java_generic_type(
-            field.type(),
-            {{require_type::type_argument_kindt::Inst,
-               "java::Generic"},
+            type_argument_1,
+            {{require_type::type_argument_kindt::Var,
+               class_prefix + "::T"}});
+
+          const typet &type_argument_2 =
+            generic_field.generic_type_arguments().at(1);
+          require_type::require_java_generic_type(
+            type_argument_2,
+            {{require_type::type_argument_kindt::Var,
+               class_prefix + "::S"},
              {require_type::type_argument_kindt::Inst,
-               "java::GenericTwoParam"}});
-          // TODO extend when nested generics are parsed correctly - TG-1301
+               "java::java.lang.Integer"}});
         }
       }
     }