From 8a030b302abb91da9bc08984a9de01abc42b7bf4 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 27 Apr 2017 12:20:14 +0300 Subject: [PATCH] Remove old IC: remove experimental-expected-kotlin-caches.txt Original commit: e7afb073d9590bc43d32f247cc0416a1cfec2c04 --- .../AbstractIncrementalLazyCachesTest.kt | 2 +- ...talIncrementalLazyCachesTestGenerated.java | 86 ------------------- ...experimentalIncrementalCompilationTests.kt | 6 -- .../class/expected-kotlin-caches.txt | 8 ++ .../experimental-expected-kotlin-caches.txt | 15 ---- .../expected-kotlin-caches.txt | 10 +++ .../experimental-expected-kotlin-caches.txt | 17 ---- .../constant/expected-kotlin-caches.txt | 7 ++ .../experimental-expected-kotlin-caches.txt | 16 ---- .../function/expected-kotlin-caches.txt | 7 ++ .../experimental-expected-kotlin-caches.txt | 15 ---- .../expected-kotlin-caches.txt | 8 +- .../experimental-expected-kotlin-caches.txt | 16 ---- .../expected-kotlin-caches.txt | 7 ++ .../experimental-expected-kotlin-caches.txt | 16 ---- .../experimental-expected-kotlin-caches.txt | 3 - .../expected-kotlin-caches.txt | 7 ++ .../experimental-expected-kotlin-caches.txt | 15 ---- 18 files changed, 54 insertions(+), 207 deletions(-) delete mode 100644 jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 573e77ff7d9..58a50fa5e94 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.utils.Printer import java.io.File abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() { - protected open val expectedCachesFileName: String + private val expectedCachesFileName: String get() = "expected-kotlin-caches.txt" override fun doTest(testDataPath: String) { diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java deleted file mode 100644 index f1e983b88ff..00000000000 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.jps.build; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class ExperimentalIncrementalLazyCachesTestGenerated extends AbstractExperimentalIncrementalLazyCachesTest { - public void testAllFilesPresentInLazyKotlinCaches() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); - } - - @TestMetadata("class") - public void testClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/"); - doTest(fileName); - } - - @TestMetadata("classInheritance") - public void testClassInheritance() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/"); - doTest(fileName); - } - - @TestMetadata("constant") - public void testConstant() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); - doTest(fileName); - } - - @TestMetadata("function") - public void testFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/"); - doTest(fileName); - } - - @TestMetadata("inlineFunctionWithUsage") - public void testInlineFunctionWithUsage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); - doTest(fileName); - } - - @TestMetadata("inlineFunctionWithoutUsage") - public void testInlineFunctionWithoutUsage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/"); - doTest(fileName); - } - - @TestMetadata("noKotlin") - public void testNoKotlin() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/"); - doTest(fileName); - } - - @TestMetadata("topLevelPropertyAccess") - public void testTopLevelPropertyAccess() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); - doTest(fileName); - } -} diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 418162340fb..62a5c7ff4a8 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -22,12 +22,6 @@ import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() -abstract class AbstractExperimentalIncrementalLazyCachesTest : AbstractIncrementalLazyCachesTest() { - - override val expectedCachesFileName: String - get() = "experimental-expected-kotlin-caches.txt" -} - abstract class AbstractExperimentalChangeIncrementalOptionTest : AbstractIncrementalLazyCachesTest() abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() { diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index 9c2ef5d4b0a..a8e59355f1c 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -1,7 +1,15 @@ kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab Module 'module' production + experimental-format-version.txt format-version.txt jvm-build-meta-info.txt + class-fq-name-to-source.tab + internal-name-to-source.tab proto.tab source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt deleted file mode 100644 index a8e59355f1c..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,15 +0,0 @@ -kotlin-data-container - data-container-format-version.txt - counters.tab - file-to-id.tab - id-to-file.tab - lookups.tab -Module 'module' production - experimental-format-version.txt - format-version.txt - jvm-build-meta-info.txt - class-fq-name-to-source.tab - internal-name-to-source.tab - proto.tab - source-to-classes.tab -Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt index 9c2ef5d4b0a..15f2ab8c248 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt @@ -1,7 +1,17 @@ kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab Module 'module' production + experimental-format-version.txt format-version.txt jvm-build-meta-info.txt + class-fq-name-to-source.tab + internal-name-to-source.tab proto.tab source-to-classes.tab + subtypes.tab + supertypes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt deleted file mode 100644 index 15f2ab8c248..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,17 +0,0 @@ -kotlin-data-container - data-container-format-version.txt - counters.tab - file-to-id.tab - id-to-file.tab - lookups.tab -Module 'module' production - experimental-format-version.txt - format-version.txt - jvm-build-meta-info.txt - class-fq-name-to-source.tab - internal-name-to-source.tab - proto.tab - source-to-classes.tab - subtypes.tab - supertypes.tab -Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt index 4a57494858e..7011a7065d5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt @@ -1,8 +1,15 @@ kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab Module 'module' production + experimental-format-version.txt format-version.txt jvm-build-meta-info.txt constants.tab + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt deleted file mode 100644 index 7011a7065d5..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,16 +0,0 @@ -kotlin-data-container - data-container-format-version.txt - counters.tab - file-to-id.tab - id-to-file.tab - lookups.tab -Module 'module' production - experimental-format-version.txt - format-version.txt - jvm-build-meta-info.txt - constants.tab - internal-name-to-source.tab - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt index 61716259d9e..d44fd6c4253 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -1,7 +1,14 @@ kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab Module 'module' production + experimental-format-version.txt format-version.txt jvm-build-meta-info.txt + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt deleted file mode 100644 index d44fd6c4253..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,15 +0,0 @@ -kotlin-data-container - data-container-format-version.txt - counters.tab - file-to-id.tab - id-to-file.tab - lookups.tab -Module 'module' production - experimental-format-version.txt - format-version.txt - jvm-build-meta-info.txt - internal-name-to-source.tab - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt index 3fb62147860..cc6f16e3ad5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt @@ -1,9 +1,15 @@ kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab Module 'module' production + experimental-format-version.txt format-version.txt jvm-build-meta-info.txt inline-functions.tab - inlined-to.tab + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt deleted file mode 100644 index cc6f16e3ad5..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,16 +0,0 @@ -kotlin-data-container - data-container-format-version.txt - counters.tab - file-to-id.tab - id-to-file.tab - lookups.tab -Module 'module' production - experimental-format-version.txt - format-version.txt - jvm-build-meta-info.txt - inline-functions.tab - internal-name-to-source.tab - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt index 3d63d407e3b..cc6f16e3ad5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt @@ -1,8 +1,15 @@ kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab Module 'module' production + experimental-format-version.txt format-version.txt jvm-build-meta-info.txt inline-functions.tab + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt deleted file mode 100644 index cc6f16e3ad5..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,16 +0,0 @@ -kotlin-data-container - data-container-format-version.txt - counters.tab - file-to-id.tab - id-to-file.tab - lookups.tab -Module 'module' production - experimental-format-version.txt - format-version.txt - jvm-build-meta-info.txt - inline-functions.tab - internal-name-to-source.tab - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt deleted file mode 100644 index 6feaf1a52c0..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,3 +0,0 @@ -kotlin-data-container -Module 'module' production -Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt index 61716259d9e..d44fd6c4253 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt @@ -1,7 +1,14 @@ kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab Module 'module' production + experimental-format-version.txt format-version.txt jvm-build-meta-info.txt + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt deleted file mode 100644 index d44fd6c4253..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt +++ /dev/null @@ -1,15 +0,0 @@ -kotlin-data-container - data-container-format-version.txt - counters.tab - file-to-id.tab - id-to-file.tab - lookups.tab -Module 'module' production - experimental-format-version.txt - format-version.txt - jvm-build-meta-info.txt - internal-name-to-source.tab - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module' tests \ No newline at end of file