2 files changed, 17 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java
index dbdc0186de..8a1e14fbcf 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathTest.java
@@ -26,6 +26,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.lang.ref.WeakReference;
+import java.net.URI;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
@@ -301,6 +302,13 @@ public class PathTest {
     assertThat(segment.toString()).isEqualTo("/foo/bar.txt");
   }
 
+  @Test
+  public void testToURI() throws Exception {
+    Path p = root.getRelative("/tmp/foo bar.txt");
+    URI uri = p.toURI();
+    assertThat(uri.toString()).isEqualTo("file:///tmp/foo%20bar.txt");
+  }
+
   private void assertAsFragmentWorks(String expected) {
     assertThat(filesystem.getPath(expected).asFragment()).isEqualTo(PathFragment.create(expected));
   }
diff --git a/src/test/java/com/google/devtools/build/lib/windows/PathWindowsTest.java b/src/test/java/com/google/devtools/build/lib/windows/PathWindowsTest.java
index e681733c88..1bd3779e66 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/PathWindowsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/windows/PathWindowsTest.java
@@ -25,6 +25,7 @@ import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.vfs.RootedPath;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 import com.google.devtools.build.lib.windows.WindowsFileSystem.WindowsPath;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -339,4 +340,12 @@ public class PathWindowsTest {
     assertThat(actual.getRoot()).isEqualTo(ancestor);
     assertThat(actual.getRelativePath()).isEqualTo(PathFragment.create("baz"));
   }
+
+  @Test
+  public void testToURI() {
+    // See https://blogs.msdn.microsoft.com/ie/2006/12/06/file-uris-in-windows/
+    Path p = root.getRelative("Temp\\Foo Bar.txt");
+    URI uri = p.toURI();
+    assertThat(uri.toString()).isEqualTo("file:///C:/Temp/Foo%20Bar.txt");
+  }
 }