Fix FIR Java enhancement of java.util.Map & similar supertypes

This commit is contained in:
Mikhail Glukhikh
2019-05-20 14:57:25 +03:00
parent cef108a5ae
commit 0aaf8c7689
14 changed files with 38 additions and 13 deletions
@@ -0,0 +1,2 @@
public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<kotlin/String, kotlin/String>| {
}
@@ -0,0 +1,3 @@
public abstract class AbstractMap implements java.util.Map<String, String> {
}
@@ -115,6 +115,24 @@ public class OwnFirTypeEnhancementTestGenerated extends AbstractOwnFirTypeEnhanc
}
}
@TestMetadata("compiler/fir/resolve/testData/enhancement/mapping")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Mapping extends AbstractOwnFirTypeEnhancementTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
@TestMetadata("AbstractMap.java")
public void testAbstractMap() throws Exception {
runTest("compiler/fir/resolve/testData/enhancement/mapping/AbstractMap.java");
}
public void testAllFilesPresentInMapping() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/fir/resolve/testData/enhancement/mapping"), Pattern.compile("^(.+)\\.java$"), TargetBackend.ANY, true);
}
}
@TestMetadata("compiler/fir/resolve/testData/enhancement/signatureAnnotations")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)