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

Better tests

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-03-30 13:59:07 +03:00
parent c66b20b204
commit 11b4e66fd0
10 changed files with 77 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/testData/fileOrElement/inProjectionType/methodParams.java
-2
View File
@@ -1,2 +0,0 @@
//method
void popAll(Collection<? super E> dst) {}
j2k/testData/fileOrElement/inProjectionType/methodParams.kt
-2
View File
@@ -1,2 +0,0 @@
fun popAll(dst: Collection<in E>) {
}
j2k/testData/fileOrElement/outProjectionType/methodParams.java
-2
View File
@@ -1,2 +0,0 @@
//method
void pushAll(Collection<? extends E> src) {}
j2k/testData/fileOrElement/outProjectionType/methodParams.kt
-2
View File
@@ -1,2 +0,0 @@
fun pushAll(src: Collection<E>) {
}
j2k/testData/fileOrElement/projections/projections.java
+23
View File
@@ -0,0 +1,23 @@
import java.util.ArrayList;
import java.util.Collection;
class C<T> {
void foo1(Collection<? extends T> src) {
T t = src.iterator().next();
}
void foo2(ArrayList<? extends T> src) {
T t = src.iterator().next();
}
void foo3(Collection<? super T> dst, T t) {
dst.add(t)
}
int foo4(Comparable<? super T> comparable, T t) {
return comparable.compareTo(t);
}
void foo5(Collection<?> w) {
}
}
j2k/testData/fileOrElement/projections/projections.kt
+22
View File
@@ -0,0 +1,22 @@
import java.util.ArrayList
class C<T> {
fun foo1(src: Collection<T>) {
val t = src.iterator().next()
}
fun foo2(src: ArrayList<out T>) {
val t = src.iterator().next()
}
fun foo3(dst: MutableCollection<in T>, t: T) {
dst.add(t)
}
fun foo4(comparable: Comparable<T>, t: T): Int {
return comparable.compareTo(t)
}
fun foo5(w: Collection<*>) {
}
}
j2k/testData/fileOrElement/starProjectionType/methodParams.java
-2
View File
@@ -1,2 +0,0 @@
//method
void wtf(Collection<?> w) {}
j2k/testData/fileOrElement/starProjectionType/methodParams.kt
-2
View File
@@ -1,2 +0,0 @@
fun wtf(w: Collection<*>) {
}
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
+16 -48
View File
@@ -64,7 +64,6 @@ import java.util.regex.Pattern;
JavaToKotlinConverterForWebDemoTestGenerated.Identifier.class,
JavaToKotlinConverterForWebDemoTestGenerated.IfStatement.class,
JavaToKotlinConverterForWebDemoTestGenerated.ImportStatement.class,
JavaToKotlinConverterForWebDemoTestGenerated.InProjectionType.class,
JavaToKotlinConverterForWebDemoTestGenerated.Inheritance.class,
JavaToKotlinConverterForWebDemoTestGenerated.IsOperator.class,
JavaToKotlinConverterForWebDemoTestGenerated.Issues.class,
@@ -79,16 +78,15 @@ import java.util.regex.Pattern;
JavaToKotlinConverterForWebDemoTestGenerated.NewClassExpression.class,
JavaToKotlinConverterForWebDemoTestGenerated.Nullability.class,
JavaToKotlinConverterForWebDemoTestGenerated.ObjectLiteral.class,
JavaToKotlinConverterForWebDemoTestGenerated.OutProjectionType.class,
JavaToKotlinConverterForWebDemoTestGenerated.PackageStatement.class,
JavaToKotlinConverterForWebDemoTestGenerated.ParenthesizedExpression.class,
JavaToKotlinConverterForWebDemoTestGenerated.PolyadicExpression.class,
JavaToKotlinConverterForWebDemoTestGenerated.PostfixOperator.class,
JavaToKotlinConverterForWebDemoTestGenerated.PrefixOperator.class,
JavaToKotlinConverterForWebDemoTestGenerated.Projections.class,
JavaToKotlinConverterForWebDemoTestGenerated.RawGenerics.class,
JavaToKotlinConverterForWebDemoTestGenerated.ReturnStatement.class,
JavaToKotlinConverterForWebDemoTestGenerated.Settings.class,
JavaToKotlinConverterForWebDemoTestGenerated.StarProjectionType.class,
JavaToKotlinConverterForWebDemoTestGenerated.StaticMembers.class,
JavaToKotlinConverterForWebDemoTestGenerated.SuperExpression.class,
JavaToKotlinConverterForWebDemoTestGenerated.Switch.class,
@@ -2459,21 +2457,6 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/inProjectionType")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class InProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest {
public void testAllFilesPresentInInProjectionType() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("methodParams.java")
public void testMethodParams() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inProjectionType/methodParams.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/inheritance")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -3464,21 +3447,6 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/outProjectionType")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class OutProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest {
public void testAllFilesPresentInOutProjectionType() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("methodParams.java")
public void testMethodParams() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/outProjectionType/methodParams.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/packageStatement")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -3626,6 +3594,21 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/projections")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Projections extends AbstractJavaToKotlinConverterForWebDemoTest {
public void testAllFilesPresentInProjections() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("projections.java")
public void testProjections() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/rawGenerics")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -3731,21 +3714,6 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/starProjectionType")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class StarProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest {
public void testAllFilesPresentInStarProjectionType() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("methodParams.java")
public void testMethodParams() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/starProjectionType/methodParams.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/staticMembers")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
+16 -48
View File
@@ -64,7 +64,6 @@ import java.util.regex.Pattern;
JavaToKotlinConverterSingleFileTestGenerated.Identifier.class,
JavaToKotlinConverterSingleFileTestGenerated.IfStatement.class,
JavaToKotlinConverterSingleFileTestGenerated.ImportStatement.class,
JavaToKotlinConverterSingleFileTestGenerated.InProjectionType.class,
JavaToKotlinConverterSingleFileTestGenerated.Inheritance.class,
JavaToKotlinConverterSingleFileTestGenerated.IsOperator.class,
JavaToKotlinConverterSingleFileTestGenerated.Issues.class,
@@ -79,16 +78,15 @@ import java.util.regex.Pattern;
JavaToKotlinConverterSingleFileTestGenerated.NewClassExpression.class,
JavaToKotlinConverterSingleFileTestGenerated.Nullability.class,
JavaToKotlinConverterSingleFileTestGenerated.ObjectLiteral.class,
JavaToKotlinConverterSingleFileTestGenerated.OutProjectionType.class,
JavaToKotlinConverterSingleFileTestGenerated.PackageStatement.class,
JavaToKotlinConverterSingleFileTestGenerated.ParenthesizedExpression.class,
JavaToKotlinConverterSingleFileTestGenerated.PolyadicExpression.class,
JavaToKotlinConverterSingleFileTestGenerated.PostfixOperator.class,
JavaToKotlinConverterSingleFileTestGenerated.PrefixOperator.class,
JavaToKotlinConverterSingleFileTestGenerated.Projections.class,
JavaToKotlinConverterSingleFileTestGenerated.RawGenerics.class,
JavaToKotlinConverterSingleFileTestGenerated.ReturnStatement.class,
JavaToKotlinConverterSingleFileTestGenerated.Settings.class,
JavaToKotlinConverterSingleFileTestGenerated.StarProjectionType.class,
JavaToKotlinConverterSingleFileTestGenerated.StaticMembers.class,
JavaToKotlinConverterSingleFileTestGenerated.SuperExpression.class,
JavaToKotlinConverterSingleFileTestGenerated.Switch.class,
@@ -2459,21 +2457,6 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/inProjectionType")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class InProjectionType extends AbstractJavaToKotlinConverterSingleFileTest {
public void testAllFilesPresentInInProjectionType() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("methodParams.java")
public void testMethodParams() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inProjectionType/methodParams.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/inheritance")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -3464,21 +3447,6 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/outProjectionType")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class OutProjectionType extends AbstractJavaToKotlinConverterSingleFileTest {
public void testAllFilesPresentInOutProjectionType() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("methodParams.java")
public void testMethodParams() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/outProjectionType/methodParams.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/packageStatement")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -3626,6 +3594,21 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/projections")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Projections extends AbstractJavaToKotlinConverterSingleFileTest {
public void testAllFilesPresentInProjections() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("projections.java")
public void testProjections() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/rawGenerics")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -3731,21 +3714,6 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
}
}
@TestMetadata("j2k/testData/fileOrElement/starProjectionType")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class StarProjectionType extends AbstractJavaToKotlinConverterSingleFileTest {
public void testAllFilesPresentInStarProjectionType() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("methodParams.java")
public void testMethodParams() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/starProjectionType/methodParams.java");
doTest(fileName);
}
}
@TestMetadata("j2k/testData/fileOrElement/staticMembers")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)