Merge branch 'master' into issue-1032

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/RefUtils.java

@@ -132,6 +132,9 @@ public static String buildUrl(String rootPath, String relativePath) {
         if(!"".equals(rootPathParts[rootPathParts.length - 1])) {
             trimRoot = 1;
         }
+        if("".equals(relPathParts[0])) {
+            trimRel = 1; trimRoot = rootPathParts.length-3;
+        }        
         for(int i = 0; i < rootPathParts.length; i++) {
             if("".equals(rootPathParts[i])) {
                 trimRel += 1;
@@ -145,7 +148,7 @@ public static String buildUrl(String rootPath, String relativePath) {
                 trimRel += 1;
             }
             else if ("..".equals(relPathParts[i])) {
-                trimRel += 1;
+                trimRel += 1; trimRoot += 1;
             }
         }
 
@@ -154,7 +157,7 @@ else if ("..".equals(relPathParts[i])) {
         System.arraycopy(relPathParts,
                 trimRel,
                 outputParts,
-                rootPathParts.length - trimRoot + trimRel - 1,
+                rootPathParts.length - trimRoot,
                 relPathParts.length - trimRel);
 
         return StringUtils.join(outputParts, "/");

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/RefUtilsTest.java

@@ -299,6 +299,20 @@ public void testPathJoin1() {
         assertEquals(ExternalRefProcessor.join("./foo#/definitions/Foo", "./bar#/definitions/Bar"), "./bar#/definitions/Bar");
     }
 
+    
+    @Test 
+    public void testPathJoin2() {
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../newFile.yaml"), "http://foo.bar.com/my/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../../newFile.yaml"), "http://foo.bar.com/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "./newFile.yaml"), "http://foo.bar.com/my/dir/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../second/newFile.yaml"), "http://foo.bar.com/my/second/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "../../otherDir/newFile.yaml"), "http://foo.bar.com/otherDir/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/file.yaml", "./newFile.yaml"), "http://foo.bar.com/newFile.yaml");        
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "/newFile.yaml"), "http://foo.bar.com/newFile.yaml");
+        assertEquals(RefUtils.buildUrl("http://foo.bar.com/my/dir/file.yaml", "/my/newFile.yaml"), "http://foo.bar.com/my/newFile.yaml");
+    }
+
+
     @Test
     public void shouldReturnEmptyExternalPathForInternalReference() {
         // given
@@ -371,5 +385,6 @@ public void shouldReturnExternalPathForHttpReference() {
         // then
         assertThat(externalPath.isPresent(), is(true));
         assertThat(externalPath.get(), equalTo("http://localhost/schema.json"));
+
     }
 }