simpler integration test setup

Author: hauner

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

@@ -8,8 +8,10 @@ package io.openapiprocessor.core
 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
-import io.openapiprocessor.test.*
+import io.openapiprocessor.test.ResourceReader
+import io.openapiprocessor.test.TestFilesNative
+import io.openapiprocessor.test.TestSet
+import io.openapiprocessor.test.TestSetCompiler
 
 
 class CompileExpectedSpec: StringSpec({
@@ -34,21 +36,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()
 }

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

@@ -9,7 +9,6 @@ import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.booleans.shouldBeTrue
-import io.openapiprocessor.core.parser.ParserType
 import io.openapiprocessor.test.*
 
 /**
@@ -34,22 +33,7 @@ class ProcessorEndToEndJimfsSpec: StringSpec({
 })
 
 private fun sources(): Collection<TestSet> {
-
-    // the swagger parser does not work with a custom FileSystem
-
-    val openapi4j = ALL_30
-        .filter { !EXCLUDE_OPENAPI4J.contains(it.name) }
-        .map {
-            testSet(it.name, ParserType.OPENAPI4J, it.openapi, outputs = it.outputs, expected = it.expected)
-        }
-
-    val openapi30 = ALL_30.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, outputs = it.outputs, expected = it.expected)
-    }
-
-    val openapi31 = ALL_31.map {
-        testSet(it.name, ParserType.INTERNAL, it.openapi, outputs = it.outputs, expected = it.expected)
-    }
-
-    return openapi4j + openapi30 + openapi31
+    return buildTestSets()
+        // swagger does not work with a custom FileSystem
+        .filter { it.parser != "SWAGGER" }
 }

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

@@ -31,24 +31,5 @@ class ProcessorEndToEndSpec: StringSpec({
 })
 
 private fun sources(): Collection<TestSet> {
-    return ALL_3x
-        .filter {
-            when (it.parser) {
-                "INTERNAL" -> {
-                    true
-                }
-                "SWAGGER" if it.openapi == "openapi30.yaml" -> {
-                    !EXCLUDE_SWAGGER.contains(it.name)
-                }
-                "OPENAPI4J" if it.openapi == "openapi30.yaml" -> {
-                    !EXCLUDE_OPENAPI4J.contains(it.name)
-                }
-                else -> {
-                    false
-                }
-            }
-        }
-        .map {
-            testSet(it.name, it.parser, it.openapi, model = it.modelType, outputs = it.outputs, expected = it.expected)
-        }
+    return buildTestSets()
 }

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

@@ -48,7 +48,7 @@ class ProcessorPendingSpec: StringSpec({
 
 private fun sources(): Collection<TestSet> {
     return listOf(
-        testSet("packages", INTERNAL, "api/$API_30", model = "model", outputs = "outputs.yaml", expected = "outputs"),
-        testSet("packages", INTERNAL, "api/$API_30", model = "record", outputs = "outputs.yaml", expected = "outputs"),
+        testSet("packages", "INTERNAL", "api/$API_30", model = "model"),
+        testSet("packages", "INTERNAL", "api/$API_30", model = "record"),
     )
 }

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

@@ -119,182 +119,6 @@ val ALL_3x: List<TestParams2> = join(
     tests("swagger-parsing-error")
 ).sortedWith(testParamComparator)
 
-@Deprecated(message = "merged into ALL_3x")
-val ALL_30: List<TestParams> = listOf(
-    test30_DR("annotation-mapping-class"),
-    test30_DR("bean-validation"),
-    test30_DR("bean-validation-allof-required"),
-    test30_DR("bean-validation-iterable"),
-    test30_DR("bean-validation-jakarta"),
-    test30_D_("bean-validation-list-item-import"),
-    test30_D_("bean-validation-mapping-supported"),
-    test30_D_("bean-validation-requestbody"),
-    test30_D_("bean-validation-requestbody-mapping"),
-    test30_DR("components-requestbodies"),
-    test30_DR("deprecated"),
-    test30_D_("endpoint-exclude"),
-    test30_D_("endpoint-http-mapping"), // framework specific
-    test30_DR("extension-mapping"),
-    test30_DR("format-eclipse"),
-    test30_DR("generated"),
-    test30_DR("javadoc"),
-    test30_DR("javadoc-with-mapping"),
-    test30_DR("json-input", "openapi30.json"),
-    test30_DR("keyword-identifier"),
-    test30_D_("map-from-additional-properties"),
-    test30_DR("map-from-additional-properties-with-package-name"),
-    test30_DR("map-many"),
-    test30_DR("map-to-primitive-data-types"),
-    test30_D_("method-operation-id"),
-    test30_DR("model-name-suffix"),
-    test30_DR("model-name-suffix-with-package-name"),
-    test30_D_("object-empty"),
-    test30_DR("object-nullable-properties"),
-    test30_DR("object-read-write-properties"),
-    test30_DR("object-without-properties"),
-    test30_DR(name = "packages", openapi = "api/$API_30"),
-    test30_D_("params-additional"),
-    test30_D_("params-additional-global"),
-    test30_DR("params-complex-data-types"), // framework specific
-    test30_D_("params-endpoint"),
-    test30_D_("params-enum"),
-    test30_D_("params-enum-string"),
-    test30_D_("params-path-simple-data-types"), // framework specific
-    test30_DR("params-request-body"), // framework specific
-    test30_D_("params-request-body-multipart-form-data"), // framework specific
-    test30_D_("params-simple-data-types"), // framework specific
-    test30_D_("params-unnecessary"),
-    test30_DR("ref-array-items-nested"),
-    test30_DR("ref-chain-spring-124.1"),
-    test30_DR("ref-chain-spring-124.2"),
-    test30_DR("ref-into-another-file"),
-    test30_DR("ref-into-another-file-path"),
-    test30_DR("ref-is-relative-to-current-file"),
-    test30_DR("ref-loop"),
-    test30_DR("ref-loop-array"),
-    test30_D_("ref-parameter"),
-    test30_D_("ref-parameter-with-primitive-mapping"),
-    test30_DR("ref-response"),
-    test30_DR("ref-to-escaped-path-name"),
-    test30_D_("response-array-data-type-mapping"),
-    test30_DR("response-complex-data-types"),
-    test30_DR("response-content-multiple-no-content"),
-    test30_DR("response-content-multiple-style-all"),
-    test30_DR("response-content-multiple-style-success"),
-    test30_D_("response-content-single"),
-    test30_DR("response-multi-mapping-with-array-type-mapping"),
-    test30_D_("response-reactive-mapping"),
-    test30_D_("response-reactive-result-mapping"),
-    test30_DR("response-ref-class-name"),
-    test30_D_("response-result-mapping"),
-    test30_DR("response-result-multiple"),
-    test30_DR("response-result-multiple-object"),
-    test30_D_("response-result-reactive-mapping"),
-    test30_D_("response-simple-data-types"),
-    test30_DR("response-single-multi-mapping"),
-    test30_D_("response-status"),
-    test30_DR("schema-composed"),
-    test30_DR("schema-composed-allof"),
-    test30_DR("schema-composed-allof-notype"),
-    test30_DR("schema-composed-allof-properties"),
-    test30_DR("schema-composed-allof-ref-sibling"),
-    test30_DR("schema-composed-nested"),
-    test30_DR("schema-composed-oneof-interface"),
-    //test30_DR("schema-duplicate-by-refs"), // not supported
-    test30_DR("schema-mapping"),
-    test30_DR("schema-unreferenced"),
-    test30_DR("server-url"),
-    test30_DR("swagger-parsing-error")
-)
-
-@Deprecated(message = "merged into ALL_3x")
-val ALL_31: List<TestParams> = listOf(
-    test31_DR("annotation-mapping-class"),
-    test31_DR("bean-validation"),
-    test31_DR("bean-validation-allof-required"),
-    test31_DR("bean-validation-iterable"),
-    test31_DR("bean-validation-jakarta"),
-    test31_D_("bean-validation-list-item-import"),
-    test31_D_("bean-validation-mapping-supported"),
-    test31_D_("bean-validation-requestbody"),
-    test31_D_("bean-validation-requestbody-mapping"),
-    test31_DR("components-requestbodies"),
-    test31_DR("extension-mapping"),
-    test31_DR("format-eclipse"),
-    test31_DR("deprecated"),
-    test31_D_("endpoint-exclude"),
-    test31_D_("endpoint-http-mapping"), // framework specific
-    test31_DR("generated"),
-    test31_DR("javadoc"),
-    test31_DR("javadoc-with-mapping"),
-    test31_DR("json-input", "openapi31.json"),
-    test31_DR("keyword-identifier"),
-    test31_D_("map-from-additional-properties"),
-    test31_DR("map-from-additional-properties-with-package-name"),
-    test31_DR("map-many"),
-    test31_DR("map-to-primitive-data-types"),
-    test31_D_("method-operation-id"),
-    test31_DR("model-name-suffix"),
-    test31_DR("model-name-suffix-with-package-name"),
-    test31_D_("object-empty"),
-    test31_DR("object-nullable-properties"),
-    test31_DR("object-read-write-properties"),
-    test31_DR("object-without-properties"),
-    test31_DR(name = "packages", openapi = "api/$API_31"),
-    test31_D_("params-additional"),
-    test31_D_("params-additional-global"),
-    test31_DR("params-complex-data-types"), // framework specific
-    test31_D_("params-endpoint"),
-    test31_D_("params-enum"),
-    test31_D_("params-enum-string"),
-    test31_D_("params-path-simple-data-types"), // framework specific
-    test31_DR("params-request-body"), // framework specific
-    test31_D_("params-request-body-multipart-form-data"), // framework specific
-    test31_D_("params-simple-data-types"), // framework specific
-    test31_D_("params-unnecessary"),
-    test31_DR("ref-array-items-nested"),
-    test31_DR("ref-chain-spring-124.1"),
-    test31_DR("ref-chain-spring-124.2"),
-    test31_DR("ref-into-another-file"),
-    test31_DR("ref-into-another-file-path"),
-    test31_DR("ref-is-relative-to-current-file"),
-    test31_DR("ref-loop"),
-    test31_DR("ref-loop-array"),
-    test31_D_("ref-parameter"),
-    test31_D_("ref-parameter-with-primitive-mapping"),
-    test31_DR("ref-response"),
-    test31_DR("ref-to-escaped-path-name"),
-    test31_D_("response-array-data-type-mapping"),
-    test31_DR("response-complex-data-types"),
-    test31_DR("response-content-multiple-no-content"),
-    test31_DR("response-content-multiple-style-all"),
-    test31_DR("response-content-multiple-style-success"),
-    test31_D_("response-content-single"),
-    test31_DR("response-multi-mapping-with-array-type-mapping"),
-    test31_D_("response-reactive-mapping"),
-    test31_D_("response-reactive-result-mapping"),
-    test31_DR("response-ref-class-name"),
-    test31_D_("response-result-mapping"),
-    test31_DR("response-result-multiple"),
-    test31_DR("response-result-multiple-object"),
-    test31_D_("response-result-reactive-mapping"),
-    test31_D_("response-simple-data-types"),
-    test31_DR("response-single-multi-mapping"),
-    test31_D_("response-status"),
-    test31_DR("schema-composed"),
-    test31_DR("schema-composed-allof"),
-    test31_DR("schema-composed-allof-notype"),
-    test31_DR("schema-composed-allof-properties"),
-    test31_DR("schema-composed-allof-ref-sibling"),
-    test31_DR("schema-composed-nested"),
-    test31_DR("schema-composed-oneof-interface"),
-    //test31_DR("schema-duplicate-by-refs"), // not supported
-    test31_DR("schema-mapping"),
-    test31_DR("schema-unreferenced"),
-    test31_DR("server-url"),
-    test31_DR("swagger-parsing-error")
-)
-
 val EXCLUDE_OPENAPI4J = setOf(
     // the parser assumes that "type" must be string if a non-standard format is used
     "schema-mapping",

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

@@ -5,33 +5,8 @@
 
 package io.openapiprocessor.core
 
-import io.openapiprocessor.core.parser.ParserType
 import io.openapiprocessor.test.TestSet
 
-@Deprecated(message = "use other overload")
-//@Suppress("SameParameterValue")
-fun testSet(
-    name: String,
-    parser: ParserType,
-    openapi: String = "openapi.yaml",
-    model: String = "default",
-    inputs: String = "inputs.yaml",
-    outputs: String = "generated.yaml",
-    expected: String = "generated"
-): TestSet {
-    val testSet = TestSet()
-    testSet.name = name
-    testSet.processor = TestProcessor()
-    testSet.parser = parser.name
-    testSet.modelType = model
-    testSet.openapi = openapi
-    testSet.inputs = inputs
-    testSet.outputs = outputs
-    testSet.expected = expected
-    return testSet
-}
-
-//@Suppress("SameParameterValue")
 fun testSet(
     name: String,
     parser: String = "INTERNAL",
@@ -52,3 +27,26 @@ fun testSet(
     testSet.expected = expected
     return testSet
 }
+
+fun buildTestSets(): List<TestSet> {
+    return ALL_3x
+        .filter {
+            when (it.parser) {
+                "INTERNAL" -> {
+                    true
+                }
+                "SWAGGER" if it.openapi == "openapi30.yaml" -> {
+                    !EXCLUDE_SWAGGER.contains(it.name)
+                }
+                "OPENAPI4J" if it.openapi == "openapi30.yaml" -> {
+                    !EXCLUDE_OPENAPI4J.contains(it.name)
+                }
+                else -> {
+                    false
+                }
+            }
+        }
+        .map {
+            testSet(it.name, it.parser, it.openapi, model = it.modelType, outputs = it.outputs, expected = it.expected)
+        }
+}