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

[TEST] Migrate AbstractDiagnosticsWithUnsignedTypes to new test runners

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-09 12:40:17 +03:00
parent 23e704f361
commit b43fa94cb6
56 changed files with 598 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+122
View File
@@ -29280,6 +29280,128 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/unsignedTypes")
@TestDataPath("$PROJECT_ROOT")
public class UnsignedTypes extends AbstractDiagnosticTest {
@Test
public void testAllFilesPresentInUnsignedTypes() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/unsignedTypes"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("allowedVarargsOfUnsignedTypes.kt")
public void testAllowedVarargsOfUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/allowedVarargsOfUnsignedTypes.kt");
}
@Test
@TestMetadata("callDefaultConstructorOfUnsignedType.kt")
public void testCallDefaultConstructorOfUnsignedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/callDefaultConstructorOfUnsignedType.kt");
}
@Test
@TestMetadata("explicitUnsignedLongTypeCheck.kt")
public void testExplicitUnsignedLongTypeCheck() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/explicitUnsignedLongTypeCheck.kt");
}
@Test
@TestMetadata("forbiddenEqualsOnUnsignedTypes.kt")
public void testForbiddenEqualsOnUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/forbiddenEqualsOnUnsignedTypes.kt");
}
@Test
@TestMetadata("lateinitUnsignedType.kt")
public void testLateinitUnsignedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/lateinitUnsignedType.kt");
}
@Test
@TestMetadata("overloadResolutionOfBasicOperations.kt")
public void testOverloadResolutionOfBasicOperations() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/overloadResolutionOfBasicOperations.kt");
}
@Test
@TestMetadata("unsignedLiteralsInsideConstVals.kt")
public void testUnsignedLiteralsInsideConstVals() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsInsideConstVals.kt");
}
@Test
@TestMetadata("unsignedLiteralsOn1_2.kt")
public void testUnsignedLiteralsOn1_2() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsOn1_2.kt");
}
@Test
@TestMetadata("unsignedLiteralsOverflowSignedBorder.kt")
public void testUnsignedLiteralsOverflowSignedBorder() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsOverflowSignedBorder.kt");
}
@Test
@TestMetadata("unsignedLiteralsTypeCheck.kt")
public void testUnsignedLiteralsTypeCheck() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsTypeCheck.kt");
}
@Test
@TestMetadata("varargTypeToArrayTypeCheck.kt")
public void testVarargTypeToArrayTypeCheck() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/varargTypeToArrayTypeCheck.kt");
}
@Test
@TestMetadata("wrongLongSuffixForULong.kt")
public void testWrongLongSuffixForULong() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/wrongLongSuffixForULong.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/unsignedTypes/conversions")
@TestDataPath("$PROJECT_ROOT")
public class Conversions extends AbstractDiagnosticTest {
@Test
public void testAllFilesPresentInConversions() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/unsignedTypes/conversions"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("conversionOfSignedToUnsigned.kt")
public void testConversionOfSignedToUnsigned() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt");
}
@Test
@TestMetadata("inferenceForSignedAndUnsignedTypes.kt")
public void testInferenceForSignedAndUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.kt");
}
@Test
@TestMetadata("noConversionForUnsignedTypesOnReceiver.kt")
public void testNoConversionForUnsignedTypesOnReceiver() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/noConversionForUnsignedTypesOnReceiver.kt");
}
@Test
@TestMetadata("overloadResolutionForSignedAndUnsignedTypes.kt")
public void testOverloadResolutionForSignedAndUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/overloadResolutionForSignedAndUnsignedTypes.kt");
}
@Test
@TestMetadata("signedToUnsignedConversionWithExpectedType.kt")
public void testSignedToUnsignedConversionWithExpectedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.kt");
}
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/valueClasses")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+122
View File
@@ -29184,6 +29184,128 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/unsignedTypes")
@TestDataPath("$PROJECT_ROOT")
public class UnsignedTypes extends AbstractFirDiagnosticTest {
@Test
public void testAllFilesPresentInUnsignedTypes() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/unsignedTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("allowedVarargsOfUnsignedTypes.kt")
public void testAllowedVarargsOfUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/allowedVarargsOfUnsignedTypes.kt");
}
@Test
@TestMetadata("callDefaultConstructorOfUnsignedType.kt")
public void testCallDefaultConstructorOfUnsignedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/callDefaultConstructorOfUnsignedType.kt");
}
@Test
@TestMetadata("explicitUnsignedLongTypeCheck.kt")
public void testExplicitUnsignedLongTypeCheck() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/explicitUnsignedLongTypeCheck.kt");
}
@Test
@TestMetadata("forbiddenEqualsOnUnsignedTypes.kt")
public void testForbiddenEqualsOnUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/forbiddenEqualsOnUnsignedTypes.kt");
}
@Test
@TestMetadata("lateinitUnsignedType.kt")
public void testLateinitUnsignedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/lateinitUnsignedType.kt");
}
@Test
@TestMetadata("overloadResolutionOfBasicOperations.kt")
public void testOverloadResolutionOfBasicOperations() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/overloadResolutionOfBasicOperations.kt");
}
@Test
@TestMetadata("unsignedLiteralsInsideConstVals.kt")
public void testUnsignedLiteralsInsideConstVals() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsInsideConstVals.kt");
}
@Test
@TestMetadata("unsignedLiteralsOn1_2.kt")
public void testUnsignedLiteralsOn1_2() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsOn1_2.kt");
}
@Test
@TestMetadata("unsignedLiteralsOverflowSignedBorder.kt")
public void testUnsignedLiteralsOverflowSignedBorder() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsOverflowSignedBorder.kt");
}
@Test
@TestMetadata("unsignedLiteralsTypeCheck.kt")
public void testUnsignedLiteralsTypeCheck() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsTypeCheck.kt");
}
@Test
@TestMetadata("varargTypeToArrayTypeCheck.kt")
public void testVarargTypeToArrayTypeCheck() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/varargTypeToArrayTypeCheck.kt");
}
@Test
@TestMetadata("wrongLongSuffixForULong.kt")
public void testWrongLongSuffixForULong() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/wrongLongSuffixForULong.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/unsignedTypes/conversions")
@TestDataPath("$PROJECT_ROOT")
public class Conversions extends AbstractFirDiagnosticTest {
@Test
public void testAllFilesPresentInConversions() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/unsignedTypes/conversions"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("conversionOfSignedToUnsigned.kt")
public void testConversionOfSignedToUnsigned() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt");
}
@Test
@TestMetadata("inferenceForSignedAndUnsignedTypes.kt")
public void testInferenceForSignedAndUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.kt");
}
@Test
@TestMetadata("noConversionForUnsignedTypesOnReceiver.kt")
public void testNoConversionForUnsignedTypesOnReceiver() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/noConversionForUnsignedTypesOnReceiver.kt");
}
@Test
@TestMetadata("overloadResolutionForSignedAndUnsignedTypes.kt")
public void testOverloadResolutionForSignedAndUnsignedTypes() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/overloadResolutionForSignedAndUnsignedTypes.kt");
}
@Test
@TestMetadata("signedToUnsignedConversionWithExpectedType.kt")
public void testSignedToUnsignedConversionWithExpectedType() throws Exception {
runTest("compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.kt");
}
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/valueClasses")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt
+8 -1
View File
@@ -10,8 +10,8 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_STDLIB
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.EXPLICIT_API_MODE
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.USE_EXPERIMENTAL
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
import org.jetbrains.kotlin.test.frontend.classic.handlers.DeclarationsDumpHandler
@@ -70,5 +70,12 @@ abstract class AbstractDiagnosticTest : AbstractKotlinCompilerTest() {
EXPLICIT_API_MODE with ExplicitApiMode.STRICT
}
}
forTestsMatching("compiler/testData/diagnostics/tests/unsignedTypes/*") {
defaultDirectives {
USE_EXPERIMENTAL with "kotlin.ExperimentalUnsignedTypes"
+WITH_STDLIB
}
}
}
}
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt
+3 -1
View File
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
import org.jetbrains.kotlin.test.frontend.fir.handlers.*
@@ -60,7 +61,8 @@ abstract class AbstractFirDiagnosticTest : AbstractKotlinCompilerTest() {
forTestsMatching(
"compiler/testData/diagnostics/testsWithStdLib/*" or
"compiler/fir/analysis-tests/testData/resolveWithStdlib/*"
"compiler/fir/analysis-tests/testData/resolveWithStdlib/*" or
"compiler/testData/diagnostics/tests/unsignedTypes/*"
) {
defaultDirectives {
+JvmEnvironmentConfigurationDirectives.WITH_STDLIB