Switch converter test to new directive scheme

compiler/tests-common/tests/org/jetbrains/kotlin/test/Directives.kt

@@ -35,8 +35,4 @@ class Directives {
             values.flatMap { InTextDirectivesUtils.splitValues(arrayListOf(), it) }
         }
     }
-
-    public fun asMapOfSingleValues(): Map<String, String?> {
-        return directives.entries.associate { it.key to it.value?.single() }
-    }
 }

j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String) {

j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 internal class Foo {

j2k/testData/fileOrElement/annotations/jetbrainsNullable.java

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.Nullable;

j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String?) {

j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 import java.util.HashSet;
 
 class Foo {

j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 import java.util.HashSet
 
 internal class Foo {

j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 class Library {
   void call() {}
 

j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 internal class Library {
 
     val string: String

j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java

@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 //file
 public class A {
     public static void main(String[] args) {

j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt

@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 object A {
     @JvmStatic
     fun main(args: Array<String>) {

j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = "abc";
   if (b) {

j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = "abc"
     if (b) {

j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo() {
   String s = bar();
   if (s != null) {

j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo() {
     val s: String? = bar()
     if (s != null) {

j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = null;
   if (b) {

j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = null
     if (b) {

j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = (b ? "abc" : null);
 }

j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     val s: String? = if (b) "abc" else null
 }

j2k/testData/fileOrElement/settings/openByDefault.java

@@ -1,5 +1,5 @@
 //file
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 
 class A {
     void foo1() { }

j2k/testData/fileOrElement/settings/openByDefault.kt

@@ -1,4 +1,4 @@
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 
 internal open class A {
     internal open fun foo1() {}

j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java

@@ -1,5 +1,5 @@
 //file
-// !specifyFieldTypeByDefault: true
+// !SPECIFY_FIELD_TYPE_BY_DEFAULT: true
 import org.jetbrains.annotations.Nullable;
 import java.util.*;
 

j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt

@@ -1,4 +1,4 @@
-// !specifyFieldTypeByDefault: true
+// !SPECIFY_FIELD_TYPE_BY_DEFAULT: true
 import java.util.*
 
 internal class A {

j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo() {
   int i = 1;
   String s = "";

j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo() {
     val i: Int = 1
     val s: String = ""

j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo(List<String> list) {
     int[] array = new int[10];
     for (int i = 0; i < 10; i++){

j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(list: List<String>) {
     val array: IntArray = IntArray(10)
     for (i: Int in 0..9) {

j2k/testData/fileOrElement/typeParameters/genericParam-settings.java

@@ -1,4 +1,4 @@
 //statement
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 List<T> l;

j2k/testData/fileOrElement/typeParameters/genericParam-settings.kt

@@ -1,3 +1,3 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 val l: List<T?>?

j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt

@@ -37,14 +37,17 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli
 
         val settings = ConverterSettings.defaultSettings.copy()
         val directives = KotlinTestUtils.parseDirectives(javaCode)
-        for ((name, value) in directives.asMapOfSingleValues()) {
+        directives["FORCE_NOT_NULL_TYPES"]?.let {
-            when (name) {
+            settings.forceNotNullTypes = it.toBoolean()
-                "forceNotNullTypes" -> settings.forceNotNullTypes = value.toBoolean()
+        }
-                "specifyLocalVariableTypeByDefault" -> settings.specifyLocalVariableTypeByDefault = value.toBoolean()
+        directives["SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT"]?.let {
-                "specifyFieldTypeByDefault" -> settings.specifyFieldTypeByDefault = value.toBoolean()
+            settings.specifyLocalVariableTypeByDefault = it.toBoolean()
-                "openByDefault" -> settings.openByDefault = value.toBoolean()
+        }
-                else -> throw IllegalArgumentException("Unknown option: $name")
+        directives["SPECIFY_FIELD_TYPE_BY_DEFAULT"]?.let {
-            }
+            settings.specifyFieldTypeByDefault = it.toBoolean()
+        }
+        directives["OPEN_BY_DEFAULT"]?.let {
+            settings.openByDefault = it.toBoolean()
         }
 
         val rawConverted = when (prefix) {

nj2k/testData/newJ2k/annotations/jetbrainsNotNull.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String) {

nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.kt

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 internal class Foo {

nj2k/testData/newJ2k/annotations/jetbrainsNullable.java

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.Nullable;

nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String?) {

nj2k/testData/newJ2k/assignmentExpression/nullability-settings.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 import java.util.HashSet;
 
 class Foo {

nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.java

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 class Library {
   void call() {}
 

nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.kt

@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 internal class Library {
     fun call() {}
     val string: String

nj2k/testData/newJ2k/function/mainAndNullabilitySetting.java

@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 //file
 public class A {
     public static void main(String[] args) {

nj2k/testData/newJ2k/function/mainAndNullabilitySetting.kt

@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 object A {
     @JvmStatic
     fun main(args: Array<String>) {

nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = "abc";
   if (b) {

nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = "abc"
     if (b) {

nj2k/testData/newJ2k/nullability/VariableComparedWithNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 String bar() {
     return null;
 }

nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun bar(): String? {
     return null
 }

nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = null;
   if (b) {

nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = null
     if (b) {

nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = (b ? "abc" : null);
 }

nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     val s: String? = if (b) "abc" else null
 }

nj2k/testData/newJ2k/settings/openByDefault.java

@@ -1,5 +1,5 @@
 //file
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 
 class A {
     void foo1() { }

nj2k/testData/newJ2k/settings/openByDefault.kt

@@ -1,4 +1,4 @@
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 internal open class A {
     open fun foo1() {}
     private fun foo2() {}

nj2k/testData/newJ2k/settings/specifyFieldTypeByDefault.java

@@ -1,5 +1,5 @@
 //file
-// !specifyFieldTypeByDefault: true
+// !SPECIFY_FIELD_TYPE_BY_DEFAULT: true
 import org.jetbrains.annotations.Nullable;
 import java.util.*;
 

nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo() {
   int i = 1;
   String s = "";

nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo() {
     val i = 1
     val s = ""

nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.java

@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo(List<String> list) {
     int[] array = new int[10];
     for (int i = 0; i < 10; i++){

nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt

@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(list: List<String?>) {
     val array: IntArray = IntArray(10)
     for (i: Int in 0..9) {

nj2k/testData/newJ2k/typeParameters/genericParam-settings.java

@@ -1,4 +1,4 @@
 //statement
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 List<T> l;

nj2k/testData/newJ2k/typeParameters/genericParam-settings.kt

@@ -1,3 +1,3 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 var l: List<T?>