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

Regenerate tests after removing separate test configurations for JDK 21

Browse Source 
^KT-58765

Now that JDK 21 was released as stable, we can remove separate test
configurations for testing the compiler with JDK 21 and reintegrate
the corresponding test data into standard test configurations.
This commit is contained in:
Stanislav Ruban
2024-01-08 18:27:12 +02:00
committed by Space Team
parent a5bae12915
commit 4ef830f9ee
8 changed files with 170 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+34
View File
@@ -38097,6 +38097,40 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava21 {
@Test
public void testAllFilesPresentInTestsWithJava21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
@TestDataPath("$PROJECT_ROOT")
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+34
View File
@@ -38097,6 +38097,40 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava21 {
@Test
public void testAllFilesPresentInTestsWithJava21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
@TestDataPath("$PROJECT_ROOT")
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java
Generated
-50
View File
@@ -1,50 +0,0 @@
/*
* Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.test.runners;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/diagnostics/testsWithJdk21")
@TestDataPath("$PROJECT_ROOT")
public class FirLightTreeJdk21DiagnosticTestGenerated extends AbstractFirLightTreeJdk21DiagnosticTest {
@Test
public void testAllFilesPresentInTestsWithJdk21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJdk21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt");
}
}
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+34
View File
@@ -35817,6 +35817,40 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava21 {
@Test
public void testAllFilesPresentInTestsWithJava21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
@TestDataPath("$PROJECT_ROOT")
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java
Generated
-50
View File
@@ -1,50 +0,0 @@
/*
* Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.test.runners;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/diagnostics/testsWithJdk21")
@TestDataPath("$PROJECT_ROOT")
public class FirPsiJdk21DiagnosticTestGenerated extends AbstractFirPsiJdk21DiagnosticTest {
@Test
public void testAllFilesPresentInTestsWithJdk21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJdk21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt");
}
}
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+34
View File
@@ -35937,6 +35937,40 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava21 {
@Test
public void testAllFilesPresentInTestsWithJava21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+34
View File
@@ -38097,6 +38097,40 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/testsWithJava21")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava21 {
@Test
public void testAllFilesPresentInTestsWithJava21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava21"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/tests/testsWithJava21/noFalsePositiveAbstractToArray.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java
Generated
-50
View File
@@ -1,50 +0,0 @@
/*
* Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.test.runners;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/diagnostics/testsWithJdk21")
@TestDataPath("$PROJECT_ROOT")
public class Jdk21DiagnosticTestGenerated extends AbstractJdk21DiagnosticTest {
@Test
public void testAllFilesPresentInTestsWithJdk21() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJdk21"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("implementationsForSequencedCollection.kt")
public void testImplementationsForSequencedCollection() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/implementationsForSequencedCollection.kt");
}
@Test
@TestMetadata("newListMethods.kt")
public void testNewListMethods() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
}
@Test
@TestMetadata("newListMethodsImmutable.kt")
public void testNewListMethodsImmutable() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
}
@Test
@TestMetadata("noFalsePositiveAbstractToArray.kt")
public void testNoFalsePositiveAbstractToArray() throws Exception {
runTest("compiler/testData/diagnostics/testsWithJdk21/noFalsePositiveAbstractToArray.kt");
}
}