Added UT to validate resolve of ext ref in allOf properties

Author: Michael Longo

modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java

@@ -23,6 +23,7 @@
 import io.swagger.models.parameters.SerializableParameter;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.ByteArrayProperty;
+import io.swagger.models.properties.ComposedProperty;
 import io.swagger.models.properties.IntegerProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.ObjectProperty;
@@ -1365,6 +1366,21 @@ public void checkAllOfWithRelativeReferencesIssue604() {
         assertEquals(2, swagger.getDefinitions().size());
     }
 
+    @Test(description = "Test that validate resolution of external references in allOf of property")
+    public void checkExtRefResolveInPropertiesWithAllOf() {
+        Swagger swagger = new SwaggerParser().read("src/test/resources/allOf-property-relative-file-references/parent.yaml");
+        assertEquals(2, swagger.getDefinitions().size());
+        assertEquals(1, swagger.getDefinitions().get("test").getProperties().size());
+
+        ComposedProperty property = (ComposedProperty) swagger.getDefinitions().get("test").getProperties().get("property");
+        assertEquals(1, property.getVendorExtensions().size());
+        assertEquals(1, property.getAllOf().size());
+
+        RefProperty refProperty = (RefProperty) property.getAllOf().get(0);
+        assertEquals("#/definitions/def", refProperty.get$ref());
+
+    }
+
     @Test(description = "A string example should not be over quoted when parsing a yaml string")
     public void readingSpecStringShouldNotOverQuotingStringExample() throws Exception {
         SwaggerParser parser = new SwaggerParser();
@@ -1489,4 +1505,4 @@ public void testIssue913() {
         Assert.assertNotNull(swagger.getDefinitions().get("indicatorType"));
         Assert.assertEquals(swagger.getDefinitions().get("indicatorType").getProperties().size(),1);
     }
-}
+}

modules/swagger-parser/src/test/resources/allOf-property-relative-file-references/child.yaml

@@ -0,0 +1,14 @@
+swagger: '2.0'
+
+info:
+  version: "0.0.1"
+  title: Devices API
+
+basePath: /api/v2/devices
+
+definitions:
+  def:
+    type: object
+    properties:
+      name:
+        type: string

modules/swagger-parser/src/test/resources/allOf-property-relative-file-references/parent.yaml

@@ -0,0 +1,16 @@
+swagger: '2.0'
+
+info:
+  version: "0.0.1"
+  title: Devices API
+
+basePath: /api/v2/devices
+
+definitions:
+  test:
+    type: object
+    properties:
+      property:
+        x-attr: "value"
+        allOf:
+        - $ref: "./child.yaml#/definitions/def"