Java to Kotlin converter: "//file" in test data has made optional

j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt

@@ -18,8 +18,6 @@ package org.jetbrains.jet.j2k.test
 
 import java.io.File
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.psi.PsiJavaFile
-import com.intellij.psi.PsiFile
 import org.jetbrains.jet.j2k.Converter
 import org.jetbrains.jet.j2k.JavaToKotlinTranslator
 import org.jetbrains.jet.j2k.ConverterSettings
@@ -61,9 +59,13 @@ abstract class AbstractJavaToKotlinConverterTest() : LightIdeaTestCase() {
         val javaFile = File(javaPath)
         val fileContents = FileUtil.loadFile(javaFile, true)
         val matcher = testHeaderPattern.matcher(fileContents)
-        matcher.find()
+
-        val prefix = matcher.group().trim().substring(2)
+        val (prefix, javaCode) = if (matcher.find()) {
-        val javaCode = matcher.replaceFirst("")
+            Pair(matcher.group().trim().substring(2), matcher.replaceFirst(""))
+        }
+        else {
+            Pair("file", fileContents)
+        }
 
         fun parseBoolean(text: String): Boolean = when (text) {
             "true" -> true

j2k/tests/testData/ast/annotations/annotationUsages.java

@@ -1,4 +1,3 @@
-//file
 import javaApi.*;
 
 @Anon1(value = {"a"}, stringArray = {"b"}, intArray = {1, 2}, string = "x")

j2k/tests/testData/ast/annotations/jetbrainsNotNull.java

@@ -1,4 +1,3 @@
-//file
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
 package test;

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java

@@ -1,4 +1,3 @@
-//file
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
 package test;

j2k/tests/testData/ast/annotations/jetbrainsNullable.java

@@ -1,4 +1,3 @@
-//file
 // !specifyLocalVariableTypeByDefault: true
 package test;
 

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java

@@ -1,4 +1,3 @@
-//file
 class Test {
   String str;
   {

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java

@@ -1,4 +1,3 @@
-//file
 class Test {
   String str;
   static {

j2k/tests/testData/ast/assignmentExpression/nullability-settings.java

@@ -1,4 +1,3 @@
-//file
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
 import java.util.BitSet;

j2k/tests/testData/ast/assignmentExpression/nullability.java

@@ -1,4 +1,3 @@
-//file
 import java.util.BitSet;
 
 class Foo {

j2k/tests/testData/ast/boxedType/Boxing.java

@@ -1,4 +1,3 @@
-//file
 import java.util.ArrayList;
 import java.util.List;
 

j2k/tests/testData/ast/boxedType/kt-671.java

@@ -1,4 +1,3 @@
-//file
 package demo;
 
 class Test {

j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java

@@ -1,4 +1,3 @@
-//file
 class Library {
   final static java.io.PrintStream ourOut;
 }

j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java

@@ -1,4 +1,3 @@
-//file
 class Library {
   static void call() {}
 

j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java

@@ -1,4 +1,3 @@
-//file
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
 class Library {

j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java

@@ -1,4 +1,3 @@
-//file
 class Library {
   void call() {}
 

j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java

@@ -1,4 +1,3 @@
-//file
 class Library {
   final public String myString;
 }

j2k/tests/testData/ast/class/ClassShadowing.java

@@ -1,4 +1,3 @@
-//file
 package test;
 
 public class Short {

j2k/tests/testData/ast/class/innerClassInInterface.java

@@ -1,4 +1,3 @@
-//file
 interface A {
     class B {}
 }

j2k/tests/testData/ast/class/innerEnum.java

@@ -1,4 +1,3 @@
-//file
 class A {
     enum E {
         A,

j2k/tests/testData/ast/class/innerInterface.java

@@ -1,4 +1,3 @@
-//file
 class A {
     interface I {}
 }

j2k/tests/testData/ast/class/kt-639.java

@@ -1,4 +1,3 @@
-//file
 package demo;
 
 import java.util.HashMap;

j2k/tests/testData/ast/class/privateInit.java

@@ -1,4 +1,3 @@
-//file
 public class MyClass {
   private void init(int arg1, int arg2, int arg3) {
   }

j2k/tests/testData/ast/comments/comments.java

@@ -1,4 +1,3 @@
-//file
 package foo; // we use package 'foo'
 
 // imports:

j2k/tests/testData/ast/comments/comments2.java

@@ -1,4 +1,3 @@
-//file
 package foo;
 
 class A {

j2k/tests/testData/ast/comments/commentsForConstructors.java

@@ -1,4 +1,3 @@
-//file
 class A {
     private int v;
 

j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java

@@ -1,4 +1,3 @@
-//file
 class A {
     private boolean isOpen = true; // ideally should be atomic boolean
 }

j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private final int p1; // field p1
 

j2k/tests/testData/ast/constructors/allCallsPrimary.java

@@ -1,4 +1,3 @@
-//file
 package pack
 
 class C {

j2k/tests/testData/ast/constructors/allCallsPrimary2.java

@@ -1,4 +1,3 @@
-//file
 class C {
   final int myArg1;
   int myArg2;

j2k/tests/testData/ast/constructors/artificialPrimary.java

@@ -1,4 +1,3 @@
-//file
 public class Test {
   private final String s;
   boolean b;

j2k/tests/testData/ast/constructors/chain.java

@@ -1,4 +1,3 @@
-//file
 class C {
   C(int arg1, int arg2, int arg3) {
   }

j2k/tests/testData/ast/constructors/customerBuilder.java

@@ -1,4 +1,3 @@
-//file
 package org.test.customer
 
 class Customer {

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private final int p1;
     private final int myP2;

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private final int field;
 

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private final int p;
 

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java

@@ -1,4 +1,3 @@
-//file
 class C {
     public int p;
 

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java

@@ -1,4 +1,3 @@
-//file
 class C {
     public int p;
 

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java

@@ -1,4 +1,3 @@
-//file
 class C {
     public Object x;
 

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java

@@ -1,4 +1,3 @@
-//file
 class C {
     public Object x;
 

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java

@@ -1,4 +1,3 @@
-//file
 class Base {
     Base(Object o, int l){}
 }

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private final String string;
 

j2k/tests/testData/ast/constructors/genericIdentifier.java

@@ -1,4 +1,3 @@
-//file
 public class Identifier<T> {
   private final T myName;
   private boolean myHasDollar;

j2k/tests/testData/ast/constructors/identifier.java

@@ -1,4 +1,3 @@
-//file
 public class Identifier {
   private final String myName;
   private boolean myHasDollar;

j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private final int arg1;
     private final int arg2;

j2k/tests/testData/ast/constructors/noPrimary.java

@@ -1,4 +1,3 @@
-//file
 class C {
   C(int arg1, int arg2, int arg3) {
   }

j2k/tests/testData/ast/constructors/parameterDefaults1.java

@@ -1,4 +1,3 @@
-//file
 package pack
 
 class C {

j2k/tests/testData/ast/constructors/parameterDefaults2.java

@@ -1,4 +1,3 @@
-//file
 package pack
 
 class C {

j2k/tests/testData/ast/constructors/parameterDefaults3.java

@@ -1,4 +1,3 @@
-//file
 package pack
 
 class C {

j2k/tests/testData/ast/constructors/parameterDefaults4.java

@@ -1,4 +1,3 @@
-//file
 package pack
 
 class C {

j2k/tests/testData/ast/constructors/parameterDefaults5.java

@@ -1,4 +1,3 @@
-//file
 package pack
 
 class C {

j2k/tests/testData/ast/constructors/parameterModification.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private int field;
 

j2k/tests/testData/ast/constructors/privateConstructors.java

@@ -1,4 +1,3 @@
-//file
 class C {
   private C(int arg1, int arg2, int arg3) {
   }

j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private final int arg1;
     private final int arg2;

j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java

@@ -1,4 +1,3 @@
-//file
 class Outer {
     private class Inner1 {
         public Inner1(){}

j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java

@@ -1,4 +1,3 @@
-//file
 class Outer {
     private static class Nested1 {
         public Nested1(){}

j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java

@@ -1,4 +1,3 @@
-//file
 class A {
     public A() {}
 

j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java

@@ -1,4 +1,3 @@
-//file
 class C {
     private static int staticField1 = 0;
     private static int staticField2 = 0;

j2k/tests/testData/ast/constructors/withManyDefaultParams.java

@@ -1,4 +1,3 @@
-//file
 public class Test {
   private final String myName;
   boolean a;

j2k/tests/testData/ast/equals/Equals1.java

@@ -1,4 +1,3 @@
-//file
 interface I {
 }
 

j2k/tests/testData/ast/equals/Equals2.java

@@ -1,4 +1,3 @@
-//file
 class C{
     boolean foo1(String s1, String s2) {
         return s1.equals(s2)

j2k/tests/testData/ast/equals/Equals3.java

@@ -1,4 +1,3 @@
-//file
 class C{
     public boolean equals(C c) {
         return false;

j2k/tests/testData/ast/equals/Equals4.java

@@ -1,4 +1,3 @@
-//file
 class C{
     boolean foo(String s1, String s2, String s3, String s4) {
         return s1.equals(s2) == !s3.equals(s4)

j2k/tests/testData/ast/equals/ObjectsEquals.java

@@ -1,4 +1,3 @@
-//file
 import java.util.Objects;
 
 interface I {

j2k/tests/testData/ast/field/classChildExtendsBase.java

@@ -1,4 +1,3 @@
-//file
 class Base {
   private String myFirst;
 }

j2k/tests/testData/ast/field/conversion.java

@@ -1,4 +1,3 @@
-//file
 class A {
     private Integer i = getByte();
 

j2k/tests/testData/ast/field/internalField.java

@@ -1,4 +1,3 @@
-//file
 class C {
 Foo f;
 }

j2k/tests/testData/ast/field/privateField.java

@@ -1,4 +1,3 @@
-//file
 class C {
 private Foo f;
 }

j2k/tests/testData/ast/field/protectedField.java

@@ -1,4 +1,3 @@
-//file
 class C {
 protected Foo f;
 }

j2k/tests/testData/ast/field/publicField.java

@@ -1,4 +1,3 @@
-//file
 class C {
 public Foo f;
 }

j2k/tests/testData/ast/field/specifyType.java

@@ -1,4 +1,3 @@
-//file
 import org.jetbrains.annotations.Nullable;
 import java.util.*;
 

j2k/tests/testData/ast/field/valOrVar.java

@@ -1,4 +1,3 @@
-//file
 class A {
     private final int field1 = 0;
     private int field2 = 0;

j2k/tests/testData/ast/field/valWithInit.java

@@ -1,4 +1,3 @@
-//file
 class C {
 final Foo f = new Foo(1, 2);
 }

j2k/tests/testData/ast/field/varWithInit.java

@@ -1,4 +1,3 @@
-//file
 class C {
 Foo f = new Foo(1, 2);
 }

j2k/tests/testData/ast/field/varWithoutInit.java

@@ -1,4 +1,3 @@
-//file
 class C {
 Foo f;
 }

j2k/tests/testData/ast/for/forThroughListIndices.java

@@ -1,4 +1,3 @@
-//file
 import java.util.List;
 import java.util.ArrayList;
 

j2k/tests/testData/ast/for/forThroughNonArrayIndices.java

@@ -1,4 +1,3 @@
-//file
 class X {
     public int length = 5;
 }

j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java

@@ -1,4 +1,3 @@
-//file
 class X {
     public int size() { return 5; }
 }

j2k/tests/testData/ast/issues/kt-807.java

@@ -1,4 +1,3 @@
-//file
 import java.io.*;
 
 class FileRead {