azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest#testSourcePackageLongPrefix"

Browse Source 
This reverts commit e3634c16
This commit is contained in:
Aleksei.Cherepanov
2022-01-19 16:06:11 +03:00
committed by Space
parent 44d796e850
commit 9971ae4ffd
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
+4 -9
View File
@@ -55,20 +55,15 @@ class RelocatableJpsCachesTest : BaseKotlinJpsBuildTestCase() {
assertEqualDirectories(test1KotlinCachesDir, test2KotlinCachesDir, forgiveExtraFiles = false) 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( private fun runTestAndCopyKotlinCaches(
projectWorkingDir: File, projectWorkingDir: File,
dirToCopyKotlinCaches: File, dirToCopyKotlinCaches: File,
testMethod: KFunction1<RelocatableCacheTestCase, Unit> 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() testCase.exposedPrivateApi.setUp()
try { try {
jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@
<module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" /> <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
</modules> </modules>
</component> </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" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">