Merge branch 'master' into issue-1261

Author: r-sreesaran

modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

@@ -96,7 +96,6 @@ public class V2ConverterTest {
     private static final String ISSUE_1164_YAML = "issue-1164.yaml";
     private static final String ISSUE_1261_YAML = "issue-1261.yaml";
 
-
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
     private static final String PET_FIND_BY_STATUS_PATH = "/pet/findByStatus";

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -2302,4 +2302,36 @@ public void testDuplicateHttpStatusCodes() {
         assertEquals(messages.get(0), "Duplicate field '200' in `src/test/resources/duplicateHttpStatusCodes.json`");
 
     }
+  
+    public void testSampleParser() {
+        final String location = "src/test/resources/issue-1211.json";
+
+        final ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+
+        final OpenAPIV3Parser parser = new OpenAPIV3Parser();
+        final SwaggerParseResult result = parser.readLocation(location, null, options);
+        System.out.println(result.getMessages());
+        OpenAPI openAPI = result.getOpenAPI();
+
+        assertNotNull(result.getOpenAPI());
+        assertTrue(result.getMessages().size() > 0);
+        assertEquals(result.getMessages().get(0).contains("attribute components.schemas.Pet. writeOnly and readOnly are both present"), true);
+
+    }
+
+    @Test
+    public void testDuplicateHttpStatusCodes() {
+        final String location = "src/test/resources/duplicateHttpStatusCodes.json";
+
+        final ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+
+        final OpenAPIV3Parser parser = new OpenAPIV3Parser();
+        final SwaggerParseResult result = parser.readLocation(location, null, options);
+        assertNull(result.getOpenAPI());
+        List<String> messages = result.getMessages();
+        assertEquals(1, messages.size());
+        assertEquals(messages.get(0), "Duplicate field '200' in `src/test/resources/duplicateHttpStatusCodes.json`");
+    }
 }

pom.xml

@@ -286,16 +286,16 @@
     </repositories>
     <properties>
         <swagger-parser-v2-version>1.0.50-SNAPSHOT</swagger-parser-v2-version>
-        <commons-io-version>2.4</commons-io-version>
-        <slf4j-version>1.7.28</slf4j-version>
+        <commons-io-version>2.6</commons-io-version>
+        <slf4j-version>1.7.30</slf4j-version>
         <swagger-core-version>2.1.1</swagger-core-version>
-        <junit-version>4.8.1</junit-version>
+        <junit-version>4.13</junit-version>
         <testng-version>6.14.2</testng-version>
         <jmockit-version>1.35</jmockit-version>
         <wiremock-version>2.15.0</wiremock-version>
         <surefire-version>2.21.0</surefire-version>
         <commons-lang-version>3.2.1</commons-lang-version>
-        <jackson-version>2.10.1</jackson-version>
+        <jackson-version>2.10.2</jackson-version>
     </properties>
 
 </project>