8
8
9
9
#include < testing-utils/catch.hpp>
10
10
#include < testing-utils/load_java_class.h>
11
- #include < testing-utils/require_symbol.h>
12
11
#include < testing-utils/require_type.h>
13
12
14
- #include < memory>
15
-
16
- #include < util/config.h>
17
- #include < util/language.h>
18
- #include < java_bytecode/java_bytecode_language.h>
19
-
20
13
SCENARIO (
21
14
" parse_generic_fields" ,
22
15
" [core][java_bytecode][java_bytecode_parse_generics]" )
@@ -73,8 +66,7 @@ SCENARIO(
73
66
require_type::require_java_generic_type (
74
67
field.type (),
75
68
{{require_type::type_parameter_kindt::Inst,
76
- " java::java"
77
- " .lang.Integer" }});
69
+ " java::java.lang.Integer" }});
78
70
}
79
71
}
80
72
@@ -89,8 +81,7 @@ SCENARIO(
89
81
require_type::require_java_generic_type (
90
82
field.type (),
91
83
{{require_type::type_parameter_kindt::Inst,
92
- " java::java"
93
- " .lang.Integer" }});
84
+ " java::java.lang.Integer" }});
94
85
}
95
86
}
96
87
@@ -165,8 +156,9 @@ SCENARIO(
165
156
require_type::require_java_generic_type (
166
157
field.type (),
167
158
{{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" }});
170
162
}
171
163
}
172
164
@@ -180,10 +172,10 @@ SCENARIO(
180
172
{
181
173
require_type::require_java_generic_type (
182
174
field.type (),
183
- {{require_type::type_parameter_kindt::Var, class_prefix + " ::T" },
175
+ {{require_type::type_parameter_kindt::Var,
176
+ class_prefix + " ::T" },
184
177
{require_type::type_parameter_kindt::Inst,
185
- " java::java.lang"
186
- " .Integer" }});
178
+ " java::java.lang.Integer" }});
187
179
}
188
180
}
189
181
@@ -214,9 +206,10 @@ SCENARIO(
214
206
{
215
207
require_type::require_java_generic_type (
216
208
field.type (),
217
- {{require_type::type_parameter_kindt::Inst, " java::Generic" },
209
+ {{require_type::type_parameter_kindt::Inst,
210
+ " java::Generic" },
218
211
{require_type::type_parameter_kindt::Inst,
219
- " java::GenericTwoParam" }});
212
+ " java::GenericTwoParam" }});
220
213
// TODO extend when nested generics are parsed correctly - TG-1301
221
214
}
222
215
}
0 commit comments