better home

Author: hauner

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

@@ -9,6 +9,7 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.openapiprocessor.core.parser.ParserType
 import io.openapiprocessor.test.FileSupport
+import io.openapiprocessor.test.ModelTypes
 import io.openapiprocessor.test.TestSet
 import java.io.ByteArrayOutputStream
 import java.io.OutputStream

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

@@ -10,6 +10,7 @@ import io.kotest.engine.spec.tempdir
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.openapiprocessor.core.parser.ParserType.*
 import io.openapiprocessor.test.FileSupport
+import io.openapiprocessor.test.ModelTypes
 import io.openapiprocessor.test.TestSet
 import io.openapiprocessor.test.TestSetRunner
 

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

@@ -11,6 +11,8 @@ 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.API_30
+import io.openapiprocessor.test.API_31
 import io.openapiprocessor.test.FileSupport
 import io.openapiprocessor.test.TestSet
 import io.openapiprocessor.test.TestSetRunner
@@ -51,7 +53,7 @@ class ProcessorPendingSpec: StringSpec({
 
 private fun sources(): Collection<TestSet> {
     return listOf(
-        testSet("deprecated", INTERNAL, API_30, model = "record", outputs = "outputs.yaml", expected = "outputs"),
+        testSet("annotation-mapping-class", INTERNAL, API_30, model = "record", outputs = "outputs.yaml", expected = "outputs"),
 //        testSet("keyword-identifier", INTERNAL, API_30, model = "default", outputs = "outputs.yaml", expected = "outputs"),
 //        testSet("bean-validation", INTERNAL, API_31, model = "record", outputs = "outputs.yaml", expected = "outputs"),
 //        testSet("bean-validation", INTERNAL, API_31, model = "default", outputs = "outputs.yaml", expected = "outputs"),

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

@@ -5,55 +5,7 @@
 
 package io.openapiprocessor.core
 
-enum class ModelTypes {DEFAULT, RECORD}
-
-data class TestParams(
-    val name: String,
-    val openapi: String,
-    val outputs: String = "generated.yaml",
-    val expected: String = "generated",
-    val modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT)
-)
-
-fun test30_D_(
-    name: String,
-    openapi: String = API_30,
-    outputs: String = "outputs.yaml",
-    expected: String = "outputs",
-    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT)
-): TestParams {
-    return TestParams(name, openapi, outputs, expected, modelTypes)
-}
-
-fun test30_DR(
-    name: String,
-    openapi: String = API_30,
-    outputs: String = "outputs.yaml",
-    expected: String = "outputs",
-    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT, ModelTypes.RECORD)
-): TestParams {
-    return TestParams(name, openapi, outputs, expected, modelTypes)
-}
-
-fun test31_D_(
-    name: String,
-    openapi: String = API_31,
-    outputs: String = "outputs.yaml",
-    expected: String = "outputs",
-    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT)
-): TestParams {
-    return TestParams(name, openapi, outputs, expected, modelTypes)
-}
-
-fun test31_DR(
-    name: String,
-    openapi: String = API_31,
-    outputs: String = "outputs.yaml",
-    expected: String = "outputs",
-    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT, ModelTypes.RECORD)
-): TestParams {
-    return TestParams(name, openapi, outputs, expected, modelTypes)
-}
+import io.openapiprocessor.test.*
 
 val ALL_30: List<TestParams> = listOf(
     test30_DR("annotation-mapping-class"),

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

@@ -9,10 +9,6 @@ import io.openapiprocessor.core.parser.ParserType
 import io.openapiprocessor.test.TestSet
 
 
-const val API_30 = "openapi30.yaml"
-const val API_31 = "openapi31.yaml"
-
-
 @Suppress("SameParameterValue")
 fun testSet(
     name: String,

openapi-processor-test/src/main/kotlin/io/openapiprocessor/test/ProcessorTestSetsSupport.kt

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 https://github.com/openapi-processor/openapi-processor-test
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.test
+
+const val API_30 = "openapi30.yaml"
+const val API_31 = "openapi31.yaml"
+
+enum class ModelTypes {DEFAULT, RECORD}
+
+data class TestParams(
+    val name: String,
+    val openapi: String,
+    val outputs: String = "generated.yaml",
+    val expected: String = "generated",
+    val modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT)
+)
+
+fun test30_D_(
+    name: String,
+    openapi: String = API_30,
+    outputs: String = "outputs.yaml",
+    expected: String = "outputs",
+    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT)
+): TestParams {
+    return TestParams(name, openapi, outputs, expected, modelTypes)
+}
+
+fun test30_DR(
+    name: String,
+    openapi: String = API_30,
+    outputs: String = "outputs.yaml",
+    expected: String = "outputs",
+    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT, ModelTypes.RECORD)
+): TestParams {
+    return TestParams(name, openapi, outputs, expected, modelTypes)
+}
+
+fun test31_D_(
+    name: String,
+    openapi: String = API_31,
+    outputs: String = "outputs.yaml",
+    expected: String = "outputs",
+    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT)
+): TestParams {
+    return TestParams(name, openapi, outputs, expected, modelTypes)
+}
+
+fun test31_DR(
+    name: String,
+    openapi: String = API_31,
+    outputs: String = "outputs.yaml",
+    expected: String = "outputs",
+    modelTypes: List<ModelTypes> = listOf(ModelTypes.DEFAULT, ModelTypes.RECORD)
+): TestParams {
+    return TestParams(name, openapi, outputs, expected, modelTypes)
+}