update test resource fetch

fleeksoft · Aug 23, 2024 · d9345a1 · d9345a1
1 parent f54b8ba
commit d9345a1
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 57 deletions.
diff --git a/ksoup-test/module.yaml b/ksoup-test/module.yaml
@@ -13,6 +13,7 @@ repositories:
 test-dependencies:
     - ../ksoup
     - $libs.korlibs.io
+    - $libs.kotlinx.io
     - $libs.codepoints
     - $libs.kotlinx.coroutines.test
     - $libs.kotlinx.datetime

diff --git a/ksoup-test/test/com/fleeksoft/ksoup/TestHelper.kt b/ksoup-test/test/com/fleeksoft/ksoup/TestHelper.kt
@@ -4,61 +4,68 @@ import com.fleeksoft.ksoup.io.SourceReader
 import com.fleeksoft.ksoup.ported.openSourceReader
 import korlibs.io.compression.deflate.GZIP
 import korlibs.io.compression.uncompress
-import korlibs.io.file.VfsFile
-import korlibs.io.file.fullName
-import korlibs.io.file.readAsSyncStream
 import korlibs.io.file.std.uniVfs
-import korlibs.io.stream.readAll
+import kotlinx.io.buffered
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlinx.io.readByteArray
 
 object TestHelper {
 
-    suspend fun readGzipResource(file: String): SourceReader {
-        return readGzipFile(getResourceAbsolutePath(file).uniVfs)
+    suspend fun readGzipResource(resource: String): SourceReader {
+        return readGzipFile(resource)
     }
 
-    suspend fun readResource(file: String): SourceReader {
-        if (file.endsWith(".gz") || file.endsWith(".z")) {
-            return readGzipResource(file)
+    suspend fun readResource(resource: String): SourceReader {
+        if (resource.endsWith(".gz") || resource.endsWith(".z")) {
+            return readGzipResource(resource)
         }
-        return readFile(getResourceAbsolutePath(file).uniVfs)
+        return readFile(resource)
     }
 
-    fun getResourceAbsolutePath(resourceName: String): String {
-        if (Platform.isWindows()) {
+    fun getResourceAbsolutePath(resourceName: String, absForWindows: Boolean = true): String {
+        if (Platform.isWindows() && !BuildConfig.isKotlinx && absForWindows) {
             return "../../../../testResources/$resourceName"
         } else if (Platform.isJsOrWasm()) {
             return "https://raw.githubusercontent.com/fleeksoft/ksoup/release/ksoup-test/testResources/$resourceName"
         }
         return "${BuildConfig.PROJECT_ROOT}/ksoup-test/testResources/$resourceName"
     }
 
-    suspend fun getFileAsString(file: VfsFile): String {
-        val bytes: ByteArray = if (file.fullName.endsWith(".gz")) {
-            readGzipFile(file).readAllBytes()
+    suspend fun readResourceAsString(resourceName: String): String {
+        val bytes: ByteArray = if (resourceName.endsWith(".gz")) {
+            readGzipFile(resourceName).readAllBytes()
         } else {
-            readFile(file).readAllBytes()
+            readFile(resourceName).readAllBytes()
         }
         return bytes.decodeToString()
     }
 
-    suspend fun resourceFilePathToStream(path: String): SourceReader {
-        val file = this.getResourceAbsolutePath(path).uniVfs
-        return pathToStream(file)
-    }
-
-    suspend fun pathToStream(file: VfsFile): SourceReader {
-        return if (file.fullName.endsWith(".gz") || file.fullName.endsWith(".z")) {
-            readGzipFile(file)
+    suspend fun resourceFilePathToStream(resource: String): SourceReader {
+        return if (resource.endsWith(".gz") || resource.endsWith(".z")) {
+            readGzipFile(resource)
         } else {
-            readFile(file)
+            readFile(resource)
         }
     }
 
-    suspend fun readFile(file: VfsFile): SourceReader {
-        return file.readAll().openSourceReader()
+    private suspend fun readFile(resource: String): SourceReader {
+        val abs = getResourceAbsolutePath(resource, absForWindows = false)
+        val bytes = if (Platform.isJsOrWasm()) {
+            abs.uniVfs.readAll()
+        } else {
+            SystemFileSystem.source(Path(abs)).buffered().readByteArray()
+        }
+        return bytes.openSourceReader()
     }
 
-    suspend fun readGzipFile(file: VfsFile): SourceReader {
-        return file.readAsSyncStream().readAll().uncompress(GZIP).openSourceReader()
+    private suspend fun readGzipFile(resource: String): SourceReader {
+        val abs = getResourceAbsolutePath(resource, absForWindows = false)
+        val bytes = if (Platform.isJsOrWasm()) {
+            abs.uniVfs.readAll()
+        } else {
+            SystemFileSystem.source(Path(abs)).buffered().readByteArray()
+        }
+        return bytes.uncompress(GZIP).openSourceReader()
     }
 }
diff --git a/ksoup-test/test/com/fleeksoft/ksoup/helper/DataUtilTest.kt b/ksoup-test/test/com/fleeksoft/ksoup/helper/DataUtilTest.kt
@@ -8,7 +8,6 @@ import com.fleeksoft.ksoup.ported.io.Charsets
 import com.fleeksoft.ksoup.ported.openSourceReader
 import com.fleeksoft.ksoup.ported.toByteArray
 import com.fleeksoft.ksoup.ported.toSourceFile
-import korlibs.io.file.std.uniVfs
 import kotlinx.coroutines.test.runTest
 import kotlin.test.*
 
@@ -339,9 +338,10 @@ class DataUtilTest {
 //            kotlinx module not support gzip
             return@runTest
         }
-        val resourceFile = TestHelper.getResourceAbsolutePath("htmltests/large.html.gz")
+        val resourceName = "htmltests/large.html.gz"
+        val resourceFile = TestHelper.getResourceAbsolutePath(resourceName)
         val inputFile = resourceFile.toSourceFile()
-        val input: String = TestHelper.getFileAsString(resourceFile.uniVfs)
+        val input: String = TestHelper.readResourceAsString(resourceName)
 
         val expected = Ksoup.parse(input, "https://example.com")
         val doc: Document = Ksoup.parseFile(inputFile, baseUri = "https://example.com", charsetName = null)
@@ -352,8 +352,7 @@ class DataUtilTest {
 
     @Test
     fun testStringVsSourceReaderParse() = runTest {
-        val resourceFile = TestHelper.getResourceAbsolutePath("htmltests/large.html.gz")
-        val input: String = TestHelper.getFileAsString(resourceFile.uniVfs)
+        val input: String = TestHelper.readResourceAsString("htmltests/large.html.gz")
 
         val expected = Ksoup.parse(input, "https://example.com")
         val doc: Document = Ksoup.parse(sourceReader = input.openSourceReader(), baseUri = "https://example.com", charsetName = null)
@@ -363,8 +362,7 @@ class DataUtilTest {
 
     @Test
     fun handlesUnlimitedRead() = runTest {
-        val inputFile: String = TestHelper.getResourceAbsolutePath("htmltests/large.html.gz")
-        val input: String = TestHelper.getFileAsString(inputFile.uniVfs)
+        val input: String = TestHelper.readResourceAsString("htmltests/large.html.gz")
         val byteBuffer: ByteArray = DataUtil.readToByteBuffer(input.openSourceReader(), 0)
         val read = byteBuffer.decodeToString()
         assertEquals(input, read)

diff --git a/ksoup-test/test/com/fleeksoft/ksoup/integration/ParseTest.kt b/ksoup-test/test/com/fleeksoft/ksoup/integration/ParseTest.kt
@@ -6,7 +6,6 @@ import com.fleeksoft.ksoup.Ksoup.parseFile
 import com.fleeksoft.ksoup.nodes.Document
 import com.fleeksoft.ksoup.parser.Parser
 import com.fleeksoft.ksoup.ported.openSourceReader
-import korlibs.io.file.std.uniVfs
 import kotlinx.coroutines.test.runTest
 import kotlin.test.*
 
@@ -130,8 +129,7 @@ class ParseTest {
 
     @Test
     fun testWikiExpandedFromString() = runTest {
-        val input = TestHelper.getResourceAbsolutePath("htmltests/xwiki-edit.html.gz")
-        val html = TestHelper.getFileAsString(input.uniVfs)
+        val html = TestHelper.readResourceAsString("htmltests/xwiki-edit.html.gz")
         val doc = parse(html)
         assertEquals("XWiki Jetty HSQLDB 12.1-SNAPSHOT", doc.select("#xwikiplatformversion").text())
         val wantHtml =
@@ -141,8 +139,7 @@ class ParseTest {
 
     @Test
     fun testWikiFromString() = runTest {
-        val input = TestHelper.getResourceAbsolutePath("htmltests/xwiki-1324.html.gz")
-        val html = TestHelper.getFileAsString(input.uniVfs)
+        val html = TestHelper.readResourceAsString("htmltests/xwiki-1324.html.gz")
         val doc = parse(html)
         assertEquals("XWiki Jetty HSQLDB 12.1-SNAPSHOT", doc.select("#xwikiplatformversion").text())
         val wantHtml =

diff --git a/ksoup-test/test/com/fleeksoft/ksoup/issues/GithubIssuesTests.kt b/ksoup-test/test/com/fleeksoft/ksoup/issues/GithubIssuesTests.kt
@@ -2,7 +2,6 @@ package com.fleeksoft.ksoup.issues
 
 import com.fleeksoft.ksoup.Ksoup
 import com.fleeksoft.ksoup.TestHelper
-import korlibs.io.file.std.uniVfs
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -11,7 +10,7 @@ class GithubIssuesTests {
     @Test
     fun testIssue20DuplicateElements() = runTest {
         //    https://github.com/fleeksoft/ksoup/issues/20
-        Ksoup.parse(TestHelper.getFileAsString(TestHelper.getResourceAbsolutePath("htmltests/issue20.html.gz").uniVfs))
+        Ksoup.parse(TestHelper.readResourceAsString("htmltests/issue20.html.gz"))
 //            Ksoup.parseGetRequest("https://www.dm530w.org/")
             .apply {
                 body().select("div[class=firs l]")

diff --git a/ksoup-test/test/com/fleeksoft/ksoup/parser/CharacterReaderTest.kt b/ksoup-test/test/com/fleeksoft/ksoup/parser/CharacterReaderTest.kt
@@ -9,7 +9,6 @@ import com.fleeksoft.ksoup.ported.exception.UncheckedIOException
 import com.fleeksoft.ksoup.ported.io.Charsets
 import com.fleeksoft.ksoup.ported.io.StringReader
 import com.fleeksoft.ksoup.ported.toReader
-import korlibs.io.file.std.uniVfs
 import korlibs.io.lang.substr
 import kotlinx.coroutines.test.runTest
 import kotlin.test.*
@@ -561,9 +560,7 @@ class CharacterReaderTest {
 
     @Test
     fun lineNumbersAgreeWithEditor() = runTest {
-        val content: String = TestHelper.getFileAsString(
-            TestHelper.getResourceAbsolutePath("htmltests/large.html.gz").uniVfs
-        )
+        val content: String = TestHelper.readResourceAsString("htmltests/large.html.gz")
         val reader = CharacterReader(content)
         reader.trackNewlines(true)
         val scan = "<p>VESTIBULUM" // near the end of the file

diff --git a/ksoup-test/test/com/fleeksoft/ksoup/parser/StreamParserTest.kt b/ksoup-test/test/com/fleeksoft/ksoup/parser/StreamParserTest.kt
@@ -8,7 +8,6 @@ import com.fleeksoft.ksoup.nodes.Node
 import com.fleeksoft.ksoup.ported.io.Charsets
 import com.fleeksoft.ksoup.ported.toReader
 import com.fleeksoft.ksoup.select.Elements
-import korlibs.io.file.std.uniVfs
 import kotlinx.coroutines.test.runTest
 import kotlin.test.*
 
@@ -293,12 +292,11 @@ class StreamParserTest {
     }
 
     @Test
-    fun canParseFileReader() = runTest() {
-        val file = TestHelper.getResourceAbsolutePath("htmltests/large.html.gz").uniVfs
-
-
-        val reader = TestHelper.readGzipFile(file).toReader()
-        val streamer: StreamParser = StreamParser(Parser.htmlParser()).parse(reader, file.absolutePath)
+    fun canParseFileReader() = runTest {
+        val resourceName = "htmltests/large.html.gz"
+        val file = TestHelper.getResourceAbsolutePath(resourceName)
+        val reader = TestHelper.readGzipResource(resourceName).toReader()
+        val streamer: StreamParser = StreamParser(Parser.htmlParser()).parse(reader, file)
 
         var last: Element? = null
         var e: Element?

diff --git a/ksoup-test/test@jvmAndAndroid/com/fleeksoft/ksoup/PerformanceComparisonTest.kt b/ksoup-test/test@jvmAndAndroid/com/fleeksoft/ksoup/PerformanceComparisonTest.kt
@@ -2,6 +2,7 @@ package com.fleeksoft.ksoup
 
 import com.fleeksoft.ksoup.nodes.Document
 import korlibs.io.file.std.uniVfs
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.test.runTest
 import org.jsoup.Jsoup
 import kotlin.system.measureTimeMillis
@@ -11,9 +12,10 @@ import kotlin.test.Test
 class PerformanceComparisonTest {
 
     @Test
-    @Ignore
+//    @Ignore
     fun compareWithJsoup() = runTest {
 
+        delay(8000)
         if (BuildConfig.isGithubActions) {
             return@runTest
         }

diff --git a/sample/shared/module.yaml b/sample/shared/module.yaml
@@ -5,8 +5,8 @@ product:
 dependencies:
   - $compose.foundation: exported
   - $compose.material3: exported
-  - ../../ksoup-korlibs
-  - ../../ksoup-network-korlibs
+  - ../../ksoup
+  - ../../ksoup-network
 
 dependencies@android:
   # Compose integration with Android activities