From af3f7dfafcdf844f4b60ede1af2fac9067f57f23 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 6 Oct 2015 22:49:49 +0300 Subject: [PATCH] Make test generated --- .../kotlin/generators/tests/GenerateTests.kt | 5 ++ ...ractIncrementalCacheVersionChangedTest.kt} | 18 +----- ...entalCacheVersionChangedTestGenerated.java | 62 +++++++++++++++++++ .../module1Modified}/build.log | 0 .../module1Modified}/dependencies.txt | 0 .../module1Modified}/module1_a.kt | 0 .../module1Modified}/module1_a.kt.new | 0 .../module1Modified}/module2_b.kt | 0 .../module1Modified}/module3_c.kt | 0 .../module1Modified}/module4_d.kt | 0 .../module1Modified}/module5_E.java | 0 .../module2Modified}/build.log | 0 .../module2Modified}/dependencies.txt | 0 .../module2Modified}/module1_a.kt | 0 .../module2Modified}/module2_b.kt | 0 .../module2Modified}/module2_b.kt.new | 0 .../touchedFile}/a.kt | 0 .../touchedFile}/b.kt | 0 .../touchedFile}/b.kt.new | 0 .../touchedFile}/build.log | 0 .../touchedFile}/other.kt | 0 .../untouchedFiles}/a.kt | 0 .../untouchedFiles}/b.kt | 0 .../untouchedFiles}/build.log | 0 24 files changed, 68 insertions(+), 17 deletions(-) rename jps-plugin/test/org/jetbrains/kotlin/jps/build/{IncrementalCacheVersionChangedTest.kt => AbstractIncrementalCacheVersionChangedTest.kt} (64%) create mode 100644 jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/build.log (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module1_a.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module1_a.kt.new (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module2_b.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module3_c.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module4_d.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module5_E.java (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/build.log (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/module1_a.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/module2_b.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/module2_b.kt.new (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/a.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/b.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/b.kt.new (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/build.log (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/other.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChanged => cacheVersionChanged/untouchedFiles}/a.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChanged => cacheVersionChanged/untouchedFiles}/b.kt (100%) rename jps-plugin/testData/incremental/{custom/cacheVersionChanged => cacheVersionChanged/untouchedFiles}/build.log (100%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 50d37f3bc15..ee1492014a0 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -99,6 +99,7 @@ import org.jetbrains.kotlin.integration.AbstractAntTaskTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterForWebDemoTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest +import org.jetbrains.kotlin.jps.build.AbstractIncrementalCacheVersionChangedTest import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest import org.jetbrains.kotlin.jps.build.AbstractIncrementalLazyCachesTest import org.jetbrains.kotlin.jps.build.AbstractLookupTrackerTest @@ -850,6 +851,10 @@ fun main(args: Array) { testClass(AbstractIncrementalLazyCachesTest::class.java) { model("incremental/lazyKotlinCaches", extension = null, excludeParentDirs = true) } + + testClass(AbstractIncrementalCacheVersionChangedTest::class.java) { + model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true) + } } testGroup("jps-plugin/test", "jps-plugin/testData") { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt similarity index 64% rename from jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt rename to jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index 560e85bedf7..715775892dd 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -18,23 +18,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion -public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { - fun testCacheVersionChanged() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChanged/") - } - - fun testCacheVersionChangedAndFileModified() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/") - } - - fun testCacheVersionChangedMultiModule1() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/") - } - - fun testCacheVersionChangedMultiModule2() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/") - } - +abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { override fun performAdditionalModifications(modifications: List) { val targets = projectDescriptor.allModuleTargets val paths = projectDescriptor.dataManager.dataPaths diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java new file mode 100644 index 00000000000..84a96d9ec60 --- /dev/null +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2015 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.JetTestUtils; +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/cacheVersionChanged") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncrementalCacheVersionChangedTest { + public void testAllFilesPresentInCacheVersionChanged() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("module1Modified") + public void testModule1Modified() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); + doTest(fileName); + } + + @TestMetadata("module2Modified") + public void testModule2Modified() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); + doTest(fileName); + } + + @TestMetadata("touchedFile") + public void testTouchedFile() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); + doTest(fileName); + } + + @TestMetadata("untouchedFiles") + public void testUntouchedFiles() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); + doTest(fileName); + } + +} diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java rename to jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/build.log rename to jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/dependencies.txt b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/dependencies.txt rename to jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new rename to jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt b/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt b/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new b/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new rename to jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log rename to jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt b/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt b/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt b/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt rename to jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log similarity index 100% rename from jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log rename to jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log