use mapping.yaml in integration tests

Author: hauner

src/main/groovy/com/github/hauner/openapi/spring/converter/ApiOptions.groovy

@@ -44,7 +44,7 @@ class ApiOptions {
      * - interfaces => "${packageName}.api"
      * - models => "${packageName}.model"
      */
-    String packageName
+    String packageName = 'generatr'
 
     /**
      * provide enabling Bean Validation (JSR303) annotations. Default is false (disabled)
@@ -62,6 +62,6 @@ class ApiOptions {
      * override parameter/response type mappings or to add additional parameters on a single
      * endpoint.
      */
-    List<Mapping> typeMappings
+    List<Mapping> typeMappings = []
 
 }

src/testInt/groovy/com/github/hauner/openapi/generatr/GeneratrEndToEndTest.groovy

@@ -19,7 +19,6 @@ package com.github.hauner.openapi.generatr
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
-
 /**
  * using Junit so IDEA adds a "<Click to see difference>" when using assertEquals().
  */
@@ -44,7 +43,7 @@ class GeneratrEndToEndTest extends GeneratrTestBase {
             new TestSet(name: 'response-array-data-type-mapping'),
             new TestSet(name: 'response-complex-data-types'),
             new TestSet(name: 'response-simple-data-types'),
-            new TestSet(name: 'bean-validation', beanValidation: true)
+            new TestSet(name: 'bean-validation')
         ]
     }
 

src/testInt/groovy/com/github/hauner/openapi/generatr/GeneratrTestBase.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original authors
+ * Copyright 2019-2020 the original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@ package com.github.hauner.openapi.generatr
 
 import com.github.difflib.DiffUtils
 import com.github.difflib.UnifiedDiffUtils
+import com.github.hauner.openapi.spring.generatr.MappingReader
 import com.github.hauner.openapi.spring.generatr.SpringGeneratr
+import com.github.hauner.openapi.spring.generatr.mapping.Mapping
 import groovy.io.FileType
 import org.junit.Rule
 import org.junit.Test
@@ -32,6 +34,11 @@ abstract class GeneratrTestBase {
     @Rule
     public TemporaryFolder folder = new TemporaryFolder()
 
+    String DEFAULT_OPTIONS = """\
+options:
+  package-name: generated
+    """;
+
     TestSet testSet
 
     GeneratrTestBase(TestSet testSet) {
@@ -41,23 +48,27 @@ abstract class GeneratrTestBase {
     @Test
     void "generatr creates expected files for api set "() {
         def source = testSet.name
-        def packageName = 'generated'
-        def expectedPath = ['.', 'src', 'testInt', 'resources', source, packageName].join(File.separator)
-        def generatedPath = [folder.root.absolutePath, packageName].join(File.separator)
 
         def generatr = new SpringGeneratr()
         def options = [
             apiPath: "./src/testInt/resources/${source}/openapi.yaml",
-            targetDir: folder.root,
-            packageName: packageName,
-            beanValidation: testSet.beanValidation
+            targetDir: folder.root
         ]
 
-        def mapping = new File("./src/testInt/resources/${source}/mapping.yaml")
-        if(mapping.exists ()) {
-            options.typeMappings = mapping
+        def mappingYaml = new File("./src/testInt/resources/${source}/mapping.yaml")
+        if(mappingYaml.exists ()) {
+            options.mapping = mappingYaml
+        } else {
+            options.mapping = DEFAULT_OPTIONS
         }
 
+        def reader = new MappingReader ()
+        Mapping mapping = reader.read (options.mapping as String)
+
+        def packageName = mapping.options.packageName
+        def expectedPath = ['.', 'src', 'testInt', 'resources', source, packageName].join(File.separator)
+        def generatedPath = [folder.root.absolutePath, packageName].join(File.separator)
+
         when:
         generatr.run (options)
 

src/testInt/groovy/com/github/hauner/openapi/generatr/TestSet.groovy

@@ -18,7 +18,6 @@ package com.github.hauner.openapi.generatr
 
 class TestSet {
     String name
-    boolean beanValidation = false
 
     @Override
     String toString () {

src/testInt/resources/bean-validation/mapping.yaml

@@ -0,0 +1,3 @@
+options:
+  package-name: generated
+  bean-validation: true

src/testInt/resources/endpoint-exclude/mapping.yaml

@@ -1,3 +1,6 @@
+options:
+  package-name: generated
+
 map:
   paths:
     /endpoint-exclude/{foo}:

src/testInt/resources/params-additional/mapping.yaml

@@ -1,3 +1,6 @@
+options:
+  package-name: generated
+
 map:
   paths:
     /foo:

src/testInt/resources/params-complex-data-types/mapping.yaml

@@ -1,5 +1,7 @@
-map:
+options:
+  package-name: generated
 
+map:
   paths:
 
     /endpoint-map:

src/testInt/resources/params-request-body-multipart-form-data/mapping.yaml

@@ -1,5 +1,7 @@
-map:
+options:
+  package-name: generated
 
+map:
   types:
     - from: string:binary
       to: org.springframework.web.multipart.MultipartFile

src/testInt/resources/params-spring-pageable-mapping/mapping.yaml

@@ -1,5 +1,7 @@
-map:
+options:
+  package-name: generated
 
+map:
   types:
     - from: Pageable
       to: org.springframework.data.domain.Pageable