Merge pull request #1299 from lugaru1234/issue1226

Fixes #1226: SubResourceScannerTest has been migrated

Author: fehguy

modules/swagger-jaxrs/src/test/java/io/swagger/SubResourceScannerTest.java

@@ -0,0 +1,76 @@
+package io.swagger;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import io.swagger.jaxrs.Reader;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
+import io.swagger.models.parameters.BodyParameter;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.resources.ResourceWithSubResources;
+import io.swagger.resources.SubResourceHead;
+import io.swagger.resources.TestResource;
+import io.swagger.resources.Resource942;
+import io.swagger.util.Json;
+
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+
+public class SubResourceScannerTest {
+
+    @Test(description = "scan a resource with subresources")
+    public void scanResourceWithSubresources() {
+        final Swagger swagger = getSwagger(ResourceWithSubResources.class);
+        assertEquals(getOperationId(swagger, "/employees"), "getTest");
+        assertEquals(getOperationId(swagger, "/employees/{id}"), "getSubresourceOperation");
+        assertEquals(getOperationId(swagger, "/employees/noPath"), "getGreeting");
+    }
+
+    @Test(description = "scan another resource with subresources")
+    public void scanAnotherResourceWithSubresources() {
+        final Swagger swagger = getSwagger(TestResource.class);
+        final Operation get = getGet(swagger, "/test/more/otherStatus");
+        assertEquals(get.getOperationId(), "otherStatus");
+
+        final Parameter qp = get.getParameters().get(0);
+        assertEquals(qp.getIn(), "query");
+        assertEquals(qp.getName(), "qp");
+
+        assertTrue(get.getProduces().containsAll(Arrays.asList("application/json", "application/xml")));
+
+        assertEquals(swagger.getPaths().keySet().size(), 2);
+    }
+
+    @Test(description = "scan resource with class-based sub-resources")
+    public void scanResourceWithClassBasedSubresources() {
+        final Swagger swagger = getSwagger(SubResourceHead.class);
+        assertEquals(swagger.getPaths().size(), 3);
+        assertEquals(getOperationId(swagger, "/head/noPath"), "getGreeting");
+        assertEquals(getOperationId(swagger, "/head/tail/hello"), "getGreeting");
+
+        final Operation echo = getGet(swagger, "/head/tail/{string}");
+        assertEquals(echo.getOperationId(), "getEcho");
+        assertEquals(echo.getParameters().size(), 1);
+    }
+
+    @Test(description = "find a body param")
+    public void findBodyParam() {
+        Swagger swagger = getSwagger(Resource942.class);
+        assertTrue(swagger.getPath("/test").getPost().getParameters().get(0) instanceof BodyParameter);
+    }
+
+    private Swagger getSwagger(Class<?> cls) {
+        return new Reader(new Swagger()).read(cls);
+    }
+
+    private Operation getGet(Swagger swagger, String path) {
+        return swagger.getPaths().get(path).getGet();
+    }
+
+    private String getOperationId(Swagger swagger, String path) {
+        return getGet(swagger, path).getOperationId();
+    }
+}

…axrs/src/test/scala/models/Employee.java …est/java/io/swagger/models/Employee.javamodules/swagger-jaxrs/src/test/scala/models/Employee.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/models/Employee.java modules/swagger-jaxrs/src/test/scala/models/Employee.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/models/Employee.java

@@ -1,4 +1,4 @@
-package models;
+package io.swagger.models;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

…t/scala/resources/NoPathSubResource.java …swagger/resources/NoPathSubResource.javamodules/swagger-jaxrs/src/test/scala/resources/NoPathSubResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/NoPathSubResource.java modules/swagger-jaxrs/src/test/scala/resources/NoPathSubResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/NoPathSubResource.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

…rc/test/scala/resources/Resource942.java …va/io/swagger/resources/Resource942.javamodules/swagger-jaxrs/src/test/scala/resources/Resource942.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/Resource942.java modules/swagger-jaxrs/src/test/scala/resources/Resource942.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/Resource942.java

@@ -1,9 +1,9 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import models.Employee;
+import io.swagger.models.Employee;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;

…la/resources/Resource942SubResource.java …er/resources/Resource942SubResource.javamodules/swagger-jaxrs/src/test/scala/resources/Resource942SubResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/Resource942SubResource.java modules/swagger-jaxrs/src/test/scala/resources/Resource942SubResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/Resource942SubResource.java

@@ -1,8 +1,8 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import models.Employee;
+import io.swagger.models.Employee;
 
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;

…/resources/ResourceWithSubResources.java …/resources/ResourceWithSubResources.javamodules/swagger-jaxrs/src/test/scala/resources/ResourceWithSubResources.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/ResourceWithSubResources.java modules/swagger-jaxrs/src/test/scala/resources/ResourceWithSubResources.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/ResourceWithSubResources.java

@@ -1,8 +1,8 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import models.Employee;
+import io.swagger.models.Employee;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

…rc/test/scala/resources/SubResource.java …va/io/swagger/resources/SubResource.javamodules/swagger-jaxrs/src/test/scala/resources/SubResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/SubResource.java modules/swagger-jaxrs/src/test/scala/resources/SubResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/SubResource.java

@@ -1,9 +1,9 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import models.Employee;
+import io.swagger.models.Employee;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

…est/scala/resources/SubResourceHead.java …o/swagger/resources/SubResourceHead.javamodules/swagger-jaxrs/src/test/scala/resources/SubResourceHead.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/SubResourceHead.java modules/swagger-jaxrs/src/test/scala/resources/SubResourceHead.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/SubResourceHead.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.jaxrs.Reader;

…est/scala/resources/SubResourceTail.java …o/swagger/resources/SubResourceTail.javamodules/swagger-jaxrs/src/test/scala/resources/SubResourceTail.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/SubResourceTail.java modules/swagger-jaxrs/src/test/scala/resources/SubResourceTail.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/SubResourceTail.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

…c/test/scala/resources/TestResource.java …a/io/swagger/resources/TestResource.javamodules/swagger-jaxrs/src/test/scala/resources/TestResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/TestResource.java modules/swagger-jaxrs/src/test/scala/resources/TestResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/TestResource.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;