From 58611ec417964a8247fa2d4bd14683c75a6cb34a Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 5 Jun 2019 17:38:29 +0300
Subject: [PATCH] New J2K: add test data for #KT-16662, #KT-15991, #KT-12050

---
 nj2k/testData/newJ2k/issues/kt-16662.java     | 38 +++++++++++++++++++
 nj2k/testData/newJ2k/issues/kt-16662.kt       | 18 +++++++++
 .../newJ2k/literalExpression/kt-15991.java    |  7 ++++
 .../newJ2k/literalExpression/kt-15991.kt      |  9 +++++
 .../testData/newJ2k/nullability/kt-12050.java |  9 +++++
 nj2k/testData/newJ2k/nullability/kt-12050.kt  |  9 +++++
 ...otlinConverterSingleFileTestGenerated.java | 15 ++++++++
 7 files changed, 105 insertions(+)
 create mode 100644 nj2k/testData/newJ2k/issues/kt-16662.java
 create mode 100644 nj2k/testData/newJ2k/issues/kt-16662.kt
 create mode 100644 nj2k/testData/newJ2k/literalExpression/kt-15991.java
 create mode 100644 nj2k/testData/newJ2k/literalExpression/kt-15991.kt
 create mode 100644 nj2k/testData/newJ2k/nullability/kt-12050.java
 create mode 100644 nj2k/testData/newJ2k/nullability/kt-12050.kt

diff --git a/nj2k/testData/newJ2k/issues/kt-16662.java b/nj2k/testData/newJ2k/issues/kt-16662.java
new file mode 100644
index 00000000000..36e88dc4349
--- /dev/null
+++ b/nj2k/testData/newJ2k/issues/kt-16662.java
@@ -0,0 +1,38 @@
+import java.io.Serializable;
+
+class BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}
+
+class AuditableEntity extends BaseEntity {
+    private String createdBy;
+    private String modifiedBy;
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getModifiedBy() {
+        return modifiedBy;
+    }
+
+    public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+    private static final long serialVersionUID = 2L;
+
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/issues/kt-16662.kt b/nj2k/testData/newJ2k/issues/kt-16662.kt
new file mode 100644
index 00000000000..bee1f2ad2c0
--- /dev/null
+++ b/nj2k/testData/newJ2k/issues/kt-16662.kt
@@ -0,0 +1,18 @@
+import java.io.Serializable
+
+internal open class BaseEntity : Serializable {
+    var id: Long? = null
+
+    companion object {
+        private const val serialVersionUID = 1L
+    }
+}
+
+internal class AuditableEntity : BaseEntity() {
+    var createdBy: String? = null
+    var modifiedBy: String? = null
+
+    companion object {
+        private const val serialVersionUID = 2L
+    }
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/literalExpression/kt-15991.java b/nj2k/testData/newJ2k/literalExpression/kt-15991.java
new file mode 100644
index 00000000000..bd3bfce7c1e
--- /dev/null
+++ b/nj2k/testData/newJ2k/literalExpression/kt-15991.java
@@ -0,0 +1,7 @@
+public class Numerology {
+    public long makeLong() { return 5L; }
+
+    public void context() {
+        boolean b = makeLong() == 0;
+    }
+} 
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/literalExpression/kt-15991.kt b/nj2k/testData/newJ2k/literalExpression/kt-15991.kt
new file mode 100644
index 00000000000..aed1cd08799
--- /dev/null
+++ b/nj2k/testData/newJ2k/literalExpression/kt-15991.kt
@@ -0,0 +1,9 @@
+class Numerology {
+    fun makeLong(): Long {
+        return 5L
+    }
+
+    fun context() {
+        val b = makeLong() == 0L
+    }
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/nullability/kt-12050.java b/nj2k/testData/newJ2k/nullability/kt-12050.java
new file mode 100644
index 00000000000..24a86cd12d0
--- /dev/null
+++ b/nj2k/testData/newJ2k/nullability/kt-12050.java
@@ -0,0 +1,9 @@
+public class NullableArray {
+    public String[] createArrayFailure(int size) {
+        return new String[size];
+    }
+
+    public String[] createArraySuccess(int size) {
+        return new String[] {};
+    }
+} 
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/nullability/kt-12050.kt b/nj2k/testData/newJ2k/nullability/kt-12050.kt
new file mode 100644
index 00000000000..25adb4aa436
--- /dev/null
+++ b/nj2k/testData/newJ2k/nullability/kt-12050.kt
@@ -0,0 +1,9 @@
+class NullableArray {
+    fun createArrayFailure(size: Int): Array<String?> {
+        return arrayOfNulls(size)
+    }
+
+    fun createArraySuccess(size: Int): Array<String> {
+        return arrayOf()
+    }
+}
\ No newline at end of file
diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
index 1e635114cc1..e50841e53e9 100644
--- a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
@@ -2676,6 +2676,11 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
             runTest("nj2k/testData/newJ2k/issues/kt-14248.java");
         }
 
+        @TestMetadata("kt-16662.java")
+        public void testKt_16662() throws Exception {
+            runTest("nj2k/testData/newJ2k/issues/kt-16662.java");
+        }
+
         @TestMetadata("kt-17379.java")
         public void testKt_17379() throws Exception {
             runTest("nj2k/testData/newJ2k/issues/kt-17379.java");
@@ -3078,6 +3083,11 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
             runTest("nj2k/testData/newJ2k/literalExpression/hex.java");
         }
 
+        @TestMetadata("kt-15991.java")
+        public void testKt_15991() throws Exception {
+            runTest("nj2k/testData/newJ2k/literalExpression/kt-15991.java");
+        }
+
         @TestMetadata("long.java")
         public void testLong() throws Exception {
             runTest("nj2k/testData/newJ2k/literalExpression/long.java");
@@ -3471,6 +3481,11 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
             runTest("nj2k/testData/newJ2k/nullability/IndirectOverride.java");
         }
 
+        @TestMetadata("kt-12050.java")
+        public void testKt_12050() throws Exception {
+            runTest("nj2k/testData/newJ2k/nullability/kt-12050.java");
+        }
+
         @TestMetadata("LocalValReassignment.java")
         public void testLocalValReassignment() throws Exception {
             runTest("nj2k/testData/newJ2k/nullability/LocalValReassignment.java");