Skip to content

Commit f957036

Browse files
jeannielynnmoultonjeannielynnmoulton
committed
fixup! Fixes unit tests
1 parent 63feb6e commit f957036

5 files changed

+23
-15
lines changed

‎jbmc/unit/java_bytecode/java_bytecode_parser/InnerClassesDeeplyNested$SinglyNestedClass$DefaultDoubleNestedInnerClass.class

-596 Bytes
Binary file not shown.

‎jbmc/unit/java_bytecode/java_bytecode_parser/InnerClassesDeeplyNested$SinglyNestedClass$PrivateDoubleNestedInnerClass.class

-596 Bytes
Binary file not shown.

‎jbmc/unit/java_bytecode/java_bytecode_parser/InnerClassesDeeplyNested$SinglyNestedClass$ProtectedDoubleNestedInnerClass.class

-600 Bytes
Binary file not shown.

‎jbmc/unit/java_bytecode/java_bytecode_parser/InnerClassesDeeplyNested$SinglyNestedClass$PublicDoubleNestedInnerClass.class

-594 Bytes
Binary file not shown.

‎jbmc/unit/java_bytecode/java_bytecode_parser/parse_java_attributes.cpp

+23-15
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ SCENARIO(
1616
"java_bytecode_parse_attributes",
1717
"[core][java_bytecode][java_bytecode_parser]")
1818
{
19-
const symbol_tablet &new_symbol_table =
20-
load_java_class("InnerClasses", "./java_bytecode/java_bytecode_parser");
2119
GIVEN("Some public class files in the class path with inner classes")
2220
{
21+
const symbol_tablet &new_symbol_table =
22+
load_java_class("InnerClasses", "./java_bytecode/java_bytecode_parser");
2323
WHEN("Parsing the InnerClasses attribute for a public inner class")
2424
{
2525
THEN("The class should be marked as public")
@@ -71,6 +71,8 @@ SCENARIO(
7171
}
7272
GIVEN("Some package-private class files in the class path with inner classes")
7373
{
74+
const symbol_tablet &new_symbol_table =
75+
load_java_class("InnerClassesDefault", "./java_bytecode/java_bytecode_parser");
7476
WHEN("Parsing the InnerClasses attribute for a public inner class")
7577
{
7678
THEN("The class should be marked as public")
@@ -125,6 +127,8 @@ SCENARIO(
125127
"Some package-private class files in the class path with deeply nested "
126128
"inner classes")
127129
{
130+
const symbol_tablet &new_symbol_table =
131+
load_java_class("InnerClassesDeeplyNested", "./java_bytecode/java_bytecode_parser");
128132
WHEN(
129133
"Parsing the InnerClasses attribute for a public doubly-nested inner "
130134
"class")
@@ -133,7 +137,7 @@ SCENARIO(
133137
{
134138
const symbolt &class_symbol = new_symbol_table.lookup_ref(
135139
"java::InnerClassesDeeplyNested$SinglyNestedClass$"
136-
"PublicDoublyInnerClass");
140+
"PublicDoublyNestedInnerClass");
137141
const java_class_typet java_class =
138142
to_java_class_type(class_symbol.type);
139143
REQUIRE(java_class.get_is_inner_class());
@@ -148,7 +152,7 @@ SCENARIO(
148152
{
149153
const symbolt &class_symbol = new_symbol_table.lookup_ref(
150154
"java::InnerClassesDeeplyNested$SinglyNestedClass$"
151-
"DefaultDoublyInnerClass");
155+
"DefaultDoublyNestedInnerClass");
152156
const java_class_typet java_class =
153157
to_java_class_type(class_symbol.type);
154158
REQUIRE(java_class.get_is_inner_class());
@@ -163,7 +167,7 @@ SCENARIO(
163167
{
164168
const symbolt &class_symbol = new_symbol_table.lookup_ref(
165169
"java::InnerClassesDeeplyNested$SinglyNestedClass$"
166-
"ProtectedDoublyInnerClass");
170+
"ProtectedDoublyNestedInnerClass");
167171
const java_class_typet java_class =
168172
to_java_class_type(class_symbol.type);
169173
REQUIRE(java_class.get_is_inner_class());
@@ -178,7 +182,7 @@ SCENARIO(
178182
{
179183
const symbolt &class_symbol = new_symbol_table.lookup_ref(
180184
"java::InnerClassesDeeplyNested$SinglyNestedClass$"
181-
"PrivateDoublyInnerClass");
185+
"PrivateDoublyNestedInnerClass");
182186
const java_class_typet java_class =
183187
to_java_class_type(class_symbol.type);
184188
REQUIRE(java_class.get_is_inner_class());
@@ -190,6 +194,8 @@ SCENARIO(
190194
GIVEN(
191195
"Some package-private class files in the class path with anonymous classes")
192196
{
197+
const symbol_tablet &new_symbol_table =
198+
load_java_class("ContainsAnonymousClass", "./java_bytecode/java_bytecode_parser");
193199
WHEN("Parsing the InnerClasses attribute for a public anonymous class")
194200
{
195201
THEN("The class should be marked as public")
@@ -198,8 +204,8 @@ SCENARIO(
198204
new_symbol_table.lookup_ref("java::ContainsAnonymousClass$1");
199205
const java_class_typet java_class =
200206
to_java_class_type(class_symbol.type);
201-
REQUIRE(java_class.get_is_inner_class());
202-
REQUIRE(java_class.get_access() == ID_public);
207+
REQUIRE_FALSE(java_class.get_is_inner_class());
208+
REQUIRE(java_class.get_access() == ID_private);
203209
}
204210
}
205211
WHEN(
@@ -212,8 +218,8 @@ SCENARIO(
212218
new_symbol_table.lookup_ref("java::ContainsAnonymousClass$2");
213219
const java_class_typet java_class =
214220
to_java_class_type(class_symbol.type);
215-
REQUIRE(java_class.get_is_inner_class());
216-
REQUIRE(java_class.get_access() == ID_default);
221+
REQUIRE_FALSE(java_class.get_is_inner_class());
222+
REQUIRE(java_class.get_access() == ID_private);
217223
}
218224
}
219225
WHEN("Parsing the InnerClasses attribute for a protected anonymous class")
@@ -224,8 +230,8 @@ SCENARIO(
224230
new_symbol_table.lookup_ref("java::ContainsAnonymousClass$3");
225231
const java_class_typet java_class =
226232
to_java_class_type(class_symbol.type);
227-
REQUIRE(java_class.get_is_inner_class());
228-
REQUIRE(java_class.get_access() == ID_protected);
233+
REQUIRE_FALSE(java_class.get_is_inner_class());
234+
REQUIRE(java_class.get_access() == ID_private);
229235
}
230236
}
231237
WHEN("Parsing the InnerClasses attribute for a private anonymous class")
@@ -236,7 +242,7 @@ SCENARIO(
236242
new_symbol_table.lookup_ref("java::ContainsAnonymousClass$4");
237243
const java_class_typet java_class =
238244
to_java_class_type(class_symbol.type);
239-
REQUIRE(java_class.get_is_inner_class());
245+
REQUIRE_FALSE(java_class.get_is_inner_class());
240246
REQUIRE(java_class.get_access() == ID_private);
241247
}
242248
}
@@ -245,16 +251,18 @@ SCENARIO(
245251
GIVEN(
246252
"Some package-private class files in the class path with local classes ")
247253
{
254+
const symbol_tablet &new_symbol_table =
255+
load_java_class("ContainsLocalClass", "./java_bytecode/java_bytecode_parser");
248256
WHEN("Parsing the InnerClasses attribute for a package-private class ")
249257
{
250258
THEN("The class should be marked as package-private")
251259
{
252260
const symbolt &class_symbol =
253-
new_symbol_table.lookup_ref("java::ContainsLocalClass$LocalClass$");
261+
new_symbol_table.lookup_ref("java::ContainsLocalClass$1LocalClass");
254262
const java_class_typet java_class =
255263
to_java_class_type(class_symbol.type);
256264
REQUIRE(java_class.get_is_inner_class());
257-
REQUIRE(java_class.get_access() == ID_default);
265+
REQUIRE(java_class.get_access() == ID_private);
258266
}
259267
}
260268
}

0 commit comments

Comments
 (0)