Skip to content

Commit 0553cfb

Browse files
committed
Fixes #1267: ScannerTest has been migrated
1 parent 29bbada commit 0553cfb

File tree

8 files changed

+121
-71
lines changed

8 files changed

+121
-71
lines changed
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
package io.swagger;
2+
3+
import static org.testng.Assert.assertEquals;
4+
import static org.testng.Assert.assertNotNull;
5+
6+
import io.swagger.jaxrs.Reader;
7+
import io.swagger.models.ModelImpl;
8+
import io.swagger.models.Operation;
9+
import io.swagger.models.Swagger;
10+
import io.swagger.models.parameters.BodyParameter;
11+
import io.swagger.models.parameters.HeaderParameter;
12+
import io.swagger.models.parameters.Parameter;
13+
import io.swagger.models.parameters.QueryParameter;
14+
import io.swagger.resources.ResourceWithBeanParams;
15+
import io.swagger.resources.ResourceWithComplexBodyInputType;
16+
import io.swagger.util.Json;
17+
18+
import org.testng.annotations.Test;
19+
20+
import java.util.List;
21+
22+
public class ScannerTest {
23+
24+
@Test(description = "scan a simple resource")
25+
public void scanSimpleResource() {
26+
final Swagger swagger = getSwagger(ResourceWithBeanParams.class);
27+
final List<Parameter> params = getParameters(swagger, "/{id}");
28+
29+
final Parameter skip = params.get(0);
30+
assertEquals(skip.getName(), "skip");
31+
assertEquals(skip.getDescription(), "number of records to skip");
32+
33+
final Parameter limit = params.get(1);
34+
assertEquals(limit.getName(), "limit");
35+
assertEquals(limit.getDescription(), "maximum number of records to return");
36+
}
37+
38+
@Test(description = "scan another resource")
39+
public void scanAnotherResource() {
40+
final Swagger swagger = getSwagger(ResourceWithComplexBodyInputType.class);
41+
42+
final Operation post = swagger.getPaths().get("/myapi/testPostWithBody").getPost();
43+
assertNotNull(post);
44+
45+
assertNotNull(swagger.getDefinitions());
46+
assertNotNull(swagger.getDefinitions().get("ClassWithString"));
47+
}
48+
49+
@Test(description = "scan a bean param resource")
50+
public void scanBeanParamResource() {
51+
final Swagger swagger = getSwagger(ResourceWithBeanParams.class);
52+
final List<Parameter> params = getParameters(swagger, "/bean/{id}");
53+
54+
final HeaderParameter headerParam1 = (HeaderParameter) params.get(0);
55+
assertEquals(headerParam1.getDefaultValue(), "1");
56+
assertEquals(headerParam1.getName(), "test order annotation 1");
57+
58+
final HeaderParameter headerParam2 = (HeaderParameter) params.get(1);
59+
assertEquals(headerParam2.getDefaultValue(), "2");
60+
assertEquals(headerParam2.getName(), "test order annotation 2");
61+
62+
final QueryParameter priority1 = (QueryParameter) params.get(2);
63+
assertEquals(priority1.getDefaultValue(), "overridden");
64+
assertEquals(priority1.getName(), "test priority 1");
65+
66+
final QueryParameter priority2 = (QueryParameter) params.get(3);
67+
assertEquals(priority2.getDefaultValue(), "overridden");
68+
assertEquals(priority2.getName(), "test priority 2");
69+
70+
final ModelImpl bodyParam1 = (ModelImpl) ((BodyParameter) params.get(4)).getSchema();
71+
assertEquals(bodyParam1.getDefaultValue(), "bodyParam");
72+
}
73+
74+
private List<Parameter> getParameters(Swagger swagger, String path) {
75+
return swagger.getPaths().get(path).getGet().getParameters();
76+
}
77+
78+
private Swagger getSwagger(Class<?> clas) {
79+
return new Reader(new Swagger()).read(clas);
80+
}
81+
}

modules/swagger-jersey2-jaxrs/src/test/scala/models/NotFoundModel.java renamed to modules/swagger-jersey2-jaxrs/src/test/java/io/swagger/models/NotFoundModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package models;
1+
package io.swagger.models;
22

33
public class NotFoundModel {
44
int code;
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package io.swagger.models;
2+
3+
import io.swagger.annotations.ApiParam;
4+
5+
import javax.ws.rs.QueryParam;
6+
7+
public class Pagination {
8+
@QueryParam("skip")
9+
@ApiParam("number of records to skip")
10+
protected Integer skip;
11+
12+
@QueryParam("limit")
13+
@ApiParam("maximum number of records to return")
14+
protected Integer limit;
15+
16+
public Integer getSkip() {
17+
return skip;
18+
}
19+
20+
public void setSkip(Integer skip) {
21+
this.skip = skip;
22+
}
23+
24+
public Integer getLimit() {
25+
return limit;
26+
}
27+
28+
public void setLimit(Integer limit) {
29+
this.limit = limit;
30+
}
31+
}

modules/swagger-jersey2-jaxrs/src/test/scala/models/TestBeanParam.java renamed to modules/swagger-jersey2-jaxrs/src/test/java/io/swagger/models/TestBeanParam.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package models;
1+
package io.swagger.models;
22

33
import io.swagger.annotations.ApiParam;
44

modules/swagger-jersey2-jaxrs/src/test/scala/resources/ClassWithString.java renamed to modules/swagger-jersey2-jaxrs/src/test/java/io/swagger/resources/ClassWithString.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package resources;
1+
package io.swagger.resources;
22

33
public class ClassWithString {
44
public String value;

modules/swagger-jersey2-jaxrs/src/test/scala/resources/ResourceWithBeanParams.java renamed to modules/swagger-jersey2-jaxrs/src/test/java/io/swagger/resources/ResourceWithBeanParams.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package resources;
1+
package io.swagger.resources;
22

33
import io.swagger.annotations.Api;
44
import io.swagger.annotations.ApiOperation;
55
import io.swagger.annotations.ApiResponse;
66
import io.swagger.annotations.ApiResponses;
7-
import models.NotFoundModel;
8-
import models.Pagination;
9-
import models.TestBeanParam;
7+
import io.swagger.models.NotFoundModel;
8+
import io.swagger.models.Pagination;
9+
import io.swagger.models.TestBeanParam;
1010

1111
import javax.ws.rs.BeanParam;
1212
import javax.ws.rs.DefaultValue;

modules/swagger-jersey2-jaxrs/src/test/scala/resources/ResourceWithComplexBodyInputType.java renamed to modules/swagger-jersey2-jaxrs/src/test/java/io/swagger/resources/ResourceWithComplexBodyInputType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package resources;
1+
package io.swagger.resources;
22

33
import com.google.common.collect.Lists;
4+
45
import io.swagger.annotations.Api;
56
import io.swagger.annotations.ApiOperation;
67
import io.swagger.annotations.ApiParam;

modules/swagger-jersey2-jaxrs/src/test/scala/ScannerTest.scala

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)