Fix tests after avoiding duplicate ref names.

Author: joeljons

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

@@ -220,7 +220,9 @@ public void testLoadExternalNestedDefinitions() throws Exception {
         assertTrue(definitions.containsKey("x"));
         assertTrue(definitions.containsKey("y"));
         assertTrue(definitions.containsKey("z"));
-        assertEquals(((RefModel) definitions.get("i")).get$ref(), "#/definitions/k");
+        assertEquals("#/definitions/k_2", ((RefModel) definitions.get("i")).get$ref());
+        assertEquals("k-definition", definitions.get("k").getTitle());
+        assertEquals("k-definition", definitions.get("k_2").getTitle());
     }
 
     @Test
@@ -613,7 +615,7 @@ private Swagger doRelativeFileTest(String location) {
 
         assertEquals(composedCat.getInterfaces().size(), 2);
         assertEquals(composedCat.getInterfaces().get(0).get$ref(), "#/definitions/pet");
-        assertEquals(composedCat.getInterfaces().get(1).get$ref(), "#/definitions/foo");
+        assertEquals(composedCat.getInterfaces().get(1).get$ref(), "#/definitions/foo_2");
 
         return swagger;
     }

modules/swagger-parser/src/test/java/io/swagger/parser/processors/ExternalRefProcessorTest.java

@@ -36,6 +36,10 @@ public void testProcessRefToExternalDefinition_NoNameConflict(
         final RefFormat refFormat = RefFormat.URL;
 
         new StrictExpectations() {{
+        	cache.getRenamedRef(ref);
+        	times = 1;
+        	result = null;
+
             cache.loadRef(ref, refFormat, Model.class);
             times = 1;
             result = mockedModel;

modules/swagger-parser/src/test/resources/nested-references/b.yaml

@@ -11,6 +11,7 @@ definitions:
     $ref: "./a.yaml#/definitions/j"
   k:
     type: object
+    title: k-definition
     properties:
       name:
         type: string