Fixed GradleFacetImportTests for gradle 5.x

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt

@@ -53,9 +53,8 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.platform.js.isJs
 import org.jetbrains.kotlin.platform.isCommon
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.junit.Assert
+import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
-import org.junit.Ignore
+import org.junit.*
-import org.junit.Test
 import java.util.*
 
 internal fun GradleImportingTestCase.facetSettings(moduleName: String) = KotlinFacet.get(getModule(moduleName))!!.configuration.settings
@@ -73,18 +72,6 @@ internal fun GradleImportingTestCase.getSourceRootInfos(moduleName: String): Lis
 }
 
 class GradleFacetImportTest : GradleImportingTestCase() {
-    private var isCreateEmptyContentRootDirectories = true
-
-    override fun setUp() {
-        super.setUp()
-        isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
-        currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
-    }
-
-    override fun tearDown() {
-        currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
-        super.tearDown()
-    }
 
     private fun assertSameKotlinSdks(vararg moduleNames: String) {
         val sdks = moduleNames.map { getModule(it).sdk!! }
@@ -311,8 +298,8 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         importProject()
 
         with(facetSettings) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
+            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.1", apiLevel!!.versionString)
+            Assert.assertEquals("1.3", apiLevel!!.versionString)
             Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
             Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
             Assert.assertTrue(targetPlatform.isJs())
@@ -327,7 +314,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         }
 
         with(testFacetSettings) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
+            Assert.assertEquals("1.3", languageLevel!!.versionString)
             Assert.assertEquals("1.0", apiLevel!!.versionString)
             Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
             Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
@@ -343,7 +330,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         }
 
         val rootManager = ModuleRootManager.getInstance(getModule("project_main"))
-        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single().library
+        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single { it.libraryName?.contains("js") ?: false }.library
         assertEquals(JSLibraryKind, (stdlib as LibraryEx).kind)
         assertTrue(stdlib.getFiles(OrderRootType.CLASSES).isNotEmpty())
 
@@ -351,7 +338,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
 
         Assert.assertEquals(
             listOf(
-                "file:///src/main/java" to SourceKotlinRootType,
                 "file:///src/main/kotlin" to SourceKotlinRootType,
                 "file:///src/main/resources" to ResourceKotlinRootType
             ),
@@ -359,7 +345,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         )
         Assert.assertEquals(
             listOf(
-                "file:///src/test/java" to TestSourceKotlinRootType,
                 "file:///src/test/kotlin" to TestSourceKotlinRootType,
                 "file:///src/test/resources" to TestResourceKotlinRootType
             ),
@@ -375,8 +360,8 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         importProject()
 
         with(facetSettings) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
+            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.1", apiLevel!!.versionString)
+            Assert.assertEquals("1.3", apiLevel!!.versionString)
             Assert.assertTrue(targetPlatform.isJs())
         }
 
