Skip to content

Commit d9d9ea1

Browse files
author
svorenova
committed
Cleaning includes, unifying scenario names, adding JIRA references
1 parent 2883bb1 commit d9d9ea1

11 files changed

+105
-94
lines changed

‎unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
#include <testing-utils/require_symbol.h>
1212
#include <testing-utils/require_type.h>
1313

14-
#include <istream>
1514
#include <memory>
1615

1716
#include <util/config.h>
1817
#include <util/language.h>
19-
#include <util/message.h>
2018
#include <java_bytecode/java_bytecode_language.h>
2119

2220
SCENARIO(
23-
"java_bytecode_parse_bounded_generic_inner_classes",
21+
"parse_bounded_generic_inner_classes",
2422
"[core][java_bytecode][java_bytecode_parse_generics]")
2523
{
2624
const symbol_tablet &new_symbol_table = load_java_class(

‎unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@
77
\*******************************************************************/
88

99
#include <testing-utils/catch.hpp>
10+
#include <testing-utils/load_java_class.h>
11+
#include <testing-utils/require_symbol.h>
1012

11-
#include <istream>
1213
#include <memory>
1314

1415
#include <util/config.h>
1516
#include <util/language.h>
16-
#include <util/message.h>
1717
#include <java_bytecode/java_bytecode_language.h>
18-
#include <iostream>
19-
#include <testing-utils/load_java_class.h>
20-
#include <testing-utils/require_symbol.h>
2118

2219
SCENARIO(
23-
"java_bytecode_parse_derived_generic_class",
20+
"parse_derived_generic_class",
2421
"[core][java_bytecode][java_bytecode_parse_generics]")
2522
{
2623
const symbol_tablet &new_symbol_table = load_java_class(
@@ -36,6 +33,6 @@ SCENARIO(
3633
require_symbol::require_complete_class(derived_symbol);
3734

3835
// TODO(tkiley): Currently we do not support extracting information
39-
// about the base classes generic information.
36+
// about the base classes generic information - issue TG-1287
4037
}
4138
}

‎unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,16 @@
77
\*******************************************************************/
88

99
#include <testing-utils/catch.hpp>
10+
#include <testing-utils/load_java_class.h>
11+
#include <testing-utils/require_type.h>
1012

1113
#include <util/config.h>
12-
#include <util/cmdline.h>
1314
#include <util/language.h>
14-
#include <util/prefix.h>
1515

1616
#include <java_bytecode/java_bytecode_language.h>
1717

18-
#include <iostream>
19-
#include <testing-utils/load_java_class.h>
20-
#include <testing-utils/require_type.h>
21-
2218
SCENARIO(
23-
"java_bytecode_parse_functions_with_generics",
19+
"parse_functions_with_generics",
2420
"[core][java_bytecode][java_bytecode_parse_generics]")
2521
{
2622
const symbol_tablet &new_symbol_table = load_java_class(

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77
\*******************************************************************/
88

99
#include <testing-utils/catch.hpp>
10+
#include <testing-utils/load_java_class.h>
11+
#include <testing-utils/require_type.h>
12+
#include <testing-utils/require_symbol.h>
13+
1014

1115
#include <util/config.h>
12-
#include <util/cmdline.h>
1316
#include <util/language.h>
14-
#include <util/prefix.h>
15-
1617
#include <java_bytecode/java_bytecode_language.h>
17-
#include <testing-utils/load_java_class.h>
18-
#include <testing-utils/require_type.h>
19-
#include <testing-utils/require_symbol.h>
2018

2119
SCENARIO(
22-
"java_bytecode_parse_generic_array_class",
20+
"parse_generic_array_class",
2321
"[core][java_bytecode][java_bytecode_parse_generics]")
2422
{
2523
const symbol_tablet &new_symbol_table = load_java_class(

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
#include <testing-utils/require_symbol.h>
1212
#include <testing-utils/require_type.h>
1313

14-
#include <istream>
1514
#include <memory>
1615

1716
#include <util/config.h>
1817
#include <util/language.h>
19-
#include <util/message.h>
2018
#include <java_bytecode/java_bytecode_language.h>
2119

2220
SCENARIO(
23-
"java_bytecode_parse_generic_class_one_param",
21+
"parse_generic_class_one_param",
2422
"[core][java_bytecode][java_bytecode_parse_generics]")
2523
{
2624
const symbol_tablet &new_symbol_table =
@@ -92,7 +90,7 @@ SCENARIO(
9290
}
9391

9492
SCENARIO(
95-
"java_bytecode_parse_generic_class_two_param",
93+
"parse_generic_class_two_param",
9694
"[core][java_bytecode][java_bytecode_parse_generics]")
9795
{
9896
const symbol_tablet &new_symbol_table = load_java_class(

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
#include <testing-utils/require_symbol.h>
1111
#include <testing-utils/require_type.h>
1212

13-
#include <util/cmdline.h>
1413
#include <util/config.h>
1514
#include <util/language.h>
16-
#include <util/prefix.h>
17-
#include <util/std_types.h>
1815

1916
#include <java_bytecode/java_bytecode_language.h>
2017

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515

1616
#include <java_bytecode/java_bytecode_language.h>
1717

18-
#include <iostream>
1918
#include <testing-utils/load_java_class.h>
2019
#include <testing-utils/require_type.h>
2120

2221
SCENARIO(
23-
"java_bytecode_parse_generic_functions",
22+
"parse_generic_functions",
2423
"[core][java_bytecode][java_bytecode_parse_generics]")
2524
{
2625
const symbol_tablet &new_symbol_table = load_java_class(

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,15 @@
77
\*******************************************************************/
88

99
#include <testing-utils/catch.hpp>
10+
#include <testing-utils/load_java_class.h>
1011

1112
#include <util/config.h>
12-
#include <util/cmdline.h>
1313
#include <util/language.h>
14-
#include <util/prefix.h>
1514

1615
#include <java_bytecode/java_bytecode_language.h>
1716

18-
#include <iostream>
19-
#include <testing-utils/load_java_class.h>
20-
2117
SCENARIO(
22-
"java_bytecode_parse_generic_wildcard",
18+
"parse_generic_wildcard",
2319
"[core][java_bytecode][java_bytecode_parse_generics]")
2420
{
2521
const symbol_tablet &new_symbol_table=

0 commit comments

Comments
 (0)