simpler test setup

Author: hauner

src/testInt/kotlin/io/openapiprocessor/micronaut/CompileExpectedSpec.kt

@@ -37,21 +37,5 @@ class CompileExpectedSpec: StringSpec({
 })
 
 private fun sources(): Collection<TestSet> {
-    val compile30 = ALL_30.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val compile31 = ALL_31.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val compile30r = ALL_30.filter { it.modelTypes.contains(ModelTypes.RECORD) }.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "record", outputs = it.outputs, expected = it.expected)
-    }
-
-    val compile31r = ALL_31.filter { it.modelTypes.contains(ModelTypes.RECORD) }.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "record", outputs = it.outputs, expected = it.expected)
-    }
-
-    return compile30 + compile31 + compile30r + compile31r
+    return buildTestSets()
 }

src/testInt/kotlin/io/openapiprocessor/micronaut/ProcessorEndToEndJimfsSpec.kt

@@ -36,25 +36,6 @@ class ProcessorEndToEndJimfsSpec: StringSpec({
 private fun sources(): Collection<TestSet> {
     // the swagger parser does not work with a custom FileSystem
 
-    val openapi4j = ALL_30.map {
-        testSet(it.name, ParserType.OPENAPI4J, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi30 = ALL_30.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi31 = ALL_31.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi30r = ALL_30.filter { it.modelTypes.contains(ModelTypes.RECORD) }.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "record", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi31r = ALL_31.filter { it.modelTypes.contains(ModelTypes.RECORD) }.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "record", outputs = it.outputs, expected = it.expected)
-    }
-
-    return openapi4j + openapi30 + openapi31 + openapi30r + openapi31r
+    return buildTestSets()
+        .filter { it.parser != "SWAGGER" }
 }

src/testInt/kotlin/io/openapiprocessor/micronaut/ProcessorEndToEndSpec.kt

@@ -33,29 +33,5 @@ class ProcessorEndToEndSpec: StringSpec({
 })
 
 private fun sources(): Collection<TestSet> {
-    val swagger = ALL_30.map {
-        testSet(it.name, ParserType.SWAGGER, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi4j = ALL_30.map {
-        testSet(it.name, ParserType.OPENAPI4J, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi30 = ALL_30.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi31 = ALL_31.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "default", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi30r = ALL_30.filter { it.modelTypes.contains(ModelTypes.RECORD) }.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "record", outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi31r = ALL_31.filter { it.modelTypes.contains(ModelTypes.RECORD) }.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, model = "record", outputs = it.outputs, expected = it.expected)
-    }
-
-    return swagger + openapi4j + openapi30 + openapi31 + openapi30r + openapi31r
+    return buildTestSets()
 }

src/testInt/kotlin/io/openapiprocessor/micronaut/ProcessorPendingSpec.kt

@@ -8,8 +8,6 @@ package io.openapiprocessor.micronaut
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.engine.spec.tempdir
 import io.kotest.matchers.booleans.shouldBeTrue
-import io.openapiprocessor.core.parser.ParserType.INTERNAL
-import io.openapiprocessor.core.parser.ParserType.SWAGGER
 import io.openapiprocessor.test.*
 
 /**
@@ -34,8 +32,6 @@ class ProcessorPendingSpec: StringSpec({
 
 private fun sources(): Collection<TestSet> {
     return listOf(
-        testSet("params-path-simple-data-types", SWAGGER, API_30, model = "default", outputs = "outputs.yaml", expected = "outputs"),
-//        testSet("bean-validation-introspected", INTERNAL, API_30, model = "default", outputs = "outputs.yaml", expected = "outputs"),
-//        testSet("bean-validation-introspected", INTERNAL, API_31, model = "default", outputs = "outputs.yaml", expected = "outputs")
+        testSet("params-path-simple-data-types", "SWAGGER", API_30),
     )
 }

src/testInt/kotlin/io/openapiprocessor/micronaut/ProcessorTestSets.kt

@@ -5,29 +5,73 @@
 
 package io.openapiprocessor.micronaut
 
-import io.openapiprocessor.test.*
-import io.openapiprocessor.test.test30_D_
+import io.openapiprocessor.micronaut.processor.MicronautServiceV2
+import io.openapiprocessor.test.TestParams2
+import io.openapiprocessor.test.TestSet
+import io.openapiprocessor.test.join
+import io.openapiprocessor.test.testX
+import io.openapiprocessor.test.tests
 
-val ALL_30: List<TestParams> = listOf(
-    test30_DR("bean-validation-introspected"),
-    test30_D_("endpoint-http-mapping"),
-    test30_DR("params-complex-data-types"),
-    test30_D_("params-pageable-mapping"),
-    test30_D_("params-path-simple-data-types"),
-    test30_DR("params-request-body"),
-    test30_DR("params-request-body-multipart-mapping"),
-    test30_D_("params-simple-data-types"),
-    test30_D_("response-status")
+val ALL_3x: List<TestParams2> = join(
+    emptyList(),
+    tests("bean-validation-introspected"),
+    testX("endpoint-http-mapping"),
+    tests("params-complex-data-types"),
+    testX("params-pageable-mapping"),
+    testX("params-path-simple-data-types"),
+    tests("params-request-body"),
+    tests("params-request-body-multipart-mapping"),
+    testX("params-simple-data-types"),
+    testX("response-status")
 )
 
-val ALL_31: List<TestParams> = listOf(
-    test31_DR("bean-validation-introspected"),
-    test31_D_("endpoint-http-mapping"),
-    test31_DR("params-complex-data-types"),
-    test31_D_("params-pageable-mapping"),
-    test31_D_("params-path-simple-data-types"),
-    test31_DR("params-request-body"),
-    test31_DR("params-request-body-multipart-mapping"),
-    test31_D_("params-simple-data-types"),
-    test31_D_("response-status")
-)
+fun testSet(
+    name: String,
+    parser: String = "INTERNAL",
+    openapi: String = "openapi.yaml",
+    model: String = "default",
+    inputs: String = "inputs.yaml",
+    outputs: String = "outputs.yaml",
+    expected: String = "outputs"
+): TestSet {
+    val testSet = TestSet()
+    testSet.name = name
+    testSet.processor = MicronautServiceV2(testMode = true)
+    testSet.parser = parser
+    testSet.modelType = model
+    testSet.openapi = openapi
+    testSet.inputs = inputs
+    testSet.outputs = outputs
+    testSet.expected = expected
+    return testSet
+}
+
+fun buildTestSets(): List<TestSet> {
+    return ALL_3x
+        .filter {
+            when (it.parser) {
+                "INTERNAL" -> {
+                    true
+                }
+                "SWAGGER" if it.openapi == "openapi30.yaml" -> {
+                    true
+                }
+                "OPENAPI4J" if it.openapi == "openapi30.yaml" -> {
+                    true
+                }
+                else -> {
+                    false
+                }
+            }
+        }
+        .map {
+            testSet(
+                it.name,
+                it.parser,
+                it.openapi,
+                model = it.modelType,
+                outputs = it.outputs,
+                expected = it.expected
+            )
+        }
+}

src/testInt/kotlin/io/openapiprocessor/micronaut/ProcessorTestSetsSupport.kt

@@ -1,4 +1,5 @@
 items:
   - inputs/openapi30.yaml
   - inputs/openapi31.yaml
+  - inputs/openapi32.yaml
   - inputs/mapping.yaml

src/testInt/resources/tests/bean-validation-introspected/inputs.yaml

@@ -1,4 +1,5 @@
 items:
   - inputs/openapi30.yaml
   - inputs/openapi31.yaml
+  - inputs/openapi32.yaml
   - inputs/mapping.yaml

src/testInt/resources/tests/endpoint-http-mapping/inputs.yaml

@@ -1,4 +1,5 @@
 items:
   - inputs/openapi30.yaml
   - inputs/openapi31.yaml
+  - inputs/openapi32.yaml
   - inputs/mapping.yaml

src/testInt/resources/tests/params-complex-data-types/inputs.yaml

@@ -1,4 +1,5 @@
 items:
   - inputs/openapi30.yaml
   - inputs/openapi31.yaml
+  - inputs/openapi32.yaml
   - inputs/mapping.yaml