Try to fix tests

soywiz-archive · Nov 28, 2020 · 088d75e · 088d75e
1 parent bbb5d4b
commit 088d75e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/korio/src/commonMain/kotlin/com/soywiz/korio/file/std/DynamicRootVfs.kt b/korio/src/commonMain/kotlin/com/soywiz/korio/file/std/DynamicRootVfs.kt
@@ -4,7 +4,7 @@ import com.soywiz.korio.file.*
 
 fun DynamicRootVfs(base: Vfs, rootGet: () -> String) = DynamicRootVfsVfs(base, rootGet).root
 
-class DynamicRootVfsVfs(val base: Vfs, val rootGet: () -> String) : Vfs.Proxy() {
+open class DynamicRootVfsVfs(val base: Vfs, val rootGet: () -> String) : Vfs.Proxy() {
     private fun getLocalAbsolutePath(path: String) = rootGet().pathInfo.lightCombine(path.pathInfo).fullPath
     override fun getAbsolutePath(path: String): String = base.getAbsolutePath(getLocalAbsolutePath(path))
     override suspend fun access(path: String): VfsFile = base[getLocalAbsolutePath(path)]

diff --git a/korio/src/commonTest/kotlin/com/soywiz/korio/vfs/UniversalVfsTest.kt b/korio/src/commonTest/kotlin/com/soywiz/korio/vfs/UniversalVfsTest.kt
@@ -8,9 +8,11 @@ import com.soywiz.korio.util.*
 import kotlin.test.*
 
 class UniversalVfsTest {
+    private val fileIsLocalVfs get() = !OS.isJsBrowser && !OS.isNative
+
 	@Test
 	fun testProperVfsIsResolved() {
-		if (!OS.isJsBrowser) {
+		if (fileIsLocalVfs) {
 			assertTrue("file:///path/to/my/file".uniVfs.vfs is LocalVfs)
 		}
 		assertTrue("http://google.es/".uniVfs.vfs is UrlVfs)
@@ -19,7 +21,7 @@ class UniversalVfsTest {
 
 	@Test
 	fun testProperPathIsResolved() {
-		if (!OS.isJsBrowser) {
+		if (fileIsLocalVfs) {
 			assertEquals("/path/to/my/file", "file:///path/to/my/file".uniVfs.absolutePath)
 		}
 		assertEquals("http://google.es/", "http://google.es/".uniVfs.absolutePath)