Merge pull request #34 from amanshuraikwar/js-tests

Js tests

Author: amanshuraikwar

.github/workflows/shared-tests-js-browser.yml

@@ -0,0 +1,24 @@
+name: Tests :shared JS Browser
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - trunk
+
+jobs:
+  web-build-html-js:
+    runs-on: macos-11
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.1
+        
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+          
+      - name: Tests :shared
+        run: |
+          cd project-files/Portfolio
+          ./gradlew :shared:cleanJsBrowserTest :shared:jsBrowserTest --stacktrace

README.md

@@ -7,6 +7,8 @@
 ![](https://github.com/amanshuraikwar/amanshuraikwar.github.io/actions/workflows/build-web-html-js.yml/badge.svg)
        
 <a href="https://amanshuraikwar.github.io/tests/shared/android-jvm/">![](https://github.com/amanshuraikwar/amanshuraikwar.github.io/actions/workflows/shared-tests-android-jvm.yml/badge.svg)</a>
+&nbsp; &nbsp; &nbsp; &nbsp;
+<a href="https://amanshuraikwar.github.io/tests/shared/js-browser/">![](https://github.com/amanshuraikwar/amanshuraikwar.github.io/actions/workflows/shared-tests-js-browser.yml/badge.svg)</a>
 
 </p>
 

project-files/Portfolio/buildWebsite.kts

@@ -51,17 +51,25 @@ File(".") exec "cp -R build/home/ build/"
 println("Deleting build/home...")
 File(".") exec "rm -rf build/home"
 
-println("Running theme data tests in :shared for Android/JVM target...")
-File(".") exec "./gradlew :shared:cleanTestDebugUnitTest :shared:testDebugUnitTest"
 println("Creating directory build/tests...")
 File(".") exec "mkdir build/tests"
 println("Creating directory build/tests/shared...")
 File(".") exec "mkdir build/tests/shared"
+
+println("Running theme data tests in :shared for Android/JVM target...")
+File(".") exec "./gradlew :shared:cleanTestDebugUnitTest :shared:testDebugUnitTest"
 println("Creating directory build/tests/shared/android-jvm...")
 File(".") exec "mkdir build/tests/shared/android-jvm"
 println("Copying contents from shared/build/reports/tests/testDebugUnitTest/ to build/tests/shared/android-jvm/...")
 File(".") exec "cp -R shared/build/reports/tests/testDebugUnitTest/ build/tests/shared/android-jvm/"
 
+println("Running theme data tests in :shared for Js Browser...")
+File(".") exec "./gradlew :shared:cleanJsBrowserTest :shared:jsBrowserTest --stacktrace"
+println("Creating directory build/tests/shared/js-browser...")
+File(".") exec "mkdir build/tests/shared/js-browser"
+println("Copying contents from shared/build/reports/tests/jsBrowserTest/ to build/tests/shared/js-browser/...")
+File(".") exec "cp -R shared/build/reports/tests/jsBrowserTest/ build/tests/shared/js-browser/"
+
 data class BlogListEntry(
     val title: String,
     val date: String,

project-files/Portfolio/shared/build.gradle.kts

@@ -98,4 +98,12 @@ android {
         minSdk = 23
         targetSdk = 30
     }
+}
+
+// a temporary workaround for a bug in jsRun invocation - see https://youtrack.jetbrains.com/issue/KT-48273
+afterEvaluate {
+    rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
+        versions.webpackDevServer.version = "4.0.0"
+        versions.webpackCli.version = "4.9.0"
+    }
 }

project-files/Portfolio/shared/src/androidTest/kotlin/io/github/amanshuraikwar/portfolio/TestFun.kt

@@ -7,13 +7,4 @@ actual fun runTest(block: suspend CoroutineScope.() -> Unit) = runBlocking { blo
 
 actual annotation class JsName actual constructor(
     actual val name: String
-)
-
-/** Read the given resource as binary data. */
-actual fun readBinaryResource(
-    resourceName: String
-): ByteArray {
-    return ClassLoader
-        .getSystemResourceAsStream(resourceName)!!
-        .readBytes()
-}
+)

project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/BlogListDataStore.kt

@@ -6,6 +6,12 @@ class BlogListDataStore {
 
 	fun getBlogListData(): List<BlogListDataItem> {
 		return listOf(
+            BlogListDataItem(
+                title = "My Portfolio",
+                date = "December 25, 2021",
+                firstParagraph = "This is my portfolio. It is a KMM project which runs on Web, Android, iOS. The business logic is written in Kotlin. The Web app is written in Kotlin, built using Jetpack Compose for Web. The Android app is written in Kotlin, built using Jetpack Compose. The iOS app UI is written in Swift, built using Swift UI and it uses the KMM shared module for business logic.",
+                link = "https://amanshuraikwar.github.io/portfolio",
+            ),
             BlogListDataItem(
                 title = "How to use highlight.js in your Jetpack Compose Web project",
                 date = "December 14, 2021",
@@ -18,12 +24,6 @@ class BlogListDataStore {
                 firstParagraph = "If you are writing unit tests for your Kotlin project and need to mock certain objects, there is high chance that you are using MockK. Here are a couple of issues that I faced while using MockK in my KMM project. The project has Android and iOS apps with business logic written in shared KMM modules, I was writing unit tests to test this business logic.",
                 link = "https://amanshuraikwar.github.io/mockk-kmm-issues",
             ),
-            BlogListDataItem(
-                title = "My Portfolio",
-                date = "December 11, 2021",
-                firstParagraph = "This is my portfolio. It is a KMM project which runs on Web, Android, iOS. The business logic is written in Kotlin. The Web app is written in Kotlin, built using Jetpack Compose for Web. The Android app is written in Kotlin, built using Jetpack Compose. The iOS app UI is written in Swift, built using Swift UI and it uses the KMM shared module for business logic.",
-                link = "https://amanshuraikwar.github.io/portfolio",
-            ),
             BlogListDataItem(
                 title = "Introducing Next Bus SG",
                 date = "December 8, 2021",

project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt

@@ -3,9 +3,5 @@ package io.github.amanshuraikwar.portfolio
 import kotlinx.coroutines.CoroutineScope
 
 expect fun runTest(block: suspend CoroutineScope.() -> Unit)
-expect annotation class JsName constructor(val name: String)
 
-/** Read the given resource as binary data. */
-expect fun readBinaryResource(
-    resourceName: String
-): ByteArray
+expect annotation class JsName constructor(val name: String)

project-files/Portfolio/shared/src/commonTest/kotlin/io.github.amanshuraikwar.portfolio/ThemeDataTest.kt

@@ -151,6 +151,7 @@ class ThemeDataTest {
     }
 
     @Test
+    @JsName("defaultSelectedThemeColorsNameAndTheThemeExists")
     fun `default selected theme colors name and the theme exists`() {
         val portfolioRepository = PortfolioRepository(
             settings = MockSettings(),
@@ -167,6 +168,7 @@ class ThemeDataTest {
     }
 
     @Test
+    @JsName("defaultSelectedThemeColorsNameIsFirstFromTheDefaultThemeDataWhenTheThemeDoesNotExist")
     fun `default selected theme colors name is first from the default theme data when the theme does not exist`() {
         val portfolioRepository = PortfolioRepository(
             settings = MockSettings(),
@@ -187,6 +189,7 @@ class ThemeDataTest {
     }
 
     @Test
+    @JsName("setSelectedThemeColorsNameFlowEmitIsCorrect")
     fun `set selected theme colors name flow emit is correct`() {
         val portfolioRepository = PortfolioRepository(
             settings = MockSettings(),
@@ -211,6 +214,7 @@ class ThemeDataTest {
     }
 
     @Test
+    @JsName("setSelectedThemeColorsNameCorrespondingThemeDoesNotExist")
     fun `set selected theme colors name corresponding theme does not exist`() {
         val portfolioRepository = PortfolioRepository(
             settings = MockSettings(),

project-files/Portfolio/shared/src/iosTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt

@@ -1,39 +1,10 @@
 package io.github.amanshuraikwar.portfolio
 
-import kotlinx.cinterop.addressOf
-import kotlinx.cinterop.usePinned
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.runBlocking
-import platform.Foundation.NSBundle
-import platform.Foundation.NSData
-import platform.Foundation.dataWithContentsOfFile
-import platform.posix.memcpy
 
 actual fun runTest(block: suspend CoroutineScope.() -> Unit) = runBlocking { block() }
 
 actual annotation class JsName actual constructor(
     actual val name: String
-)
-
-/** Read the given resource as binary data. */
-actual fun readBinaryResource(
-    resourceName: String
-): ByteArray {
-    // split based on "." and "/". We want to strip the leading ./ and
-    // split the extension
-    val pathParts = resourceName.split("[.|/]".toRegex())
-    // pathParts looks like
-    // [, , test_case_input_one, bin]
-    val path = NSBundle.mainBundle
-        .pathForResource("resources/${pathParts[2]}", pathParts[3])
-    val data = NSData.dataWithContentsOfFile(path!!)
-    return data!!.toByteArray()
-}
-
-internal fun NSData.toByteArray(): ByteArray {
-    return ByteArray(length.toInt()).apply {
-        usePinned {
-            memcpy(it.addressOf(0), bytes, length)
-        }
-    }
-}
+)

project-files/Portfolio/shared/src/jsTest/kotlin/io.github.amanshuraikwar.portfolio/TestFun.kt

@@ -1,6 +1,5 @@
 package io.github.amanshuraikwar.portfolio
 
-import io.ktor.utils.io.core.toByteArray
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.await
@@ -19,16 +18,3 @@ actual fun runTest(block: suspend CoroutineScope.() -> Unit): dynamic {
 actual typealias JsName = kotlin.js.JsName
 
 private external fun require(module: String): dynamic
-
-@Suppress("ObjectPropertyName")
-external val __dirname: dynamic
-
-/** Read the given resource as binary data. */
-actual fun readBinaryResource(resourceName: String): ByteArray {
-    if (resourceName.endsWith(".json")) {
-        println(JSON.stringify(require("${__dirname}/$resourceName")))
-        return JSON.stringify(require("${__dirname}/$resourceName")).toByteArray()
-    } else {
-        throw IllegalArgumentException("Only .json files are supported")
-    }
-}