From b23cbc0ade0f1044d0367c249bfbda2a69cc6ce9 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Wed, 23 Sep 2015 17:35:59 +0300
Subject: [PATCH] Revert "add test for check access to internal elements from
 another module"

This reverts commit b4e7a9c740cbcd560e131bda7dd9be2c35b6df24.

Original commit: db602df146033c887524cba27336c97ad3c54815
---
 .../kotlin/jps/build/KotlinJpsBuildTest.kt    | 18 -----------
 .../kotlinProject.ipr                         | 32 -------------------
 .../module1/module1.iml                       | 13 --------
 .../module1/src/module1.kt                    | 10 ------
 .../module2/module2.iml                       | 14 --------
 .../module2/src/additional.kt                 |  9 ------
 .../module2/src/module2.kt                    | 29 -----------------
 7 files changed, 125 deletions(-)
 delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr
 delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml
 delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt
 delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml
 delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt
 delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt

diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 4e2843be32f..6a6a749a614 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -43,7 +43,6 @@ import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.codegen.JvmCodegenUtil
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.MockLibraryUtil
 import org.jetbrains.kotlin.utils.PathUtil
 import org.jetbrains.org.objectweb.asm.ClassReader
@@ -473,23 +472,6 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
         checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage"))
     }
 
-    public fun testInternalFromAnotherModule() {
-        initProject()
-        val result = makeAll()
-        result.assertFailed()
-
-        val module2File = File(workDir, "module2/src/module2.kt")
-        val expectedErrors = InTextDirectivesUtils.findLinesWithPrefixesRemoved(FileUtilRt.loadFile(module2File), "// ERROR:")
-                .sorted()
-                .joinToString("\n")
-        val actualErrors = result.getMessages(BuildMessage.Kind.ERROR)
-                .map { it.messageText }
-                .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() }
-                .sorted()
-                .joinToString("\n")
-        assertEquals(expectedErrors, actualErrors, "Error messages were different")
-    }
-
     public fun testCircularDependencyWithReferenceToOldVersionLib() {
         initProject()
 
diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr b/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047..00000000000
--- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml
deleted file mode 100644
index 3b1ba79ed61..00000000000
--- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt
deleted file mode 100644
index 30fcc94d780..00000000000
--- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package test
-
-internal open class InternalClass1
-
-abstract class ClassA1(internal val member: Int)
-
-abstract class ClassB1 {
-    internal abstract val member: Int
-}
-
diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml
deleted file mode 100644
index ecdc9e147ae..00000000000
--- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt
deleted file mode 100644
index e7ebf8914c0..00000000000
--- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-internal open class InternalClass2
-
-abstract class ClassA2(internal val member: Int)
-
-abstract class ClassB2 {
-    internal abstract val member: Int
-}
diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt
deleted file mode 100644
index 1f1647ddad4..00000000000
--- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// ERROR: 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it
-// ERROR: Cannot access 'InternalClass1': it is 'internal' in 'test'
-// ERROR: Cannot access 'member': it is 'invisible_fake' in 'ClassAA1'
-package test
-
-// InternalClass1, ClassA1, ClassB1 are in module1
-class ClassInheritedFromInternal1: InternalClass1()
-
-class ClassAA1 : ClassA1(10)
-
-class ClassBB1 : ClassB1() {
-    internal override val member = 10
-}
-
-// InternalClass2, ClassA2, ClassB2 are in module2
-class ClassInheritedFromInternal2: InternalClass2()
-
-class ClassAA2 : ClassA2(10)
-
-class ClassBB2 : ClassB2() {
-    internal override val member = 10
-}
-
-fun f() {
-    val x1 = ClassAA1().member
-    val x2 = ClassAA2().member
-}
-
-