improved grouping

Author: hauner

…/DataTypeConverterTypeMappingSpec.groovy …eConverterResponseTypeMappingSpec.groovysrc/test/groovy/com/github/hauner/openapi/spring/converter/DataTypeConverterTypeMappingSpec.groovy renamed to src/test/groovy/com/github/hauner/openapi/spring/converter/DataTypeConverterResponseTypeMappingSpec.groovy src/test/groovy/com/github/hauner/openapi/spring/converter/DataTypeConverterTypeMappingSpec.groovy renamed to src/test/groovy/com/github/hauner/openapi/spring/converter/DataTypeConverterResponseTypeMappingSpec.groovy

@@ -28,7 +28,7 @@ import spock.lang.Unroll
 import static com.github.hauner.openapi.spring.support.OpenApiParser.parse
 
 
-class DataTypeConverterTypeMappingSpec extends Specification {
+class DataTypeConverterResponseTypeMappingSpec extends Specification {
 
     @Unroll
     void "converts simple array schema to #responseTypeName set via global array mapping" () {
@@ -182,90 +182,4 @@ paths:
         ep.response.responseType.name == 'TargetClass'
     }
 
-    void "converts named schemas to java type via global type mapping" () {
-        def openApi = parse ("""\
-openapi: 3.0.2
-info:
-  title: API
-  version: 1.0.0
-
-paths:
-  /page:
-    get:
-      parameters:
-        - in: query
-          name: pageable
-          required: false
-          schema:
-            \$ref: '#/components/schemas/Pageable'
-      responses:
-        '200':
-          description: none
-          content:
-            application/json:
-              schema:
-                \$ref: '#/components/schemas/StringPage'
-
-components:
-  schemas:
-
-    Pageable:
-      description: minimal Pageable query parameters
-      type: object
-      properties:
-        page:
-          type: integer
-        size:
-          type: integer
-
-    Page:
-      description: minimal Page response without content property
-      type: object
-      properties:
-        number:
-          type: integer
-        size:
-          type: integer
-
-    StringContent:
-      description: specific content List of the Page response
-      type: object
-      properties:
-        content:
-          type: array
-          items:
-            type: string
-
-    StringPage:
-      description: typed Page
-      type: object
-      allOf:
-        - \$ref: '#/components/schemas/Page'
-        - \$ref: '#/components/schemas/StringContent'
-""")
-
-        when:
-        def options = new ApiOptions(
-            packageName: 'pkg',
-            typeMappings: [
-                new TypeMapping (
-                    sourceTypeName: 'Pageable',
-                    targetTypeName: 'org.springframework.data.domain.Pageable'),
-                new TypeMapping (
-                    sourceTypeName: 'StringPage',
-                    targetTypeName: 'org.springframework.data.domain.Page<String>')
-            ])
-        Api api = new ApiConverter (options).convert (openApi)
-
-        then:
-        def itf = api.interfaces.first ()
-        def ep = itf.endpoints.first ()
-        def parameter = ep.parameters.first ()
-        def response = ep.response
-        parameter.dataType.pkg == 'org.springframework.data.domain'
-        parameter.dataType.name == 'Pageable'
-        response.responseType.pkg == 'org.springframework.data.domain'
-        response.responseType.name == 'Page<String>'
-    }
-
 }

src/test/groovy/com/github/hauner/openapi/spring/converter/DataTypesConverterGlobalTypeMappingSpec.groovy

@@ -0,0 +1,114 @@
+/*
+ * Copyright 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.hauner.openapi.spring.converter
+
+import com.github.hauner.openapi.spring.generatr.ApiOptions
+import com.github.hauner.openapi.spring.generatr.mapping.TypeMapping
+import com.github.hauner.openapi.spring.model.Api
+import spock.lang.Specification
+
+import static com.github.hauner.openapi.spring.support.OpenApiParser.parse
+
+class DataTypesConverterGlobalTypeMappingSpec extends Specification {
+
+    void "converts named schemas to java type via global type mapping" () {
+        def openApi = parse ("""\
+openapi: 3.0.2
+info:
+  title: API
+  version: 1.0.0
+
+paths:
+  /page:
+    get:
+      parameters:
+        - in: query
+          name: pageable
+          required: false
+          schema:
+            \$ref: '#/components/schemas/Pageable'
+      responses:
+        '200':
+          description: none
+          content:
+            application/json:
+              schema:
+                \$ref: '#/components/schemas/StringPage'
+
+components:
+  schemas:
+
+    Pageable:
+      description: minimal Pageable query parameters
+      type: object
+      properties:
+        page:
+          type: integer
+        size:
+          type: integer
+
+    Page:
+      description: minimal Page response without content property
+      type: object
+      properties:
+        number:
+          type: integer
+        size:
+          type: integer
+
+    StringContent:
+      description: specific content List of the Page response
+      type: object
+      properties:
+        content:
+          type: array
+          items:
+            type: string
+
+    StringPage:
+      description: typed Page
+      type: object
+      allOf:
+        - \$ref: '#/components/schemas/Page'
+        - \$ref: '#/components/schemas/StringContent'
+""")
+
+        when:
+        def options = new ApiOptions(
+            packageName: 'pkg',
+            typeMappings: [
+                new TypeMapping (
+                    sourceTypeName: 'Pageable',
+                    targetTypeName: 'org.springframework.data.domain.Pageable'),
+                new TypeMapping (
+                    sourceTypeName: 'StringPage',
+                    targetTypeName: 'org.springframework.data.domain.Page<String>')
+            ])
+        Api api = new ApiConverter (options).convert (openApi)
+
+        then:
+        def itf = api.interfaces.first ()
+        def ep = itf.endpoints.first ()
+        def parameter = ep.parameters.first ()
+        def response = ep.response
+        parameter.dataType.pkg == 'org.springframework.data.domain'
+        parameter.dataType.name == 'Pageable'
+        response.responseType.pkg == 'org.springframework.data.domain'
+        response.responseType.name == 'Page<String>'
+    }
+
+}