From 398795b832504c26399322ad8d2b70abfcf1ac6b Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 27 Apr 2018 14:11:56 +0300
Subject: [PATCH] Fix AddRequireModuleTest in 181

- Application is null before setUp call in individual run
- Inline "module.info.add.requires.family.name" as 181 has other constant
- isScriptDependenciesUpdaterDisabled call seems to be useless
---
 .../kotlin/idea/quickfix/KotlinAddRequiredModuleFix.kt      | 2 +-
 .../jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt  | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddRequiredModuleFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddRequiredModuleFix.kt
index 585a98a817a..12690c11f83 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddRequiredModuleFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddRequiredModuleFix.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
 
 class KotlinAddRequiredModuleFix(module: PsiJavaModule, private val requiredName: String) : LocalQuickFixAndIntentionActionOnPsiElement(module) {
     @Suppress("InvalidBundleOrProperty")
-    override fun getFamilyName(): String = QuickFixBundle.message("module.info.add.requires.family.name")
+    override fun getFamilyName(): String = "Add 'requires' directive to module-info.java"
     @Suppress("InvalidBundleOrProperty")
     override fun getText(): String = QuickFixBundle.message("module.info.add.requires.name", requiredName)
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt
index 40711933fd9..80078a1502b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddRequireModuleTest.kt
@@ -27,17 +27,11 @@ class KotlinAddRequiredModuleTest : KotlinLightJava9ModulesCodeInsightFixtureTes
     private val messageM2 = QuickFixBundle.message("module.info.add.requires.name", "M_TWO")!!
 
     override fun setUp() {
-        ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = true
         super.setUp()
         moduleInfo("module M_TWO { exports pkgA; }", M2)
         addJavaFile("pkgA/A.java", "package pkgA; public class A {}", M2)
     }
 
-    override fun tearDown() {
-        super.tearDown()
-        ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = false
-    }
-
     fun testAddRequiresToModuleInfo() {
         moduleInfo("module MAIN {}", MAIN)
         val editedFile = addKotlinFile(