Remove old IC: remove experimental-expected-kotlin-caches.txt

2017-04-27 12:20:14 +03:00
parent 5af9d29cbe
commit e7afb073d9
19 changed files with 54 additions and 211 deletions
@@ -1210,10 +1210,6 @@ fun main(args: Array<String>) {
            model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true)
        }

-        testClass<AbstractExperimentalIncrementalLazyCachesTest> {
-            model("incremental/lazyKotlinCaches", extension = null, excludeParentDirs = true)
-        }
-
        testClass<AbstractExperimentalIncrementalCacheVersionChangedTest> {
            model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
        }
@@ -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) {
@@ -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);
-    }
-}
@@ -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() {
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +0,0 @@
-kotlin-data-container
-Module 'module' production
-Module 'module' tests
@@ -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
@@ -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