Extending test for signature/descriptor mismatch

Author: svorenova

unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$Inner.class

@@ -1,5 +1,6 @@
 public class SignatureDescriptorMismatch<T>
 {
+  // this models ArrayList.Sublist.<init> for which we were getting an error
   private class Inner
   {
     private final AbstractGeneric<T> u;
@@ -10,6 +11,7 @@ private class Inner
     }
   }
 
+  // this models another situation in which the error occurred
   private enum InnerEnum
   {
 

unit/java_bytecode/java_bytecode_parse_generics/SignatureDescriptorMismatch$InnerEnum.class

@@ -52,6 +52,15 @@ SCENARIO(
     const code_typet func_code=
       to_code_type(new_symbol_table.lookup_ref(process_func_name).type);
     REQUIRE(func_code.parameters().size()==3);
+
+    // TODO: for now, the parameters are not generic because we fall back to
+    // descriptor due to mismatch; enable tests when fixed
+    // code_typet::parametert param_parent=
+    //  require_type::require_parameter(func_code,"arg1a");
+    // REQUIRE(is_java_generic_type(param_parent.type()));
+    // code_typet::parametert param_t=
+    //  require_type::require_parameter(func_code,"t");
+    // REQUIRE(is_java_generic_type(param_t.type()));
   }
 
   const std::string inner_enum_prefix=class_prefix+"$InnerEnum";
@@ -78,5 +87,14 @@ SCENARIO(
     const code_typet func_code=
       to_code_type(new_symbol_table.lookup_ref(process_func_name).type);
     REQUIRE(func_code.parameters().size()==3);
+
+    // TODO: for now, the parameters are not generic because we fall back to
+    // descriptor due to mismatch; enable tests when fixed
+    // code_typet::parametert param_parent=
+    //  require_type::require_parameter(func_code,"arg1a");
+    // REQUIRE(is_java_generic_type(param_parent.type()));
+    // code_typet::parametert param_t=
+    //  require_type::require_parameter(func_code,"arg2i");
+    // REQUIRE(is_java_generic_type(param_t.type()));
   }
 }