From af9ed4082b84b2ae81dc6803683d3d9c86837355 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 4 Jun 2012 17:06:08 +0400 Subject: [PATCH] Renamed MethodWithAlternativeSignature test to MethodWithGenerics, since there will be more tests for methods with alternative signature. --- .../kotlinSignature/MethodWithAlternativeSignature.txt | 6 ------ ...ithAlternativeSignature.java => MethodWithGenerics.java} | 2 +- ...hodWithAlternativeSignature.kt => MethodWithGenerics.kt} | 2 +- .../kotlinSignature/MethodWithGenerics.txt | 6 ++++++ 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.txt rename compiler/testData/readJavaBinaryClass/kotlinSignature/{MethodWithAlternativeSignature.java => MethodWithGenerics.java} (88%) rename compiler/testData/readJavaBinaryClass/kotlinSignature/{MethodWithAlternativeSignature.kt => MethodWithGenerics.kt} (65%) create mode 100644 compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.txt deleted file mode 100644 index 1878a2f5518..00000000000 --- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.txt +++ /dev/null @@ -1,6 +0,0 @@ -namespace test - -open class test.MethodWithAlternativeSignature : java.lang.Object { - final /*constructor*/ fun (): test.MethodWithAlternativeSignature - open fun foo(/*0*/ p0: jet.String, /*1*/ p1: java.util.List?>): jet.String -} diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.java b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.java similarity index 88% rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.java rename to compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.java index fa88125f15b..709e5b7d48a 100644 --- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.java +++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.java @@ -4,7 +4,7 @@ import java.lang.UnsupportedOperationException; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -public class MethodWithAlternativeSignature { +public class MethodWithGenerics { @KotlinSignature("fun foo(a : String, b : List?>) : String") public String foo(String a, List> b) { throw new UnsupportedOperationException(); diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.kt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt similarity index 65% rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.kt rename to compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt index e4433b0275d..faba18dd3b7 100644 --- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithAlternativeSignature.kt +++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt @@ -2,6 +2,6 @@ package test import java.util.* -public open class MethodWithAlternativeSignature : Object() { +public open class MethodWithGenerics : Object() { open fun foo(p0 : String, p1 : List?>) : String = "" } diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt new file mode 100644 index 00000000000..90be40040ba --- /dev/null +++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt @@ -0,0 +1,6 @@ +namespace test + +open class test.MethodWithGenerics : java.lang.Object { + final /*constructor*/ fun (): test.MethodWithGenerics + open fun foo(/*0*/ p0: jet.String, /*1*/ p1: java.util.List?>): jet.String +}