Skip to content

Commit 88ba519

Browse files
JohnDumbellJohnDumbell
committed
Review amendments
1 parent 508bcc7 commit 88ba519

21 files changed

+60
-93
lines changed

‎regression/end_to_end/prepare_scan/binaries/test/something/whatever/Annotation.class

-31 Bytes
Binary file not shown.

‎regression/end_to_end/prepare_scan/binaries/test/something/whatever/Classes.class

-25 Bytes
Binary file not shown.

‎regression/end_to_end/prepare_scan/binaries/test/something/whatever/MoreClasses.class

-46 Bytes
Binary file not shown.

‎regression/end_to_end/prepare_scan/binaries/test/something/whatever/MoreInterfaces.class

-133 Bytes
Binary file not shown.

‎regression/end_to_end/prepare_scan/configurations/class_annotation.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"class_pattern": {
10+
"classPattern": {
1111
"annotations": [
1212
"test.something.whatever.Annotation"
1313
]

‎regression/end_to_end/prepare_scan/configurations/class_annotation_and_method_annotation.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"class_pattern": {
10+
"classPattern": {
1111
"annotations": [
1212
"test.something.whatever.Annotation"
1313
]
1414
},
15-
"method_pattern": {
15+
"methodPattern": {
1616
"annotations": [
1717
"test.something.whatever.Annotation"
1818
]

‎regression/end_to_end/prepare_scan/configurations/class_extends.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"class_pattern": {
10+
"classPattern": {
1111
"extends": [
1212
"test.something.whatever.MoreClasses"
1313
]

‎regression/end_to_end/prepare_scan/configurations/class_full.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"class_pattern": {
11-
"names": [
12-
"test.something.whatever.Classes"
13-
],
14-
"annotations": [
10+
"classPattern": {
11+
"annotations": [
1512
"test.something.whatever.Annotation"
1613
],
1714
"extends": [

‎regression/end_to_end/prepare_scan/configurations/class_implements.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"class_pattern": {
10+
"classPattern": {
1111
"implements": [
1212
"test.something.whatever.Interface"
1313
]

‎regression/end_to_end/prepare_scan/configurations/class_name.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎regression/end_to_end/prepare_scan/configurations/full_run.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"class_pattern": {
10+
"classPattern": {
1111
"annotations": [
1212
"test.something.whatever.Annotation"
1313
]

‎regression/end_to_end/prepare_scan/configurations/method_annotation.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"method_pattern": {
10+
"methodPattern": {
1111
"annotations": [
1212
"test.something.whatever.Annotation"
1313
]

‎regression/end_to_end/prepare_scan/configurations/method_arguments.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"method_pattern": {
10+
"methodPattern": {
1111
"arguments": [
1212
"java.lang.String"
1313
]

‎regression/end_to_end/prepare_scan/configurations/method_full.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"method_pattern": {
10+
"methodPattern": {
1111
"names": [
1212
"Testing"
1313
],

‎regression/end_to_end/prepare_scan/configurations/method_name.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"method_pattern": {
10+
"methodPattern": {
1111
"names": [
1212
"Fake"
1313
]

‎regression/end_to_end/prepare_scan/configurations/method_returns.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"collected_classes_info_path": "",
3-
"collected_classes_path": "",
4-
"detected_entry_points_path": "",
5-
"pattern_group": [
2+
"collectedClassesInfoPath": "",
3+
"collectedClassesPath": "",
4+
"detectedEntryPointsPath": "",
5+
"patternGroup": [
66
{
77
"id": "General",
88
"patterns": [
99
{
10-
"method_pattern": {
10+
"methodPattern": {
1111
"returns": [
1212
"test.something.whatever.Classes"
1313
]

‎regression/end_to_end/prepare_scan/src/Annotation.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@
55
@Retention(RetentionPolicy.RUNTIME)
66
@Target({ElementType.TYPE, ElementType.METHOD})
77
public @interface Annotation {
8-
String value();
98
}

‎regression/end_to_end/prepare_scan/src/Classes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import javax.xml.ws.RespectBinding;
44

55
@RespectBinding
6-
@Annotation("Dave")
6+
@Annotation()
77
public class Classes extends MoreClasses implements Interface {
88

9-
@Annotation("Dave")
9+
@Annotation()
1010
public Classes Testing(String something, Interface interfake)
1111
{
1212
return null;

‎regression/end_to_end/prepare_scan/src/MoreClasses.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package test.something.whatever;
22

3-
public class MoreClasses implements MoreInterfaces {
3+
public class MoreClasses {
44
}

‎regression/end_to_end/prepare_scan/src/MoreInterfaces.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎regression/end_to_end/prepare_scan/test_full_pipeline.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ def test_class_implements():
8080
cleanup(output_folder)
8181

8282

83-
def test_class_name():
84-
commandline, output_folder = build_default_commandline("class_name")
85-
run_commandline_and_assert(commandline, output_folder)
86-
cleanup(output_folder)
87-
88-
8983
def test_method_annotation():
9084
commandline, output_folder = build_default_commandline("method_annotation")
9185
run_commandline_and_assert(commandline, output_folder)

0 commit comments

Comments
 (0)