From 68d8b6b4c3c633a41ad7e79f184d776ae7b0f3ab Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 17 Dec 2012 18:36:51 +0400 Subject: [PATCH] Added test with @KotlinSignature on method returning array. #KT-2840 can't reproduce --- .../testData/loadJava/kotlinSignature/ArrayType.java | 10 ++++++++++ .../testData/loadJava/kotlinSignature/ArrayType.kt | 7 +++++++ .../testData/loadJava/kotlinSignature/ArrayType.txt | 6 ++++++ .../jet/jvm/compiler/LoadJavaTestGenerated.java | 5 +++++ .../LazyResolveNamespaceComparingTestGenerated.java | 5 +++++ 5 files changed, 33 insertions(+) create mode 100644 compiler/testData/loadJava/kotlinSignature/ArrayType.java create mode 100644 compiler/testData/loadJava/kotlinSignature/ArrayType.kt create mode 100644 compiler/testData/loadJava/kotlinSignature/ArrayType.txt diff --git a/compiler/testData/loadJava/kotlinSignature/ArrayType.java b/compiler/testData/loadJava/kotlinSignature/ArrayType.java new file mode 100644 index 00000000000..3a586e70375 --- /dev/null +++ b/compiler/testData/loadJava/kotlinSignature/ArrayType.java @@ -0,0 +1,10 @@ +package test; + +import jet.runtime.typeinfo.KotlinSignature; + +public class ArrayType { + @KotlinSignature("fun foo(): Array") + public String[] foo() { + throw new UnsupportedOperationException(); + } +} diff --git a/compiler/testData/loadJava/kotlinSignature/ArrayType.kt b/compiler/testData/loadJava/kotlinSignature/ArrayType.kt new file mode 100644 index 00000000000..34267f03e29 --- /dev/null +++ b/compiler/testData/loadJava/kotlinSignature/ArrayType.kt @@ -0,0 +1,7 @@ +package test + +public open class ArrayType : Object() { + public open fun foo(): Array { + throw UnsupportedOperationException() + } +} diff --git a/compiler/testData/loadJava/kotlinSignature/ArrayType.txt b/compiler/testData/loadJava/kotlinSignature/ArrayType.txt new file mode 100644 index 00000000000..f7b24f9e46d --- /dev/null +++ b/compiler/testData/loadJava/kotlinSignature/ArrayType.txt @@ -0,0 +1,6 @@ +namespace test + +public open class test.ArrayType : java.lang.Object { + public final /*constructor*/ fun (): test.ArrayType + public open fun foo(): jet.Array +} diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index 26ae420df59..ce27bfb1659 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -250,6 +250,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "java", true); } + @TestMetadata("ArrayType.java") + public void testArrayType() throws Exception { + doTest("compiler/testData/loadJava/kotlinSignature/ArrayType.java"); + } + @TestMetadata("ConstructorWithNewTypeParams.java") public void testConstructorWithNewTypeParams() throws Exception { doTest("compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.java"); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index b620662048a..5f50b2bd077 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -1145,6 +1145,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "kt", true); } + @TestMetadata("ArrayType.kt") + public void testArrayType() throws Exception { + doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/ArrayType.kt"); + } + @TestMetadata("ConstructorWithNewTypeParams.kt") public void testConstructorWithNewTypeParams() throws Exception { doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.kt");