improve package handling, simpler

Author: hauner

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

@@ -87,7 +87,7 @@ class CompileExpectedSpec: StringSpec({
 
             var expected = itemsReader.read(sourcePath, "outputs.yaml").items
             expected = expected.filter { ! it.endsWith("properties") }
-            val expectedFileNames = expected.map { it.replaceFirst("<model>", "model/${testSet.modelType}") }
+            val expectedFileNames = expected.map { it.replaceFirst("<model>", "_${testSet.modelType}_") }
             expectedFileNames.forEach {
                 compilePaths.add(Path.of("src/testInt/resources${sourcePath}/$it"))
             }

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

@@ -26,7 +26,7 @@ class ProcessorEndToEndJimfsSpec: StringSpec({
             val test = Test(testSet, testFiles)
 
             TestSetRunner(test, testSet)
-                .runOnCustomFileSystem()
+                .run()
                 .shouldBeTrue()
         }
     }

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

@@ -90,15 +90,15 @@ class ProcessorEndToEndRemoteSpec: StringSpec({
             val generatedPath = Path.of (folder.canonicalPath).resolve (pkg)
 
             val expectedFiles = getExpectedFiles(sourcePath, "outputs")
-            val expectedFileNames = resolveModelFiles(expectedFiles, "model")
             val generatedFiles = Collector.collectPaths (generatedPath)
 
+            val expectedFileNames = expectedFiles.map { it.replaceFirst("<model>/", "") }
             generatedFiles.shouldContainAll(expectedFileNames)
 
             var success = true
             expectedFiles.forEach {
-                val expected = getExpectedFile(resolveModelFile("$expectedPath/$it", "model/default"))
-                val generated = generatedPath.resolve (resolveModelFile(it, "model"))
+                val expected = getExpectedFile(resolveModelFile("$expectedPath/$it", "_default_"))
+                val generated = generatedPath.resolve (resolveModelFile(it, ""))
 
                 val hasDiff = !Diff.printUnifiedDiff (expected, generated)
                 success = success && hasDiff

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

@@ -12,7 +12,7 @@ import io.openapiprocessor.core.parser.ParserType.*
 import io.openapiprocessor.test.*
 
 /**
- * run end to end integration test.
+ * run end-to-end integration test.
  */
 class ProcessorEndToEndSpec: StringSpec({
 
@@ -25,7 +25,7 @@ class ProcessorEndToEndSpec: StringSpec({
             val test = Test(testSet, testFiles)
 
             TestSetRunner(test, testSet)
-                .runOnNativeFileSystem()
+                .run()
                 .shouldBeTrue()
         }
     }