Skip to content

Commit 11b4e66

Browse files
valentinkipvalentinkip
committed
Better tests
1 parent c66b20b commit 11b4e66

File tree

10 files changed

+77
-108
lines changed

10 files changed

+77
-108
lines changed

‎j2k/testData/fileOrElement/inProjectionType/methodParams.java

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎j2k/testData/fileOrElement/inProjectionType/methodParams.kt

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎j2k/testData/fileOrElement/outProjectionType/methodParams.java

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎j2k/testData/fileOrElement/outProjectionType/methodParams.kt

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎j2k/testData/fileOrElement/projections/projections.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import java.util.ArrayList;
2+
import java.util.Collection;
3+
4+
class C<T> {
5+
void foo1(Collection<? extends T> src) {
6+
T t = src.iterator().next();
7+
}
8+
9+
void foo2(ArrayList<? extends T> src) {
10+
T t = src.iterator().next();
11+
}
12+
13+
void foo3(Collection<? super T> dst, T t) {
14+
dst.add(t)
15+
}
16+
17+
int foo4(Comparable<? super T> comparable, T t) {
18+
return comparable.compareTo(t);
19+
}
20+
21+
void foo5(Collection<?> w) {
22+
}
23+
}

‎j2k/testData/fileOrElement/projections/projections.kt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import java.util.ArrayList
2+
3+
class C<T> {
4+
fun foo1(src: Collection<T>) {
5+
val t = src.iterator().next()
6+
}
7+
8+
fun foo2(src: ArrayList<out T>) {
9+
val t = src.iterator().next()
10+
}
11+
12+
fun foo3(dst: MutableCollection<in T>, t: T) {
13+
dst.add(t)
14+
}
15+
16+
fun foo4(comparable: Comparable<T>, t: T): Int {
17+
return comparable.compareTo(t)
18+
}
19+
20+
fun foo5(w: Collection<*>) {
21+
}
22+
}

‎j2k/testData/fileOrElement/starProjectionType/methodParams.java

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎j2k/testData/fileOrElement/starProjectionType/methodParams.kt

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
JavaToKotlinConverterForWebDemoTestGenerated.Identifier.class,
6565
JavaToKotlinConverterForWebDemoTestGenerated.IfStatement.class,
6666
JavaToKotlinConverterForWebDemoTestGenerated.ImportStatement.class,
67-
JavaToKotlinConverterForWebDemoTestGenerated.InProjectionType.class,
6867
JavaToKotlinConverterForWebDemoTestGenerated.Inheritance.class,
6968
JavaToKotlinConverterForWebDemoTestGenerated.IsOperator.class,
7069
JavaToKotlinConverterForWebDemoTestGenerated.Issues.class,
@@ -79,16 +78,15 @@
7978
JavaToKotlinConverterForWebDemoTestGenerated.NewClassExpression.class,
8079
JavaToKotlinConverterForWebDemoTestGenerated.Nullability.class,
8180
JavaToKotlinConverterForWebDemoTestGenerated.ObjectLiteral.class,
82-
JavaToKotlinConverterForWebDemoTestGenerated.OutProjectionType.class,
8381
JavaToKotlinConverterForWebDemoTestGenerated.PackageStatement.class,
8482
JavaToKotlinConverterForWebDemoTestGenerated.ParenthesizedExpression.class,
8583
JavaToKotlinConverterForWebDemoTestGenerated.PolyadicExpression.class,
8684
JavaToKotlinConverterForWebDemoTestGenerated.PostfixOperator.class,
8785
JavaToKotlinConverterForWebDemoTestGenerated.PrefixOperator.class,
86+
JavaToKotlinConverterForWebDemoTestGenerated.Projections.class,
8887
JavaToKotlinConverterForWebDemoTestGenerated.RawGenerics.class,
8988
JavaToKotlinConverterForWebDemoTestGenerated.ReturnStatement.class,
9089
JavaToKotlinConverterForWebDemoTestGenerated.Settings.class,
91-
JavaToKotlinConverterForWebDemoTestGenerated.StarProjectionType.class,
9290
JavaToKotlinConverterForWebDemoTestGenerated.StaticMembers.class,
9391
JavaToKotlinConverterForWebDemoTestGenerated.SuperExpression.class,
9492
JavaToKotlinConverterForWebDemoTestGenerated.Switch.class,
@@ -2459,21 +2457,6 @@ public void testSimpleImport() throws Exception {
24592457
}
24602458
}
24612459

