commit b5ca80ca79face43a1bdbab7ebcef6b570908a72
author Benoit Quenaudon <bquenaudon@squareup.com> Wed Sep 29 13:17:19 2021 -0400
committer Benoit Quenaudon <bquenaudon@squareup.com> Wed Sep 29 14:37:09 2021 -0400
tree d325cef20a94e41297a12ac4eafda5be608fcb9f
parent 798206cc96e29d9de79938d094e1e99ff91ab964

Force unix slashes on relative path check

okio/src/jvmTest/kotlin/okio/utilJvm.kt

diff --git a/okio/src/jvmTest/kotlin/okio/utilJvm.kt b/okio/src/jvmTest/kotlin/okio/utilJvm.kt
index 69a5e40..931b898 100644
--- a/okio/src/jvmTest/kotlin/okio/utilJvm.kt
+++ b/okio/src/jvmTest/kotlin/okio/utilJvm.kt
@@ -16,6 +16,7 @@
 package okio
 
 import okio.Path.Companion.toOkioPath
+import okio.Path.Companion.toPath
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
@@ -31,7 +32,9 @@
   assertEquals(b.withUnixSlashes(), (a / actual).withUnixSlashes())
   // Also confirm our behavior is consistent with java.nio.
   if (sameAsNio) {
-    assertEquals(bRelativeToA, a.toNioPath().relativize(b.toNioPath()).toOkioPath())
+    // On Windows, java.nio will modify slashes to backslashes for relative paths, so we force it.
+    val nioPath = a.toNioPath().relativize(b.toNioPath()).toOkioPath().withUnixSlashes().toPath()
+    assertEquals(bRelativeToA, nioPath)
   }
 }