New J2K: Fix existing test data

nj2k/testData/newJ2k/issues/kt-5400.kt

@@ -3,5 +3,5 @@ internal open class Base {
 }
 
 internal class Derived : Base() {
-    var field: Base.Nested? = null
+    var field: Nested? = null
 }

nj2k/testData/newJ2k/issues/kt-807.java

@@ -1,10 +1,9 @@
 import java.io.*;
-import java.io.*;
 
 class FileRead {
     public static void main(String args[]) {
         try {
-            FileInputStream fstream = new FileInputStream();
+            FileInputStream fstream = new FileInputStream(new File("file.txt"));
             DataInputStream in = new DataInputStream(fstream);
             BufferedReader br = new BufferedReader(new InputStreamReader(in));
             String strLine;

nj2k/testData/newJ2k/issues/kt-807.kt

@@ -1,18 +1,17 @@
-// ERROR: None of the following functions can be called with the arguments supplied:  public constructor FileInputStream(file: File!) defined in java.io.FileInputStream public constructor FileInputStream(fdObj: FileDescriptor!) defined in java.io.FileInputStream public constructor FileInputStream(name: String!) defined in java.io.FileInputStream
 // ERROR: Type mismatch: inferred type is DataInputStream but InputStream! was expected
-// ERROR: Assignments are not expressions, and only expressions are allowed in this context
 // ERROR: Unresolved reference: close
 import java.io.*
+import java.lang.Exception
 
 internal object FileRead {
     @JvmStatic
     fun main(args: Array<String>) {
         try {
-            val fstream = FileInputStream()
+            val fstream = FileInputStream(File("file.txt"))
             val `in` = DataInputStream(fstream)
             val br = BufferedReader(InputStreamReader(`in`))
-            var strLine: String
-            while ((strLine = br.readLine()) != null) {
+            var strLine: String?
+            while (br.readLine().also { strLine = it } != null) {
                 println(strLine)
             }
             `in`.close()

nj2k/testData/newJ2k/issues/kt-836.kt

@@ -3,13 +3,11 @@ package com.voltvoodoo.saplo4j.model
 import java.io.Serializable
 
 class Language(protected var code: String) : Serializable {
-
     override fun toString(): String {
-        return this.code
+        return code
     }
 }
 
-
 internal open class Base {
     internal open fun test() {}
     override fun toString(): String {

nj2k/testData/newJ2k/issues/kt-837.kt

@@ -2,15 +2,14 @@ package com.voltvoodoo.saplo4j.model
 
 import java.io.Serializable
 
-class Language(protected var code: String?) : Serializable {
-
+class Language(protected var code: String) : Serializable {
     fun equals(other: Language): Boolean {
         return other.toString() == this.toString()
     }
 
     companion object {
-        var ENGLISH: Language? = Language("en")
-        var SWEDISH: Language? = Language("sv")
+        var ENGLISH = Language("en")
+        var SWEDISH = Language("sv")
         private const val serialVersionUID = -2442762969929206780L
     }
 }

nj2k/testData/newJ2k/issues/qualifyStatic.kt

@@ -2,6 +2,6 @@ import java.util.Calendar
 
 internal abstract class MyCalendar : Calendar() {
     fun foo() {
-        val i = Calendar.ALL_STYLES
+        val i = ALL_STYLES
     }
 }