Skip to content

Commit 2adc64d

Browse files
haunerhauner
committed
clean up tests
1 parent 30ffc35 commit 2adc64d

26 files changed

Lines changed: 1520 additions & 1710 deletions

‎openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/ApiConverterParameterGSpec.groovy‎

Lines changed: 55 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,18 @@
55

66
package io.openapiprocessor.core.converter
77

8-
98
import io.openapiprocessor.core.converter.mapping.UnknownParameterTypeException
109
import spock.lang.Ignore
1110
import spock.lang.Specification
1211

1312
import static io.openapiprocessor.core.support.FactoryHelper.apiConverter
14-
import static io.openapiprocessor.core.support.OpenApiParser.parse
13+
import static io.openapiprocessor.core.support.OpenApiParserKt.parseApiBody
1514

1615
class ApiConverterParameterGSpec extends Specification {
1716

1817
void "converts simple query parameter"() {
19-
def openApi = parse (
18+
def openApi = parseApiBody (
2019
"""\
21-
openapi: 3.0.2
22-
info:
23-
title: test simple query parameter
24-
version: 1.0.0
25-
2620
paths:
2721
/endpoint:
2822
@@ -55,13 +49,8 @@ paths:
5549
}
5650

5751
void "converts simple path parameter"() {
58-
def openApi = parse (
52+
def openApi = parseApiBody (
5953
"""\
60-
openapi: 3.0.2
61-
info:
62-
title: test simple path parameter
63-
version: 1.0.0
64-
6554
paths:
6655
/endpoint/{foo}:
6756
@@ -94,13 +83,8 @@ paths:
9483
}
9584

9685
void "converts simple header parameter"() {
97-
def openApi = parse (
86+
def openApi = parseApiBody (
9887
"""\
99-
openapi: 3.0.2
100-
info:
101-
title: test simple header parameter
102-
version: 1.0.0
103-
10488
paths:
10589
/endpoint:
10690
@@ -133,30 +117,24 @@ paths:
133117
}
134118

135119
void "converts simple cookie parameter"() {
136-
def openApi = parse (
137-
"""\
138-
openapi: 3.0.2
139-
info:
140-
title: test simple cookie parameter
141-
version: 1.0.0
142-
143-
paths:
144-
/endpoint:
145-
146-
get:
147-
tags:
148-
- endpoint
149-
parameters:
150-
- name: foo
151-
description: cookie, required, string
152-
in: cookie
153-
required: true
154-
schema:
155-
type: string
156-
responses:
157-
'204':
158-
description: empty
159-
""")
120+
def openApi = parseApiBody ("""
121+
paths:
122+
/endpoint:
123+
124+
get:
125+
tags:
126+
- endpoint
127+
parameters:
128+
- name: foo
129+
description: cookie, required, string
130+
in: cookie
131+
required: true
132+
schema:
133+
type: string
134+
responses:
135+
'204':
136+
description: empty
137+
""")
160138

161139
when:
162140
def api = apiConverter ()
@@ -173,29 +151,23 @@ paths:
173151

174152
@Ignore("the openapi parser ignores parameters with unknown types")
175153
void "throws on unknown parameter"() {
176-
def openApi = parse (
177-
"""\
178-
openapi: 3.0.2
179-
info:
180-
title: test unknown parameter type
181-
version: 1.0.0
182-
183-
paths:
184-
/endpoint:
185-
186-
get:
187-
tags:
188-
- endpoint
189-
parameters:
190-
- name: foo
191-
description: unknown, required, string
192-
in: unknown
193-
schema:
194-
type: string
195-
responses:
196-
'204':
197-
description: empty
198-
""")
154+
def openApi = parseApiBody ("""
155+
paths:
156+
/endpoint:
157+
158+
get:
159+
tags:
160+
- endpoint
161+
parameters:
162+
- name: foo
163+
description: unknown, required, string
164+
in: unknown
165+
schema:
166+
type: string
167+
responses:
168+
'204':
169+
description: empty
170+
""")
199171

200172
when:
201173
apiConverter ()
@@ -208,28 +180,22 @@ paths:
208180
}
209181

210182
void "converts deprecated parameter"() {
211-
def openApi = parse (
212-
"""\
213-
openapi: 3.0.2
214-
info:
215-
title: test deprecated parameter
216-
version: 1.0.0
217-
218-
paths:
219-
/endpoint:
220-
221-
get:
222-
parameters:
223-
- name: foo
224-
description: deprecated parameter
225-
in: query
226-
deprecated: true
227-
schema:
228-
type: string
229-
responses:
230-
'204':
231-
description: empty
232-
""")
183+
def openApi = parseApiBody ("""
184+
paths:
185+
/endpoint:
186+
187+
get:
188+
parameters:
189+
- name: foo
190+
description: deprecated parameter
191+
in: query
192+
deprecated: true
193+
schema:
194+
type: string
195+
responses:
196+
'204':
197+
description: empty
198+
""")
233199

234200
when:
235201
def api = apiConverter ()

‎openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/DataTypeConverterArrayTypeMappingSpec.groovy‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ class DataTypeConverterArrayTypeMappingSpec extends Specification {
2727
""")
2828

2929
def openApi = parseApiBody ("""
30-
|paths:
31-
| /array-string:
32-
| get:
33-
| responses:
34-
| '200':
35-
| content:
36-
| application/vnd.any:
37-
| schema:
38-
| type: array
39-
| items:
40-
| type: string
41-
| description: none
30+
paths:
31+
/array-string:
32+
get:
33+
responses:
34+
'200':
35+
content:
36+
application/vnd.any:
37+
schema:
38+
type: array
39+
items:
40+
type: string
41+
description: none
4242
""")
4343

4444
when:
@@ -66,20 +66,20 @@ class DataTypeConverterArrayTypeMappingSpec extends Specification {
6666
""")
6767

6868
def openApi = parseApiBody ("""
69-
|paths:
70-
| /page:
71-
| get:
72-
| parameters:
73-
| - in: query
74-
| name: date
75-
| required: false
76-
| schema:
77-
| type: array
78-
| items:
79-
| type: string
80-
| responses:
81-
| '204':
82-
| description: none
69+
paths:
70+
/page:
71+
get:
72+
parameters:
73+
- in: query
74+
name: date
75+
required: false
76+
schema:
77+
type: array
78+
items:
79+
type: string
80+
responses:
81+
'204':
82+
description: none
8383
""")
8484

8585
when:
@@ -95,20 +95,20 @@ class DataTypeConverterArrayTypeMappingSpec extends Specification {
9595
def options = parseOptionsMapping(mappings)
9696

9797
def openApi = parseApiBody ("""
98-
|paths:
99-
| /foo:
100-
| get:
101-
| parameters:
102-
| - in: query
103-
| name: date
104-
| required: false
105-
| schema:
106-
| type: array
107-
| items:
108-
| type: string
109-
| responses:
110-
| '204':
111-
| description: none
98+
paths:
99+
/foo:
100+
get:
101+
parameters:
102+
- in: query
103+
name: date
104+
required: false
105+
schema:
106+
type: array
107+
items:
108+
type: string
109+
responses:
110+
'204':
111+
description: none
112112
""")
113113

114114
when:
@@ -158,18 +158,18 @@ class DataTypeConverterArrayTypeMappingSpec extends Specification {
158158
""")
159159

160160
def openApi = parseApiBody ("""
161-
|paths:
162-
| /foo:
163-
| get:
164-
| responses:
165-
| '200':
166-
| content:
167-
| application/vnd.any:
168-
| schema:
169-
| type: array
170-
| items:
171-
| type: string
172-
| description: none
161+
paths:
162+
/foo:
163+
get:
164+
responses:
165+
'200':
166+
content:
167+
application/vnd.any:
168+
schema:
169+
type: array
170+
items:
171+
type: string
172+
description: none
173173
""")
174174

175175
when:
@@ -194,20 +194,20 @@ class DataTypeConverterArrayTypeMappingSpec extends Specification {
194194
def options = parseOptionsMapping(mappings)
195195

196196
def openApi = parseApiBody ("""
197-
|paths:
198-
| /foobar:
199-
| get:
200-
| parameters:
201-
| - in: query
202-
| name: foobar
203-
| required: false
204-
| schema:
205-
| type: array
206-
| items:
207-
| type: string
208-
| responses:
209-
| '204':
210-
| description: empty
197+
paths:
198+
/foobar:
199+
get:
200+
parameters:
201+
- in: query
202+
name: foobar
203+
required: false
204+
schema:
205+
type: array
206+
items:
207+
type: string
208+
responses:
209+
'204':
210+
description: empty
211211
""")
212212

213213
when:
@@ -247,18 +247,18 @@ class DataTypeConverterArrayTypeMappingSpec extends Specification {
247247
def options = parseOptionsMapping(mappings)
248248

249249
def openApi = parseApiBody ("""
250-
|paths:
251-
| /array-string:
252-
| get:
253-
| responses:
254-
| '200':
255-
| content:
256-
| application/vnd.any:
257-
| schema:
258-
| type: array
259-
| items:
260-
| type: string
261-
| description: none
250+
paths:
251+
/array-string:
252+
get:
253+
responses:
254+
'200':
255+
content:
256+
application/vnd.any:
257+
schema:
258+
type: array
259+
items:
260+
type: string
261+
description: none
262262
""")
263263

264264
when:

0 commit comments

Comments
 (0)