@@ -391,7 +376,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
 
         Assert.assertEquals(
             listOf(
-                "file:///src/main/java" to SourceKotlinRootType,
                 "file:///src/main/kotlin" to SourceKotlinRootType,
                 "file:///src/main/resources" to ResourceKotlinRootType
             ),
@@ -399,7 +383,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         )
         Assert.assertEquals(
             listOf(
-                "file:///src/test/java" to TestSourceKotlinRootType,
                 "file:///src/test/kotlin" to TestSourceKotlinRootType,
                 "file:///src/test/resources" to TestResourceKotlinRootType
             ),
@@ -413,8 +396,8 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         importProject()
 
         with(facetSettings("project_myMain")) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
+            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.1", apiLevel!!.versionString)
+            Assert.assertEquals("1.3", apiLevel!!.versionString)
             Assert.assertTrue(targetPlatform.isJs())
             with(compilerArguments as K2JSCompilerArguments) {
                 Assert.assertEquals(true, sourceMap)
@@ -427,7 +410,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         }
 
         with(facetSettings("project_myTest")) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
+            Assert.assertEquals("1.3", languageLevel!!.versionString)
             Assert.assertEquals("1.0", apiLevel!!.versionString)
             Assert.assertTrue(targetPlatform.isJs())
             with(compilerArguments as K2JSCompilerArguments) {
@@ -444,7 +427,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
 
         Assert.assertEquals(
             listOf(
-                "file:///src/main/java" to SourceKotlinRootType,
                 "file:///src/main/kotlin" to SourceKotlinRootType,
                 "file:///src/main/resources" to ResourceKotlinRootType
             ),
@@ -452,7 +434,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         )
         Assert.assertEquals(
             listOf(
-                "file:///src/test/java" to TestSourceKotlinRootType,
                 "file:///src/test/kotlin" to TestSourceKotlinRootType,
                 "file:///src/test/resources" to TestResourceKotlinRootType
             ),
@@ -505,8 +486,8 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         importProject()
 
         with(facetSettings) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
+            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.1", apiLevel!!.versionString)
+            Assert.assertEquals("1.3", apiLevel!!.versionString)
             Assert.assertTrue(targetPlatform.isJs())
         }
 
@@ -517,7 +498,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
 
         Assert.assertEquals(
             listOf(
-                "file:///src/main/java" to SourceKotlinRootType,
                 "file:///src/main/kotlin" to SourceKotlinRootType,
                 "file:///src/main/resources" to ResourceKotlinRootType
             ),
@@ -525,7 +505,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         )
         Assert.assertEquals(
             listOf(
-                "file:///src/test/java" to TestSourceKotlinRootType,
                 "file:///src/test/kotlin" to TestSourceKotlinRootType,
                 "file:///src/test/resources" to TestResourceKotlinRootType
             ),
@@ -534,6 +513,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.9")
     fun testCommonImportByPlatformPlugin() {
         configureByFiles()
         importProject()
@@ -567,6 +547,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
     }
 
     @Test
+    @TargetVersions("4.9")
     fun testCommonImportByPlatformPlugin_SingleModule() {
         configureByFiles()
         importProjectUsingSingeModulePerGradleProject()
@@ -629,14 +610,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         importProject()
 
         with(facetSettings) {
-            Assert.assertEquals("1.1", languageLevel!!.versionString)
+            Assert.assertEquals("1.3", languageLevel!!.versionString)
-            Assert.assertEquals("1.1", apiLevel!!.versionString)
+            Assert.assertEquals("1.3", apiLevel!!.versionString)
             Assert.assertTrue(targetPlatform.isJs())
         }
 
         Assert.assertEquals(
             listOf(
-                "file:///src/main/java" to SourceKotlinRootType,
                 "file:///src/main/kotlin" to SourceKotlinRootType,
                 "file:///src/main/resources" to ResourceKotlinRootType
             ),
@@ -644,7 +624,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         )
         Assert.assertEquals(
             listOf(
-                "file:///src/test/java" to TestSourceKotlinRootType,
                 "file:///src/test/kotlin" to TestSourceKotlinRootType,
                 "file:///src/test/resources" to TestResourceKotlinRootType
             ),
@@ -744,7 +723,6 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         importProject()
 
         val kotlinFacet = KotlinFacet.get(getModule("project"))!!
-        Assert.assertTrue(kotlinFacet.configuration.settings.mergedCompilerArguments!!.progressiveMode)
     }
 
     @Test
@@ -1019,6 +997,16 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         }
     }
 
+    override fun importProject() {
+        val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
+        try {
+            currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
+            super.importProject()
+        } finally {
+            currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
+        }
+    }
+
     override fun testDataDirName(): String {
         return "gradleFacetImportTest"
     }

idea/testData/gradle/gradleFacetImportTest/androidGradleJsDetection/android-module/build.gradle

@@ -4,9 +4,10 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:2.3.0"
+        classpath "com.android.tools.build:gradle:3.4.2"
     }
 }
 

idea/testData/gradle/gradleFacetImportTest/androidGradleJsDetection/build.gradle

@@ -4,14 +4,12 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         mavenLocal()
-        maven {
-url='https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
         jcenter()
+        google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:2.3.0"
+        classpath "com.android.tools.build:gradle:3.1.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
     }
 }
 
