88
99#include < testing-utils/catch.hpp>
1010#include < testing-utils/load_java_class.h>
11- #include < testing-utils/require_symbol.h>
1211#include < testing-utils/require_type.h>
1312
14- #include < memory>
15-
16- #include < util/config.h>
17- #include < util/language.h>
18- #include < java_bytecode/java_bytecode_language.h>
19-
2013SCENARIO (
2114 " parse_generic_fields" ,
2215 " [core][java_bytecode][java_bytecode_parse_generics]" )
@@ -73,8 +66,7 @@ SCENARIO(
7366 require_type::require_java_generic_type (
7467 field.type (),
7568 {{require_type::type_parameter_kindt::Inst,
76- " java::java"
77- " .lang.Integer" }});
69+ " java::java.lang.Integer" }});
7870 }
7971 }
8072
@@ -89,8 +81,7 @@ SCENARIO(
8981 require_type::require_java_generic_type (
9082 field.type (),
9183 {{require_type::type_parameter_kindt::Inst,
92- " java::java"
93- " .lang.Integer" }});
84+ " java::java.lang.Integer" }});
9485 }
9586 }
9687
@@ -165,8 +156,9 @@ SCENARIO(
165156 require_type::require_java_generic_type (
166157 field.type (),
167158 {{require_type::type_parameter_kindt::Inst,
168- " java::java.lang.Integer" },
169- {require_type::type_parameter_kindt::Var, class_prefix + " ::T" }});
159+ " java::java.lang.Integer" },
160+ {require_type::type_parameter_kindt::Var,
161+ class_prefix + " ::T" }});
170162 }
171163 }
172164
@@ -180,10 +172,10 @@ SCENARIO(
180172 {
181173 require_type::require_java_generic_type (
182174 field.type (),
183- {{require_type::type_parameter_kindt::Var, class_prefix + " ::T" },
175+ {{require_type::type_parameter_kindt::Var,
176+ class_prefix + " ::T" },
184177 {require_type::type_parameter_kindt::Inst,
185- " java::java.lang"
186- " .Integer" }});
178+ " java::java.lang.Integer" }});
187179 }
188180 }
189181
@@ -214,9 +206,10 @@ SCENARIO(
214206 {
215207 require_type::require_java_generic_type (
216208 field.type (),
217- {{require_type::type_parameter_kindt::Inst, " java::Generic" },
209+ {{require_type::type_parameter_kindt::Inst,
210+ " java::Generic" },
218211 {require_type::type_parameter_kindt::Inst,
219- " java::GenericTwoParam" }});
212+ " java::GenericTwoParam" }});
220213 // TODO extend when nested generics are parsed correctly - TG-1301
221214 }
222215 }
0 commit comments