From c8fb38446564819d1d966298b29dbb085c18fdca Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 11 Apr 2018 02:51:45 +0300
Subject: [PATCH] Fix call to static PlatformTestCase.createModuleAt in 181

---
 .idea/inspectionProfiles/idea_default.xml     |  8 +++++++
 .../test/CompletionTestCaseWrapper.java       | 24 +++++++++++++++++++
 .../test/KotlinCompletionTestCase.java        |  2 +-
 .../script/AbstractScriptConfigurationTest.kt |  2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestCaseWrapper.java

diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index c03b17a8a8e..5486cf6edd6 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -275,6 +275,14 @@
     <inspection_tool class="PackageDirectoryMismatch" enabled="true" level="WARNING" enabled_by_default="false">
       <scope name="all except testData" level="WARNING" enabled="true" />
     </inspection_tool>
+    <inspection_tool class="ProblematicAPIUsage" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="problems">
+        <list>
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#createModuleAt" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#doCreateRealModuleIn" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+        </list>
+      </option>
+    </inspection_tool>
     <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PublicFieldAccessedInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PyCompatibilityInspection" enabled="true" level="ERROR" enabled_by_default="true">
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestCaseWrapper.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestCaseWrapper.java
new file mode 100644
index 00000000000..0229fedc55a
--- /dev/null
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestCaseWrapper.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.completion.test;
+
+import com.intellij.codeInsight.completion.CompletionTestCase;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleType;
+import com.intellij.openapi.project.Project;
+import com.intellij.testFramework.PlatformTestCase;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("MethodMayBeStatic")
+abstract public class CompletionTestCaseWrapper extends CompletionTestCase {
+    protected Module createModuleAtWrapper(String moduleName, Project project, ModuleType moduleType, String path) {
+        return createModuleAt(moduleName, project, moduleType, path);
+    }
+
+    protected Module doCreateRealModuleInWrapper(@NotNull String moduleName, @NotNull Project project, ModuleType moduleType) {
+        return doCreateRealModuleIn(moduleName, project, moduleType);
+    }
+}
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java
index 9b0824a2a3a..d80664c3a77 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 
-abstract public class KotlinCompletionTestCase extends CompletionTestCase {
+abstract public class KotlinCompletionTestCase extends CompletionTestCaseWrapper {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
index 577af83aba1..1e7019079e2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
@@ -134,7 +134,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
 
     private fun createTestModuleByName(name: String): Module {
         val newModuleDir = runWriteAction { VfsUtil.createDirectoryIfMissing(project.baseDir, name) }
-        val newModule = PlatformTestCase.createModuleAt(name, project, JavaModuleType.getModuleType(), newModuleDir.path)
+        val newModule = createModuleAtWrapper(name, project, JavaModuleType.getModuleType(), newModuleDir.path)
         PsiTestUtil.addSourceContentToRoots(newModule, newModuleDir)
         return newModule
     }