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

[FE 1.0] Report warning about conflict in inherited members from deserialized dependencies

Browse Source 
^KT-51194
^KT-51223 Fixed
This commit is contained in:
Dmitriy Novozhilov
2022-02-09 14:33:59 +03:00
committed by teamcity
parent c6994768d7
commit 0eb526a8b4
16 changed files with 273 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+28
View File
@@ -15220,6 +15220,34 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/differentDependencyVersion")
@TestDataPath("$PROJECT_ROOT")
public class DifferentDependencyVersion {
@Test
public void testAllFilesPresentInDifferentDependencyVersion() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/differentDependencyVersion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@Test
@TestMetadata("kt51194_java.kt")
public void testKt51194_java() throws Exception {
runTest("compiler/testData/codegen/box/differentDependencyVersion/kt51194_java.kt");
}
@Test
@TestMetadata("kt51194_javaAndKotlin.kt")
public void testKt51194_javaAndKotlin() throws Exception {
runTest("compiler/testData/codegen/box/differentDependencyVersion/kt51194_javaAndKotlin.kt");
}
@Test
@TestMetadata("kt51194_kotlin.kt")
public void testKt51194_kotlin() throws Exception {
runTest("compiler/testData/codegen/box/differentDependencyVersion/kt51194_kotlin.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/directInvokeOptimization")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+28
View File
@@ -15340,6 +15340,34 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/differentDependencyVersion")
@TestDataPath("$PROJECT_ROOT")
public class DifferentDependencyVersion {
@Test
public void testAllFilesPresentInDifferentDependencyVersion() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/differentDependencyVersion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("kt51194_java.kt")
public void testKt51194_java() throws Exception {
runTest("compiler/testData/codegen/box/differentDependencyVersion/kt51194_java.kt");
}
@Test
@TestMetadata("kt51194_javaAndKotlin.kt")
public void testKt51194_javaAndKotlin() throws Exception {
runTest("compiler/testData/codegen/box/differentDependencyVersion/kt51194_javaAndKotlin.kt");
}
@Test
@TestMetadata("kt51194_kotlin.kt")
public void testKt51194_kotlin() throws Exception {
runTest("compiler/testData/codegen/box/differentDependencyVersion/kt51194_kotlin.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/directInvokeOptimization")
@TestDataPath("$PROJECT_ROOT")