2462-
@TestMetadata("j2k/testData/fileOrElement/inProjectionType")
2463-
@TestDataPath("$PROJECT_ROOT")
2464-
@RunWith(JUnit3RunnerWithInners.class)
2465-
public static class InProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest {
2466-
public void testAllFilesPresentInInProjectionType() throws Exception {
2467-
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
2468-
}
2469-
2470-
@TestMetadata("methodParams.java")
2471-
public void testMethodParams() throws Exception {
2472-
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inProjectionType/methodParams.java");
2473-
doTest(fileName);
2474-
}
2475-
}
2476-
24772460
@TestMetadata("j2k/testData/fileOrElement/inheritance")
24782461
@TestDataPath("$PROJECT_ROOT")
24792462
@RunWith(JUnit3RunnerWithInners.class)
@@ -3464,21 +3447,6 @@ public void testMyFrame() throws Exception {
34643447
}
34653448
}
34663449

3467-
@TestMetadata("j2k/testData/fileOrElement/outProjectionType")
3468-
@TestDataPath("$PROJECT_ROOT")
3469-
@RunWith(JUnit3RunnerWithInners.class)
3470-
public static class OutProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest {
3471-
public void testAllFilesPresentInOutProjectionType() throws Exception {
3472-
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
3473-
}
3474-
3475-
@TestMetadata("methodParams.java")
3476-
public void testMethodParams() throws Exception {
3477-
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/outProjectionType/methodParams.java");
3478-
doTest(fileName);
3479-
}
3480-
}
3481-
34823450
@TestMetadata("j2k/testData/fileOrElement/packageStatement")
34833451
@TestDataPath("$PROJECT_ROOT")
34843452
@RunWith(JUnit3RunnerWithInners.class)
@@ -3626,6 +3594,21 @@ public void testTilde() throws Exception {
36263594
}
36273595
}
36283596

3597+
@TestMetadata("j2k/testData/fileOrElement/projections")
3598+
@TestDataPath("$PROJECT_ROOT")
3599+
@RunWith(JUnit3RunnerWithInners.class)
3600+
public static class Projections extends AbstractJavaToKotlinConverterForWebDemoTest {
3601+
public void testAllFilesPresentInProjections() throws Exception {
3602+
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true);
3603+
}
3604+
3605+
@TestMetadata("projections.java")
3606+
public void testProjections() throws Exception {
3607+
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java");
3608+
doTest(fileName);
3609+
}
3610+
}
3611+
36293612
@TestMetadata("j2k/testData/fileOrElement/rawGenerics")
36303613
@TestDataPath("$PROJECT_ROOT")
36313614
@RunWith(JUnit3RunnerWithInners.class)
@@ -3731,21 +3714,6 @@ public void testSpecifyLocalVariableTypeByDefaultInFor() throws Exception {
37313714
}
37323715
}
37333716

3734-
@TestMetadata("j2k/testData/fileOrElement/starProjectionType")
3735-
@TestDataPath("$PROJECT_ROOT")
3736-
@RunWith(JUnit3RunnerWithInners.class)
3737-
public static class StarProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest {
3738-
public void testAllFilesPresentInStarProjectionType() throws Exception {
3739-
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
3740-
}
3741-
3742-
@TestMetadata("methodParams.java")
3743-
public void testMethodParams() throws Exception {
3744-
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/starProjectionType/methodParams.java");
3745-
doTest(fileName);
3746-
}
3747-
}
3748-
37493717
@TestMetadata("j2k/testData/fileOrElement/staticMembers")
37503718
@TestDataPath("$PROJECT_ROOT")
37513719
@RunWith(JUnit3RunnerWithInners.class)

‎j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
JavaToKotlinConverterSingleFileTestGenerated.Identifier.class,
6565
JavaToKotlinConverterSingleFileTestGenerated.IfStatement.class,
6666
JavaToKotlinConverterSingleFileTestGenerated.ImportStatement.class,
67-
JavaToKotlinConverterSingleFileTestGenerated.InProjectionType.class,
6867
JavaToKotlinConverterSingleFileTestGenerated.Inheritance.class,
6968
JavaToKotlinConverterSingleFileTestGenerated.IsOperator.class,
7069
JavaToKotlinConverterSingleFileTestGenerated.Issues.class,
@@ -79,16 +78,15 @@
7978
JavaToKotlinConverterSingleFileTestGenerated.NewClassExpression.class,
8079
JavaToKotlinConverterSingleFileTestGenerated.Nullability.class,
8180
JavaToKotlinConverterSingleFileTestGenerated.ObjectLiteral.class,
82-
JavaToKotlinConverterSingleFileTestGenerated.OutProjectionType.class,
8381
JavaToKotlinConverterSingleFileTestGenerated.PackageStatement.class,
8482
JavaToKotlinConverterSingleFileTestGenerated.ParenthesizedExpression.class,
8583
JavaToKotlinConverterSingleFileTestGenerated.PolyadicExpression.class,
8684
JavaToKotlinConverterSingleFileTestGenerated.PostfixOperator.class,
8785
JavaToKotlinConverterSingleFileTestGenerated.PrefixOperator.class,
86+
JavaToKotlinConverterSingleFileTestGenerated.Projections.class,
8887
JavaToKotlinConverterSingleFileTestGenerated.RawGenerics.class,
8988
JavaToKotlinConverterSingleFileTestGenerated.ReturnStatement.class,
9089
JavaToKotlinConverterSingleFileTestGenerated.Settings.class,
91-
JavaToKotlinConverterSingleFileTestGenerated.StarProjectionType.class,
9290
JavaToKotlinConverterSingleFileTestGenerated.StaticMembers.class,
9391
JavaToKotlinConverterSingleFileTestGenerated.SuperExpression.class,
9492
JavaToKotlinConverterSingleFileTestGenerated.Switch.class,
@@ -2459,21 +2457,6 @@ public void testSimpleImport() throws Exception {
24592457
}
24602458
}
24612459