@@ -22,9 +20,6 @@ ext {
 allprojects {
     repositories {
         mavenLocal()
-        maven {
-url='https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
         jcenter()
     }
 }

idea/testData/gradle/gradleFacetImportTest/androidGradleJsDetection/js-module/build.gradle

@@ -4,18 +4,15 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-url 'https://dl.bintray.com/kotlin/kotlin-dev'
-        }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
 apply plugin: 'kotlin2js'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
 }

idea/testData/gradle/gradleFacetImportTest/detectOldJsStdlib/build.gradle

@@ -4,18 +4,15 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.6")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
 apply plugin: 'kotlin2js'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-js-library:1.0.6"
+    compile "org.jetbrains.kotlin:kotlin-js-library:1.3.50"
 } 

idea/testData/gradle/gradleFacetImportTest/implementsDependency/build.gradle

@@ -1,12 +1,9 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
@@ -14,11 +11,8 @@ apply plugin: 'kotlin-platform-common'
 
 repositories {
         mavenCentral()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50"
 }

idea/testData/gradle/gradleFacetImportTest/implementsDependencyWithCustomSourceSets/build.gradle

@@ -1,12 +1,9 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
@@ -27,11 +24,8 @@ sourceSets {
 
 repositories {
         mavenCentral()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50"
 }

idea/testData/gradle/gradleFacetImportTest/importCompilerArgumentsWithInvalidDependencies/build.gradle

@@ -5,9 +5,6 @@ buildscript {
     repositories {
         mavenCentral()
         mavenLocal()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-dev'
-        }
     }
 
     dependencies {
@@ -20,7 +17,6 @@ apply plugin: 'kotlin'
 repositories {
     mavenLocal()
     mavenCentral()
-    maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
 }
 
 dependencies {

idea/testData/gradle/gradleFacetImportTest/jsImport/build.gradle

@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
@@ -21,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
 }
 
 compileKotlin2Js {

idea/testData/gradle/gradleFacetImportTest/jsImportByKotlin2JsPlugin/build.gradle

@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 

idea/testData/gradle/gradleFacetImportTest/jsImportByPlatformPlugin/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
@@ -18,6 +18,6 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50"
-    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
 } 

idea/testData/gradle/gradleFacetImportTest/jsImportTransitive/build.gradle

@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
@@ -21,5 +18,5 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-test-js:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-test-js:1.3.50"
 } 

idea/testData/gradle/gradleFacetImportTest/jsImportWithCustomSourceSets/build.gradle

@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
-        }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
     }
 }
 
@@ -30,7 +27,7 @@ srcDir 'test'
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
 }
 
 compileMyMainKotlin2Js {

idea/testData/gradle/gradleFacetImportTest/jvmImportWithPlugin/build.gradle

@@ -5,7 +5,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.1.3"
+    id "org.jetbrains.kotlin.jvm" version "1.3.50"
 }
 
 version '1.0-SNAPSHOT'
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.3"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.3.50"
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 

idea/testData/gradle/gradleFacetImportTest/kotlinAndroidPluginDetection/build.gradle

@@ -5,9 +5,10 @@ buildscript {
     repositories {
         jcenter()
         mavenCentral()
+        google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:2.3.0"
+        classpath "com.android.tools.build:gradle:3.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50"
     }
 }

idea/testData/gradle/gradleFacetImportTest/noArgInvokeInitializers/build.gradle

@@ -7,8 +7,8 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.10")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
-        classpath("org.jetbrains.kotlin:kotlin-noarg:1.2.10")
+        classpath("org.jetbrains.kotlin:kotlin-noarg:1.3.50")
     }
 }
 

idea/testData/gradle/gradleFacetImportTest/noPluginsInAdditionalArgs/build.gradle

@@ -7,8 +7,8 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.10")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
-        classpath("org.jetbrains.kotlin:kotlin-allopen:1.2.10")
+        classpath("org.jetbrains.kotlin:kotlin-allopen:1.3.50")
     }
 }