From 9971ae4ffdbc8729e8d7594e409d03365c5ecbca Mon Sep 17 00:00:00 2001
From: "Aleksei.Cherepanov" <aleksei.cherepanov@jetbrains.com>
Date: Wed, 19 Jan 2022 16:06:11 +0300
Subject: [PATCH] Revert "Fix
 org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest#testSourcePackageLongPrefix"

This reverts commit e3634c16
---
 .../kotlin/jps/build/RelocatableJpsCachesTest.kt    | 13 ++++---------
 .../SourcePackageLongPrefix/kotlinProject.ipr       |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
index 76e024d7ffb..382f4b974b0 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
@@ -55,20 +55,15 @@ class RelocatableJpsCachesTest : BaseKotlinJpsBuildTestCase() {
         assertEqualDirectories(test1KotlinCachesDir, test2KotlinCachesDir, forgiveExtraFiles = false)
     }
 
-    private class RelocatableCacheTestCaseIml(
-        private val testName: String,
-        projectWorkingDir: File,
-        dirToCopyKotlinCaches: File
-    ) : RelocatableCacheTestCase(projectWorkingDir, dirToCopyKotlinCaches) {
-        override fun getName() = testName
-    }
-
     private fun runTestAndCopyKotlinCaches(
         projectWorkingDir: File,
         dirToCopyKotlinCaches: File,
         testMethod: KFunction1<RelocatableCacheTestCase, Unit>
     ) {
-        val testCase = RelocatableCacheTestCaseIml(testMethod.name, projectWorkingDir, dirToCopyKotlinCaches)
+        val testCase = object : RelocatableCacheTestCase(projectWorkingDir, dirToCopyKotlinCaches) {
+            override fun getName() = testMethod.name
+        }
+
         testCase.exposedPrivateApi.setUp()
 
         try {
diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr
index c1a403dd047..307b7f1015c 100644
--- a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr
+++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr
@@ -22,7 +22,7 @@
       <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">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="VcsDirectoryMappings">