Приведение к одинаковому поведению для uri файловых схемы без authority

1c-syntax · Feb 6, 2020 · 947feab · 947feab
1 parent e87d4be
commit 947feab
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/main/java/com/github/_1c_syntax/utils/Absolute.java b/src/main/java/com/github/_1c_syntax/utils/Absolute.java
@@ -36,7 +36,17 @@ public static URI uri(String uri) {
   }
 
   public static URI uri(URI uri) {
-    return URI.create(uri.getScheme() + ":" + uri.getSchemeSpecificPart());
+    var decodedUri = URI.create(uri.getScheme() + ":" + uri.getSchemeSpecificPart());
+
+    if ("file".equals(decodedUri.getScheme()) && decodedUri.getAuthority() == null) {
+      return path(new File(decodedUri)).toUri();
+    }
+
+    return decodedUri;
+  }
+
+  public static URI uri(File file) {
+    return uri(path(file).toUri());
   }
 
   public static Path path(String path) {

diff --git a/src/test/java/com/github/_1c_syntax/utils/AbsoluteTest.java b/src/test/java/com/github/_1c_syntax/utils/AbsoluteTest.java
@@ -44,6 +44,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
+import java.net.URI;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -55,11 +56,28 @@ void testUriFromFile() {
     var file = new File("/fake.bsl");
 
     // when
-    var uri = Absolute.uri(file.toURI());
+    var uriFromUri = Absolute.uri(file.toURI());
+    var uriFromFile = Absolute.uri(file);
 
     // then
-    assertThat(uri).hasScheme("file");
-    assertThat(uri.getPath()).endsWith("fake.bsl");
+    assertThat(uriFromUri).isEqualTo(uriFromFile);
+    assertThat(uriFromFile).hasScheme("file");
+    assertThat(uriFromFile.getPath()).endsWith("fake.bsl");
+  }
+
+  @Test
+  void testUriFromString() {
+    // given
+    var uriString = "file:///fake.bsl";
+
+    // when
+    var uriFromString = Absolute.uri(uriString);
+    var uriFromFile = Absolute.uri(new File(URI.create(uriString)));
+
+    // then
+    assertThat(uriFromString).isEqualTo(uriFromFile);
+    assertThat(uriFromFile).hasScheme("file");
+    assertThat(uriFromFile.getPath()).endsWith("fake.bsl");
   }
 
   @Test