From 29fbb8e22fa8c65391f89ff939e7961d28d58a6e Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 28 Nov 2019 13:08:58 +0300
Subject: [PATCH] Update to 193.5233.102 release (KT-35239)

- Mute android specific import tests (KT-35225).
- Mute GradleMultiplatformWizardTest (IDEA-225878).
- Minor update of test data.
---
 compiler/tests-common/build.gradle.kts        |  4 ++++
 .../jetbrains/kotlin/test/muteWithDatabase.kt | 11 +++++++++-
 gradle/versions.properties.193                |  2 +-
 .../AbstractGradleMultiplatformWizardTest.kt  |  5 +++++
 .../build.gradle.4.9.after.193                | 22 +++++++++++++++++++
 tests/mute.csv.193                            | 10 +++++++--
 6 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.193

diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index 9ab9598dfe0..669f5bde6cb 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -68,6 +68,10 @@ dependencies {
     Platform[192].orHigher {
         testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
     }
+
+    Platform[193].orHigher {
+        testCompile(intellijDep()) { includeJars("platform-ide-util-io") }
+    }
 }
 
 sourceSets {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt
index 794fbea1fb6..fff9f24ff19 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt
@@ -165,7 +165,7 @@ class RunnerFactoryWithMuteInDatabase: ParametersRunnerFactory {
     }
 }
 
-private fun isIgnoredInDatabaseWithLog(child: FrameworkMethod): Boolean {
+fun isIgnoredInDatabaseWithLog(child: FrameworkMethod): Boolean {
     if (isMutedInDatabase(child.method)) {
         System.err.println(mutedMessage(testKey(child.method)))
         return true
@@ -174,6 +174,15 @@ private fun isIgnoredInDatabaseWithLog(child: FrameworkMethod): Boolean {
     return false
 }
 
+fun isIgnoredInDatabaseWithLog(testCase: TestCase): Boolean {
+    if (isMutedInDatabase(testCase)) {
+        System.err.println(mutedMessage(testKey(testCase)))
+        return true
+    }
+
+    return false
+}
+
 fun TestCase.runTest(test: () -> Unit) {
     (wrapWithMuteInDatabase(this, test) ?: test).invoke()
 }
\ No newline at end of file
diff --git a/gradle/versions.properties.193 b/gradle/versions.properties.193
index effd4dc3ba5..c4fc46a75df 100644
--- a/gradle/versions.properties.193
+++ b/gradle/versions.properties.193
@@ -1,4 +1,4 @@
-versions.intellijSdk=193.4778.7-EAP-SNAPSHOT
+versions.intellijSdk=193.5233.102
 versions.androidBuildTools=r23.0.1
 versions.idea.NodeJS=181.3494.12
 versions.jar.asm-all=7.0.1
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
index 33d896a1075..db11313f84b 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
@@ -46,6 +46,7 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.ExternalSystemImportingTestC
 import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleAbstractMultiplatformModuleBuilder
 import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
+import org.jetbrains.kotlin.test.isIgnoredInDatabaseWithLog
 import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper
 import org.jetbrains.plugins.gradle.settings.DistributionType
 import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings
@@ -256,6 +257,10 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
         }
     }
 
+    override fun shouldRunTest(): Boolean {
+        return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this)
+    }
+
     companion object {
         val externalSystemId = GradleConstants.SYSTEM_ID
     }
diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.193 b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.193
new file mode 100644
index 00000000000..d3b94674a2e
--- /dev/null
+++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.193
@@ -0,0 +1,22 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.2.60-dev-286'
+}
+group 'testgroup'
+version '1.0-SNAPSHOT'
+repositories {
+    maven { url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' }
+    mavenCentral()
+}
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
diff --git a/tests/mute.csv.193 b/tests/mute.csv.193
index b824c53d881..674f0a26c44 100644
--- a/tests/mute.csv.193
+++ b/tests/mute.csv.193
@@ -5,6 +5,13 @@ org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTes
 org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryClassUsages, KT-34542, FAIL
 org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryNestedClassUsages, KT-34542, FAIL
 org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryObjectUsages, KT-34542, FAIL
+org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testMobileShared, IDEA-225878
+org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testNative, IDEA-225878
+org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testShared, IDEA-225878
+org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testSharedWithQualifiedName, IDEA-225878
+org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testWeb, KT-35095
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225
 org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run
 org.jetbrains.kotlin.idea.caches.resolve.MultiPlatformHighlightingTestGenerated.testMultifileFacade, KT-34689 invalid light class
 org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed
@@ -130,5 +137,4 @@ org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.
 org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToFunParameter, KT-34542, FAIL
 org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToLocalFun, KT-34542, FAIL
 org.jetbrains.kotlin.idea.script.ScriptConfigurationHighlightingTestGenerated.Highlighting.testCustomJavaHome, No Java
-org.jetbrains.uast.test.kotlin.KotlinUastReferencesTest.`test original getter is visible when reference is under renaming`, Extensions API changed
-org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testWeb, KT-35095
\ No newline at end of file
+org.jetbrains.uast.test.kotlin.KotlinUastReferencesTest.`test original getter is visible when reference is under renaming`, Extensions API changed
\ No newline at end of file