Skip to content

Commit 6fa01bf

Browse files
haunerhauner
committed
clean up
1 parent b218e7f commit 6fa01bf

File tree

12 files changed

+51
-34
lines changed

12 files changed

+51
-34
lines changed

‎openapi-processor-core/src/testInt/kotlin/io/openapiprocessor/core/CompileExpectedSpec.kt

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class CompileExpectedSpec: StringSpec({
4444
}
4545
}
4646

47-
4847
for (testSet in sources()) {
4948
"compile - $testSet".config(enabled = true) {
5049
val itemsReader = TestItemsReader(ResourceReader(CompileExpectedSpec::class.java))
@@ -53,38 +52,11 @@ class CompileExpectedSpec: StringSpec({
5352
val sourcePath = "/tests/$source"
5453

5554
val compilePaths = mutableListOf<Path>()
56-
if (source != "generated") {
57-
compilePaths.add(Path.of("src/testInt/resources/compile/Generated.java"))
58-
}
55+
56+
// stuff used by all tests
57+
compilePaths.add(Path.of("src/testInt/resources/compile/Generated.java"))
5958
compilePaths.add(Path.of("src/testInt/resources/compile/Mapping.java"))
6059
compilePaths.add(Path.of("src/testInt/resources/compile/Parameter.java"))
61-
compilePaths.add(Path.of("src/testInt/resources/compile/Prefix.java"))
62-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/Constraint.java"))
63-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/ConstraintValidator.java"))
64-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/ConstraintValidatorContext.java"))
65-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/NotNull.java"))
66-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/Payload.java"))
67-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/Size.java"))
68-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/DecimalMin.java"))
69-
compilePaths.add(Path.of("src/testInt/resources/compile/jakarta/Valid.java"))
70-
compilePaths.add(Path.of("src/testInt/resources/compile/javax/Valid.java"))
71-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/FooA.java"))
72-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/FooB.java"))
73-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/FooC.java"))
74-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/Wrap.java"))
75-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/Bar1.java"))
76-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/Bar2.java"))
77-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/Something.java"))
78-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/SomethingElse.java"))
79-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/Annotation.java"))
80-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/AnnotationA.java"))
81-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/AnnotationB.java"))
82-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/AnnotationC.java"))
83-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/ParamAnnotation.java"))
84-
compilePaths.add(Path.of("src/testInt/resources/compile/oap/Generated.java"))
85-
compilePaths.add(Path.of("src/testInt/resources/compile/reactor/Mono.java"))
86-
compilePaths.add(Path.of("src/testInt/resources/compile/reactor/Flux.java"))
87-
compilePaths.add(Path.of("src/testInt/resources/compile/spring/ResponseEntity.java"))
8860

8961
var expected = itemsReader.read(sourcePath, "outputs.yaml").items
9062
expected = expected.filter { ! it.endsWith("properties") }
@@ -95,8 +67,13 @@ class CompileExpectedSpec: StringSpec({
9567

9668
if (itemsReader.exists(sourcePath, "compile.yaml")) {
9769
val additionalFileNames = itemsReader.read(sourcePath, "compile.yaml").items
70+
9871
additionalFileNames.forEach {
99-
compilePaths.add(Path.of("src/testInt/resources/$it"))
72+
if (it.startsWith("not ")) {
73+
compilePaths.remove(Path.of("src/testInt/resources/${it.substring(4)}"))
74+
} else {
75+
compilePaths.add(Path.of("src/testInt/resources/$it"))
76+
}
10077
}
10178
}
10279

‎openapi-processor-core/src/testInt/resources/tests/annotation-mapping-class/compile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
items:
2-
- compile/oap/Bar.java
32
- compile/oap/Annotation.java
3+
- compile/oap/Bar.java
44
- compile/oap/ClassAnnotation.java
55
- compile/oap/Param.java

‎openapi-processor-core/src/testInt/resources/tests/bean-validation-jakarta/compile.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
items:
2+
- compile/jakarta/Valid.java
3+
- compile/jakarta/Size.java

‎openapi-processor-core/src/testInt/resources/tests/extension-mapping/compile.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
items:
2+
- compile/oap/FooA.java
3+
- compile/oap/FooB.java
4+
- compile/oap/FooC.java

‎openapi-processor-core/src/testInt/resources/tests/generated/compile.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
items:
2+
- not compile/Generated.java

‎openapi-processor-core/src/testInt/resources/tests/map-many/compile.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
items:
2+
- compile/oap/AnnotationA.java
3+
- compile/oap/AnnotationB.java
4+
- compile/oap/AnnotationC.java
5+
- compile/oap/Bar2.java
6+
- compile/oap/ParamAnnotation.java
7+
- compile/oap/Something.java
8+
- compile/oap/SomethingElse.java
9+
- compile/oap/Wrap.java
10+
- compile/jakarta/Valid.java
11+
- compile/jakarta/DecimalMin.java

‎openapi-processor-core/src/testInt/resources/tests/packages/compile.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
items:
2+
- compile/oap/Generated.java

‎openapi-processor-core/src/testInt/resources/tests/params-enum-string/compile.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
items:
2+
- compile/jakarta/NotNull.java
3+
- compile/jakarta/Constraint.java
4+
- compile/jakarta/Payload.java
5+
- compile/jakarta/ConstraintValidator.java
6+
- compile/jakarta/ConstraintValidatorContext.java
7+

‎openapi-processor-core/src/testInt/resources/tests/response-reactive-mapping/compile.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
items:
2+
- compile/reactor/Flux.java
3+
- compile/reactor/Mono.java

‎openapi-processor-core/src/testInt/resources/tests/response-reactive-result-mapping/compile.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
items:
2+
- compile/reactor/Flux.java
3+
- compile/reactor/Mono.java
4+
- compile/spring/ResponseEntity.java

‎openapi-processor-core/src/testInt/resources/tests/response-result-mapping/compile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
items:
2-
- compile/oap/Wrap.java
2+
- compile/spring/ResponseEntity.java

‎openapi-processor-core/src/testInt/resources/tests/response-result-reactive-mapping/compile.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
items:
2+
- compile/spring/ResponseEntity.java
3+
- compile/reactor/Flux.java
4+
- compile/reactor/Mono.java

0 commit comments

Comments
 (0)