Merge pull request #1307 from lugaru1234/issue1207BuildFailureFix

Fixes #1207: build failure fix after tests merge

Author: fehguy

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

@@ -55,7 +55,7 @@ public void scanResourceWithExtensions() {
         assertTrue(swagger.getSchemes().contains(Scheme.HTTP));
         assertTrue(swagger.getSchemes().contains(Scheme.HTTPS));
 
-        assertEquals(swagger.getTags().size(), 6);
+        assertEquals(swagger.getTags().size(), 7);
         assertEquals(swagger.getTags().get(0).getName(), "Tag-added-before-read");
 
         assertEquals(swagger.getTags().get(1).getName(), "mytag");
@@ -73,7 +73,8 @@ public void scanResourceWithExtensions() {
         assertEquals(extensions.get("x-test"), "value");
 
         assertEquals(swagger.getTags().get(4).getName(), "externalinfo");
-        assertEquals(swagger.getTags().get(5).getName(), "Tag-added-after-read");
+        assertEquals(swagger.getTags().get(5).getName(), "testingtag");
+        assertEquals(swagger.getTags().get(6).getName(), "Tag-added-after-read");
 
         extensions = swagger.getInfo().getVendorExtensions();
         assertEquals(extensions.size(), 3);

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

@@ -42,7 +42,7 @@ private void testCollection(QueryParameter p, String name, String type, String f
         assertEquals(p.getName(), name);
         assertEquals(p.getType(), "array");
         assertEquals(p.getFormat(), null);
-        assertEquals(p.getCollectionFormat(), "csv");
+        assertEquals(p.getCollectionFormat(), "multi");
         assertNotEquals(p.getItems(), null);
         Property schema = p.getItems();
         assertEquals(schema.getType(), type);

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

@@ -124,7 +124,7 @@ public void scanClassAndFieldLevelAnnotations() {
         assertEquals(resourceParameters.get(1).getName(), "fieldParam");
         assertEquals(resourceParameters.get(2).getName(), "methodParam");
 
-        List<Parameter> subResourceParameters = getGet(swagger, "/resource/{id}/subresource").getParameters();
+        List<Parameter> subResourceParameters = getGet(swagger, "/resource/{id}/subresource1").getParameters();
         assertNotNull(subResourceParameters);
         assertEquals(subResourceParameters.size(), 3);
         assertEquals(subResourceParameters.get(0).getName(), "id");