jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-17 00:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safe Delete: Add test for primary constructor with usages in delegation calls

Browse Source
This commit is contained in:
Alexey Sedunov
2015-03-18 17:59:51 +03:00
parent 83e23aafe5
commit cefd8b43a0
6 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
View File

@@ -481,6 +481,7 @@ fun main(args: Array<String>) {
testClass(javaClass<AbstractJetSafeDeleteTest>()) {
model("safeDelete/deleteClass/kotlinClass", testMethod = "doClassTest")
model("safeDelete/deleteClass/kotlinClassWithJava", testMethod = "doClassTestWithJava")
model("safeDelete/deleteObject/kotlinObject", testMethod = "doObjectTest")
model("safeDelete/deleteFunction/kotlinFunction", testMethod = "doFunctionTest")
model("safeDelete/deleteFunction/kotlinFunctionWithJava", testMethod = "doFunctionTestWithJava")

5
idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.java Normal file
View File

@@ -0,0 +1,5 @@
class J extends B {
public J() {
super();
}
}

11
idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt Normal file
View File

@@ -0,0 +1,11 @@
open class <caret>B() {
constructor(a: Int): this() {
}
}
open class A: B {
constructor(a: Int): super() {
}
}

1
idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt.messages Normal file
View File

@@ -0,0 +1 @@
class B has 4 usages that are not safe to delete.

4
idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java
View File

@@ -54,6 +54,10 @@ public abstract class AbstractJetSafeDeleteTest extends JetLightCodeInsightFixtu
doTest(path, JetClass.class, false);
}
public void doClassTestWithJava(@NotNull String path) throws Exception {
doTest(path, JetClass.class, true);
}
public void doObjectTest(@NotNull String path) throws Exception {
doTest(path, JetObjectDeclaration.class, false);
}

16
idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java
View File

@@ -30,6 +30,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@InnerTestClasses({
JetSafeDeleteTestGenerated.KotlinClass.class,
JetSafeDeleteTestGenerated.KotlinClassWithJava.class,
JetSafeDeleteTestGenerated.KotlinObject.class,
JetSafeDeleteTestGenerated.KotlinFunction.class,
JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class,
@@ -119,6 +120,21 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
}
}
@TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClassWithJava")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class KotlinClassWithJava extends AbstractJetSafeDeleteTest {
public void testAllFilesPresentInKotlinClassWithJava() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClassWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("classWithDelegationCalls.kt")
public void testClassWithDelegationCalls() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt");
doClassTestWithJava(fileName);
}
}
@TestMetadata("idea/testData/safeDelete/deleteObject/kotlinObject")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)