From b8327f19b8743e3c55728feeec072ade8623b89f Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Fri, 1 Apr 2016 19:51:06 +0300
Subject: [PATCH] Maven: never generate JUnit (but keep code so we will be able
 to introduce checkbox in configurator to optionally add junit and chose
 version)

---
 .../idea/configuration/KotlinJavaMavenConfigurator.java   | 4 ++--
 .../testData/configurator/jvm/fixExisting/pom_after.xml   | 8 +-------
 .../testData/configurator/jvm/libraryMissed/pom_after.xml | 8 +-------
 .../testData/configurator/jvm/pluginMissed/pom_after.xml  | 8 +-------
 .../testData/configurator/jvm/simpleProject/pom_after.xml | 8 +-------
 .../configurator/jvm/simpleProjectSnapshot/pom_after.xml  | 8 +-------
 6 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java b/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
index 47eb1653297..cc6138b96e2 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
@@ -25,11 +25,11 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator {
     private static final String NAME = "maven";
     public static final String STD_LIB_ID = "kotlin-stdlib";
-    private static final String TEST_LIB_ID = "kotlin-test-junit";
+    public static final String TEST_LIB_ID = "kotlin-test";
     private static final String PRESENTABLE_TEXT = "Maven";
 
     public KotlinJavaMavenConfigurator() {
-        super(STD_LIB_ID, TEST_LIB_ID, true, NAME, PRESENTABLE_TEXT);
+        super(STD_LIB_ID, TEST_LIB_ID, false, NAME, PRESENTABLE_TEXT);
     }
 
     @Override
diff --git a/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml
index 9425933e7ed..84d3a090cee 100644
--- a/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml
@@ -18,16 +18,10 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
+            <artifactId>kotlin-test</artifactId>
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml
index 8d12490b706..7a2200793c1 100644
--- a/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml
@@ -45,16 +45,10 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
+            <artifactId>kotlin-test</artifactId>
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 
diff --git a/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml
index 81211a2d680..8989bf8cc30 100644
--- a/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml
@@ -18,16 +18,10 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
+            <artifactId>kotlin-test</artifactId>
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml
index 1510baefe22..16c5f820f96 100644
--- a/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml
@@ -20,16 +20,10 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
+            <artifactId>kotlin-test</artifactId>
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml
index 5e490231067..fb3057819a6 100644
--- a/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml
@@ -20,16 +20,10 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
+            <artifactId>kotlin-test</artifactId>
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <repositories>