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

Support [throws] annotation

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-22 15:37:27 +04:00
parent b66a76e7d2
commit 4ab0b00bd3
17 changed files with 284 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java
+1 -1
View File
@@ -35,7 +35,7 @@ public abstract class AbstractCompileJavaAgainstKotlinTest extends TestCaseWithT
Assert.assertTrue(ktFilePath.endsWith(".kt"));
File ktFile = new File(ktFilePath);
File javaFile = new File(ktFilePath.replaceFirst("\\.kt", ".java"));
compileKotlinToDirAndGetAnalyzeExhaust(Collections.singletonList(ktFile), tmpdir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY);
compileKotlinToDirAndGetAnalyzeExhaust(Collections.singletonList(ktFile), tmpdir, getTestRootDisposable(), ConfigurationKind.ALL);
List<String> options = Arrays.asList(
"-classpath", tmpdir.getPath() + System.getProperty("path.separator") + ForTestCompileRuntime.runtimeJarForTests(),
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
+40 -1
View File
@@ -91,7 +91,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
}
@TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
@InnerTestClasses({Method.PrimitiveOverride.class})
@InnerTestClasses({Method.PrimitiveOverride.class, Method.Throws.class})
public static class Method extends AbstractCompileJavaAgainstKotlinTest {
public void testAllFilesPresentInMethod() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -260,10 +260,49 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
}
@TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws")
public static class Throws extends AbstractCompileJavaAgainstKotlinTest {
public void testAllFilesPresentInThrows() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("ClassMembers.kt")
public void testClassMembers() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
}
@TestMetadata("Constructor.kt")
public void testConstructor() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
}
@TestMetadata("DefaultArgs.kt")
public void testDefaultArgs() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
}
@TestMetadata("Delegation.kt")
public void testDelegation() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
}
@TestMetadata("TopLevel.kt")
public void testTopLevel() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
}
@TestMetadata("TraitMembers.kt")
public void testTraitMembers() throws Exception {
doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
}
}
public static Test innerSuite() {
TestSuite suite = new TestSuite("Method");
suite.addTestSuite(Method.class);
suite.addTestSuite(PrimitiveOverride.class);
suite.addTestSuite(Throws.class);
return suite;
}
}