From c864b67550b0c3c78ba1cc0ce3ceaca675e7ef0f Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Sat, 20 Feb 2016 12:41:48 +0300 Subject: [PATCH] Add regression test: parameter from lambda is removed --- j2k/testData/JavaApi.java | 4 ++++ j2k/testData/fileOrElement/class/anonymousClass.java | 12 ++++++++++++ j2k/testData/fileOrElement/class/anonymousClass.kt | 7 +++++++ ...JavaToKotlinConverterForWebDemoTestGenerated.java | 6 ++++++ ...JavaToKotlinConverterSingleFileTestGenerated.java | 6 ++++++ 5 files changed, 35 insertions(+) create mode 100644 j2k/testData/fileOrElement/class/anonymousClass.java create mode 100644 j2k/testData/fileOrElement/class/anonymousClass.kt diff --git a/j2k/testData/JavaApi.java b/j2k/testData/JavaApi.java index 8ab4dac7930..d99468d5e9a 100644 --- a/j2k/testData/JavaApi.java +++ b/j2k/testData/JavaApi.java @@ -72,6 +72,10 @@ public interface JFunction0 { void foo(); } +public interface Listener { + public void onChange(int visibility); +} + public interface JFunction1ReturnType { void foo(T t); } diff --git a/j2k/testData/fileOrElement/class/anonymousClass.java b/j2k/testData/fileOrElement/class/anonymousClass.java new file mode 100644 index 00000000000..12eec758f10 --- /dev/null +++ b/j2k/testData/fileOrElement/class/anonymousClass.java @@ -0,0 +1,12 @@ +package test; + +import javaApi.*; + +public class Test { + private Listener listener = new Listener() { + @Override + public void onChange(int visibility) { + val a = (visibility & 1) + } + } +} \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/anonymousClass.kt b/j2k/testData/fileOrElement/class/anonymousClass.kt new file mode 100644 index 00000000000..5070cdc215c --- /dev/null +++ b/j2k/testData/fileOrElement/class/anonymousClass.kt @@ -0,0 +1,7 @@ +package test + +import javaApi.* + +class Test { + private val listener = Listener { visibility -> val a = visibility and 1 } +} \ No newline at end of file diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index 5a13f0c4fbf..5e6da586d87 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -757,6 +757,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); } + @TestMetadata("anonymousClass.java") + public void testAnonymousClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/anonymousClass.java"); + doTest(fileName); + } + @TestMetadata("class.java") public void testClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/class.java"); diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index 61f9ecde798..d85ae2f6f09 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -757,6 +757,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); } + @TestMetadata("anonymousClass.java") + public void testAnonymousClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/anonymousClass.java"); + doTest(fileName); + } + @TestMetadata("class.java") public void testClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/class.java");