From 78fe2fde336a413d2e6676538f141880c44ac2e9 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Wed, 22 May 2019 13:56:44 +0300
Subject: [PATCH] Gradle, libWithTests test: check js tests running, add test
 results assertion

---
 .../kotlin/gradle/NewMultiplatformIT.kt       | 10 +++-
 .../new-mpp-lib-with-tests/TEST-all.xml       | 56 +++++++++++++++++++
 .../new-mpp-lib-with-tests/build.gradle       |  9 ++-
 .../build.gradle.kts.alternative              |  5 +-
 4 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/TEST-all.xml

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
index f11597e69b6..016180c9743 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
@@ -432,8 +432,6 @@ class NewMultiplatformIT : BaseGradleIT() {
             )
 
             val expectedKotlinOutputFiles = listOf(
-                kotlinClassesDir(sourceSet = "js/main") + "new-mpp-lib-with-tests.js",
-                kotlinClassesDir(sourceSet = "js/test") + "new-mpp-lib-with-tests_test.js",
                 *kotlinClassesDir(sourceSet = "jvmWithJava/main").let {
                     arrayOf(
                         it + "com/example/lib/JavaClassUsageKt.class",
@@ -466,6 +464,14 @@ class NewMultiplatformIT : BaseGradleIT() {
             )
 
             expectedKotlinOutputFiles.forEach { assertFileExists(it) }
+
+            assertTestResults(
+                "testProject/new-mpp-lib-with-tests/TEST-all.xml",
+                "jsBrowserTest",
+                "jsNodeTest",
+                "test", // jvmTest
+                "${nativeHostTargetName}Test"
+            )
         }
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/TEST-all.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/TEST-all.xml
new file mode 100644
index 00000000000..e908a8cb037
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/TEST-all.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<results>
+  <testsuite name="com.example.lib.TestCommonCode" tests="2" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testId" classname="com.example.lib.TestCommonCode" time="..." />
+    <testcase name="testExpectedFun" classname="com.example.lib.TestCommonCode" time="..." />
+    <system-out />
+    <system-err />
+  </testsuite>
+  <testsuite name="com.example.lib.TestCommonCode" tests="2" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testId" classname="com.example.lib.TestCommonCode" time="..." />
+    <testcase name="testExpectedFun" classname="com.example.lib.TestCommonCode" time="..." />
+    <system-out />
+    <system-err />
+  </testsuite>
+  <testsuite name="com.example.lib.TestCommonCode" tests="2" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testId" classname="com.example.lib.TestCommonCode" time="..." />
+    <testcase name="testExpectedFun" classname="com.example.lib.TestCommonCode" time="..." />
+    <system-out><![CDATA[1]]></system-out>
+    <system-err />
+  </testsuite>
+  <testsuite name="com.example.lib.TestCommonCode" tests="2" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testId" classname="com.example.lib.TestCommonCode" time="..." />
+    <testcase name="testExpectedFun" classname="com.example.lib.TestCommonCode" time="..." />
+    <system-out />
+    <system-err />
+  </testsuite>
+  <testsuite name="com.example.lib.TestJava" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testJava" classname="com.example.lib.TestJava" time="..." />
+    <system-out />
+    <system-err />
+  </testsuite>
+  <testsuite name="com.example.lib.TestJs" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testJsSpecificCode" classname="com.example.lib.TestJs" time="..." />
+    <system-out />
+    <system-err />
+  </testsuite>
+  <testsuite name="com.example.lib.TestJs" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testJsSpecificCode" classname="com.example.lib.TestJs" time="..." />
+    <system-out />
+    <system-err />
+  </testsuite>
+  <testsuite name="com.example.lib.TestWithJava" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
+    <properties />
+    <testcase name="testJavaClass" classname="com.example.lib.TestWithJava" time="..." />
+    <system-out />
+    <system-err />
+  </testsuite>
+</results>
+
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle
index 013d617c375..b8d9f6598e2 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle
@@ -23,12 +23,17 @@ kotlin {
     targets {
     	fromPreset(presets.jvm, 'jvmWithoutJava')
         fromPreset(presets.jvmWithJava, 'jvmWithJava')
-        fromPreset(presets.js, 'js')
 		fromPreset(presets.macosX64, 'macos64')
 		fromPreset(presets.linuxX64, 'linux64')
 		fromPreset(presets.mingwX64, 'mingw64')
     }
-    sourceSets {
+
+	js {
+		browser()
+		nodejs()
+	}
+
+	sourceSets {
         commonTest {
         	dependencies {
         		implementation 'org.jetbrains.kotlin:kotlin-test-common'
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative
index 256d5369d45..85a13d2c003 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative
@@ -11,7 +11,10 @@ repositories {
 kotlin {
     val jvmWithoutJava = jvm("jvmWithoutJava")
     val jvmWithJava = targetFromPreset(presets["jvmWithJava"])
-    val js = js()
+    val js = js {
+        browser()
+        nodejs()
+    }
     val macos64 = macosX64("macos64")
     val linux64 = linuxX64("linux64")
     val mingw64 = mingwX64("mingw64")