Wizard: fix tests

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath kotlin('gradle-plugin', '1.3.61')
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61'
     }
 }
 group = 'testGroupId'

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/build.gradle.kts

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:3.2.1")
-        classpath(kotlin("gradle-plugin", "1.3.61"))
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
     }
 }
 group = "testGroupId"

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/settings.yaml

@@ -1,11 +1,10 @@
 kotlin:
-  version: 1.3.61
   projectKind: Multiplatform
   modules:
     - type:
         name: android
         androidSdkPath: /home/user/Android/Sdk
-      kind: singleplatform
+      kind: singleplatformJvm
       name: android
       sourcesets:
         - type: main

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle

@@ -33,7 +33,9 @@ kotlin {
             }
         }
         browserTest {
-
+            dependencies {
+                implementation kotlin('test-js')
+            }
         }
     }
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts

@@ -30,6 +30,10 @@ kotlin {
                 implementation(kotlin("stdlib-js"))
             }
         }
-        val browserTest by getting
+        val browserTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+            }
+        }
     }
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/settings.yaml

@@ -1,5 +1,4 @@
 kotlin:
-  version: 1.3.61
   projectKind: Multiplatform
   modules:
     - type: multiplatform
@@ -12,7 +11,9 @@ kotlin:
           sourcesets:
             - type: main
             - type: test
-        - type: jsBrowser
+        - type:
+            name: jsBrowser
+            testFramework: JS
           kind: target
           name: browser
           sourcesets:

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle

@@ -16,7 +16,9 @@ kotlin {
             }
         }
         jvmTest {
-
+            dependencies {
+                implementation kotlin('test-junit')
+            }
         }
     }
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts

@@ -15,6 +15,10 @@ kotlin {
                 implementation(kotlin("stdlib-jdk8"))
             }
         }
-        val jvmTest by getting
+        val jvmTest by getting {
+            dependencies {
+                implementation(kotlin("test-junit"))
+            }
+        }
     }
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/settings.yaml

@@ -1,12 +1,13 @@
 kotlin:
-  version: 1.3.61
   projectKind: Multiplatform
   modules:
     - type: multiplatform
       kind: multiplatform
       name: a
       subModules:
-        - type: jvmTarget
+        - type:
+            name: jvmTarget
+            testFramework: JUNIT4
           kind: target
           name: jvm
           sourcesets:

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle

@@ -8,5 +8,6 @@ repositories {
     mavenCentral()
 }
 dependencies {
+    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts

@@ -8,5 +8,6 @@ repositories {
     mavenCentral()
 }
 dependencies {
+    testImplementation(kotlin("test-junit"))
     implementation(kotlin("stdlib-jdk8"))
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml

@@ -51,6 +51,12 @@
         </plugins>
     </build>
     <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>1.3.61</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/settings.yaml

@@ -1,10 +1,11 @@
 kotlin:
-  version: 1.3.61
   projectKind: Singleplatform
   modules:
-    - type: JVM Module
+    - type:
+        name: JVM Module
+        testFramework: JUNIT4
       name: nya
-      kind: singleplatform
+      kind: singleplatformJvm
       sourcesets:
         - type: main
 

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle

@@ -12,10 +12,10 @@ repositories {
 kotlin {
     def hostOs = System.getProperty("os.name")
     def isMingwX64 = hostOs.startsWith("Windows")
-    KotlinNativeTargetWithTests nativeTarget
-    if (hostOs == "Mac OS X") nativeTarget = macosX64('myNative')
-    else if (hostOs == "Linux") nativeTarget = linuxX64("myNative")
-    else if (isMingwX64) nativeTarget = mingwX64("myNative")
+    KotlinNativeTargetWithTests myNativeTarget
+    if (hostOs == "Mac OS X") myNativeTarget = macosX64('myNative')
+    else if (hostOs == "Linux") myNativeTarget = linuxX64("myNative")
+    else if (isMingwX64) myNativeTarget = mingwX64("myNative")
     else throw new GradleException("Host OS is not supported in Kotlin/Native.")
 
 

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/build.gradle.kts

@@ -10,7 +10,7 @@ repositories {
 kotlin {
     val hostOs = System.getProperty("os.name")
     val isMingwX64 = hostOs.startsWith("Windows")
-    val nativeTarget = when {
+    val myNativeTarget = when {
         hostOs == "Mac OS X" -> macosX64("myNative")
         hostOs == "Linux" -> linuxX64("myNative")
         isMingwX64 -> mingwX64("myNative")

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/nativeForCurrentSystem/settings.yaml

@@ -1,5 +1,4 @@
 kotlin:
-  version: 1.3.61
   projectKind: Multiplatform
   modules:
     - type: multiplatform

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle

@@ -21,7 +21,9 @@ kotlin {
             }
         }
         jvmTest {
-
+            dependencies {
+                implementation kotlin('test-junit')
+            }
         }
         aMain {
             dependencies {
@@ -29,7 +31,9 @@ kotlin {
             }
         }
         aTest {
-
+            dependencies {
+                implementation kotlin('test-js')
+            }
         }
     }
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts

@@ -20,12 +20,20 @@ kotlin {
                 implementation(kotlin("stdlib-jdk8"))
             }
         }
-        val jvmTest by getting
+        val jvmTest by getting {
+            dependencies {
+                implementation(kotlin("test-junit"))
+            }
+        }
         val aMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-js"))
             }
         }
-        val aTest by getting
+        val aTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+            }
+        }
     }
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/settings.yaml

@@ -1,18 +1,21 @@
 kotlin:
-  version: 1.3.61
   projectKind: Multiplatform
   modules:
     - type: multiplatform
       kind: multiplatform
       name: a
       subModules:
-        - type: jvmTarget
+        - type:
+            name: jvmTarget
+            testFramework: JUNIT4
           kind: target
           name: jvm
           sourcesets:
             - type: main
             - type: test
-        - type: jsBrowser
+        - type:
+              name: jsBrowser
+              testFramework: JS
           kind: target
           name: a
           sourcesets:

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleNativeTarget/settings.yaml

@@ -1,5 +1,4 @@
 kotlin:
-  version: 1.3.61
   projectKind: Multiplatform
   modules:
     - type: multiplatform