2462-
@TestMetadata("j2k/testData/fileOrElement/inProjectionType")
2463-
@TestDataPath("$PROJECT_ROOT")
2464-
@RunWith(JUnit3RunnerWithInners.class)
2465-
public static class InProjectionType extends AbstractJavaToKotlinConverterSingleFileTest {
2466-
public void testAllFilesPresentInInProjectionType() throws Exception {
2467-
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
2468-
}
2469-
2470-
@TestMetadata("methodParams.java")
2471-
public void testMethodParams() throws Exception {
2472-
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inProjectionType/methodParams.java");
2473-
doTest(fileName);
2474-
}
2475-
}
2476-
24772460
@TestMetadata("j2k/testData/fileOrElement/inheritance")
24782461
@TestDataPath("$PROJECT_ROOT")
24792462
@RunWith(JUnit3RunnerWithInners.class)
@@ -3464,21 +3447,6 @@ public void testMyFrame() throws Exception {
34643447
}
34653448
}
34663449

3467-
@TestMetadata("j2k/testData/fileOrElement/outProjectionType")
3468-
@TestDataPath("$PROJECT_ROOT")
3469-
@RunWith(JUnit3RunnerWithInners.class)
3470-
public static class OutProjectionType extends AbstractJavaToKotlinConverterSingleFileTest {
3471-
public void testAllFilesPresentInOutProjectionType() throws Exception {
3472-
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
3473-
}
3474-
3475-
@TestMetadata("methodParams.java")
3476-
public void testMethodParams() throws Exception {
3477-
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/outProjectionType/methodParams.java");
3478-
doTest(fileName);
3479-
}
3480-
}
3481-
34823450
@TestMetadata("j2k/testData/fileOrElement/packageStatement")
34833451
@TestDataPath("$PROJECT_ROOT")
34843452
@RunWith(JUnit3RunnerWithInners.class)
@@ -3626,6 +3594,21 @@ public void testTilde() throws Exception {
36263594
}
36273595
}
36283596

3597+
@TestMetadata("j2k/testData/fileOrElement/projections")
3598+
@TestDataPath("$PROJECT_ROOT")
3599+
@RunWith(JUnit3RunnerWithInners.class)
3600+
public static class Projections extends AbstractJavaToKotlinConverterSingleFileTest {
3601+
public void testAllFilesPresentInProjections() throws Exception {
3602+
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true);
3603+
}
3604+
3605+
@TestMetadata("projections.java")
3606+
public void testProjections() throws Exception {
3607+
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java");
3608+
doTest(fileName);
3609+
}
3610+
}
3611+
36293612
@TestMetadata("j2k/testData/fileOrElement/rawGenerics")
36303613
@TestDataPath("$PROJECT_ROOT")
36313614
@RunWith(JUnit3RunnerWithInners.class)
@@ -3731,21 +3714,6 @@ public void testSpecifyLocalVariableTypeByDefaultInFor() throws Exception {
37313714
}
37323715
}
37333716

3734-
@TestMetadata("j2k/testData/fileOrElement/starProjectionType")
3735-
@TestDataPath("$PROJECT_ROOT")
3736-
@RunWith(JUnit3RunnerWithInners.class)
3737-
public static class StarProjectionType extends AbstractJavaToKotlinConverterSingleFileTest {
3738-
public void testAllFilesPresentInStarProjectionType() throws Exception {
3739-
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
3740-
}
3741-
3742-
@TestMetadata("methodParams.java")
3743-
public void testMethodParams() throws Exception {
3744-
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/starProjectionType/methodParams.java");
3745-
doTest(fileName);
3746-
}
3747-
}
3748-
37493717
@TestMetadata("j2k/testData/fileOrElement/staticMembers")
37503718
@TestDataPath("$PROJECT_ROOT")
37513719
@RunWith(JUnit3RunnerWithInners.class)

0 commit comments

Comments
 (0)