improve homes

Author: hauner

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

@@ -8,29 +8,6 @@ package io.openapiprocessor.core
 import io.openapiprocessor.test.*
 
 
-private fun join(vararg collections: Collection<TestParams2>): List<TestParams2> {
-    return collections.flatMap { it }
-}
-
-private val testParamComparator = Comparator<TestParams2> { l, r ->
-    val parser = l.parser.compareTo(r.parser)
-    if (parser != 0) {
-        return@Comparator parser
-    }
-
-    val name = l.name.compareTo(r.name)
-    if (name != 0) {
-        return@Comparator name
-    }
-
-    val openapi = l.openapi.compareTo(r.openapi)
-    if (openapi != 0) {
-        return@Comparator openapi
-    }
-
-    return@Comparator 0
-}
-
 val ALL_3x: List<TestParams2> = join(
     emptyList(),
     tests("annotation-mapping-class"),
@@ -117,7 +94,7 @@ val ALL_3x: List<TestParams2> = join(
     tests("schema-unreferenced"),
     tests("server-url"),
     tests("swagger-parsing-error")
-).sortedWith(testParamComparator)
+).sortedWith(TestParamComparator)
 
 val EXCLUDE_OPENAPI4J = setOf(
     // the parser assumes that "type" must be string if a non-standard format is used
@@ -135,3 +112,47 @@ val EXCLUDE_SWAGGER = setOf(
     // can't get uri of a document
     "packages"
 )
+
+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 = TestProcessor()
+    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" -> {
+                    !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)
+        }
+}

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

@@ -39,6 +39,7 @@ data class TestParams(
     val modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT)
 )
 
+// todo rename to TestParams
 data class TestParams2(
     val name: String,
     val openapi: String,
@@ -48,6 +49,28 @@ data class TestParams2(
     val parser: String = I
 )
 
+fun join(vararg collections: Collection<TestParams2>): List<TestParams2> {
+    return collections.flatMap { it }
+}
+
+val TestParamComparator = Comparator<TestParams2> { l, r ->
+    val parser = l.parser.compareTo(r.parser)
+    if (parser != 0) {
+        return@Comparator parser
+    }
+
+    val name = l.name.compareTo(r.name)
+    if (name != 0) {
+        return@Comparator name
+    }
+
+    val openapi = l.openapi.compareTo(r.openapi)
+    if (openapi != 0) {
+        return@Comparator openapi
+    }
+
+    return@Comparator 0
+}
 
 fun tests(
     name: String,
@@ -77,7 +100,7 @@ fun testX(name: String): Collection<TestParams2> {
 
 
 
-
+@Deprecated(message = "replace with test(sX)")
 fun test30_D_(
     name: String,
     openapi: String = API_30,
@@ -88,6 +111,7 @@ fun test30_D_(
     return TestParams(name, openapi, outputs, expected, modelTypes)
 }
 
+@Deprecated(message = "replace with test(sX)")
 fun test30_DR(
     name: String,
     openapi: String = API_30,
@@ -98,6 +122,7 @@ fun test30_DR(
     return TestParams(name, openapi, outputs, expected, modelTypes)
 }
 
+@Deprecated(message = "replace with test(sX)")
 fun test31_D_(
     name: String,
     openapi: String = API_31,
@@ -108,6 +133,7 @@ fun test31_D_(
     return TestParams(name, openapi, outputs, expected, modelTypes)
 }
 
+@Deprecated(message = "replace with test(sX)")
 fun test31_DR(
     name: String,
     openapi: String = API_31,