Make tests about mod and varargs valid for 1.3 version

compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt

@@ -0,0 +1,29 @@
+// !LANGUAGE: -ProhibitAssigningSingleElementsToVarargsInNamedForm
+// IGNORE_BACKEND: JS_IR
+// TODO: muted automatically, investigate should it be ran for JS or not
+// IGNORE_BACKEND: JS, NATIVE
+
+// WITH_RUNTIME
+
+annotation class Ann(vararg val p: Int)
+
+@Ann(p = 1) class MyClass
+
+fun box(): String {
+    test(MyClass::class.java, "1")
+    return "OK"
+}
+
+fun test(klass: Class<*>, expected: String) {
+    val ann = klass.getAnnotation(Ann::class.java)
+    if (ann == null) throw AssertionError("fail: cannot find Ann on ${klass}")
+
+    var result = ""
+    for (i in ann.p) {
+        result += i
+    }
+
+    if (result != expected) {
+        throw AssertionError("fail: expected = ${expected}, actual = ${result}")
+    }
+}

compiler/testData/codegen/box/annotations/varargInAnnotationParameter.kt

@@ -15,8 +15,6 @@ annotation class Ann(vararg val p: Int)
 @Ann(*intArrayOf(1)) class MyClass5
 @Ann(*intArrayOf(1, 2)) class MyClass6
 
-@Ann(p = 1) class MyClass7
-
 @Ann(p = *intArrayOf()) class MyClass8
 @Ann(p = *intArrayOf(1)) class MyClass9
 @Ann(p = *intArrayOf(1, 2)) class MyClass10
@@ -30,8 +28,6 @@ fun box(): String {
     test(MyClass5::class.java, "1")
     test(MyClass6::class.java, "12")
 
-    test(MyClass7::class.java, "1")
-
     test(MyClass8::class.java, "")
     test(MyClass9::class.java, "1")
     test(MyClass10::class.java, "12")

compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt

@@ -7,7 +7,7 @@ operator fun A.plusAssign(y: Int) { x += y }
 operator fun A.minusAssign(y: Int) { x -= y }
 operator fun A.timesAssign(y: Int) { x *= y }
 operator fun A.divAssign(y: Int) { x /= y }
-operator fun A.modAssign(y: Int) { x %= y }
+operator fun A.remAssign(y: Int) { x %= y }
 
 fun box(): String {
   val original = A()

compiler/testData/codegen/box/operatorConventions/remAssignmentOperation.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -ProhibitOperatorMod
+
 class A() {
     var x = 5
 }

compiler/testData/codegen/box/operatorConventions/remOverModOperation.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -ProhibitOperatorMod
+
 class A() {
     var x = 5
 

compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt

@@ -0,0 +1,34 @@
+// !LANGUAGE: -ProhibitAssigningSingleElementsToVarargsInNamedForm
+// IGNORE_BACKEND: JS_IR
+
+fun box(): String {
+    if (test1(p = 1) != "1") return "fail 1"
+    if (test2(p = "1") != "1") return "fail 2"
+    if (test3(p = "1") != "1") return "fail 3"
+
+    return "OK"
+}
+
+fun test1(vararg p: Int): String {
+    var result = ""
+    for (i in p) {
+        result += i
+    }
+    return result
+}
+
+fun test2(vararg p: String): String {
+    var result = ""
+    for (i in p) {
+        result += i
+    }
+    return result
+}
+
+fun <T> test3(vararg p: T): String {
+    var result = ""
+    for (i in p) {
+        result += i
+    }
+    return result
+}

compiler/testData/codegen/box/vararg/varargInFunParam.kt

@@ -8,8 +8,6 @@ fun box(): String {
     if (test1(*intArrayOf(1)) != "1") return "fail 5"
     if (test1(*intArrayOf(1, 2)) != "12") return "fail 6"
 
-    if (test1(p = 1) != "1") return "fail 7"
-
     if (test1(p = *intArrayOf()) != "") return "fail 8"
     if (test1(p = *intArrayOf(1)) != "1") return "fail 9"
     if (test1(p = *intArrayOf(1, 2)) != "12") return "fail 10"
@@ -22,8 +20,6 @@ fun box(): String {
     if (test2(*arrayOf<String>("1")) != "1") return "fail 15"
     if (test2(*arrayOf<String>("1", "2")) != "12") return "fail 16"
 
-    if (test2(p = "1") != "1") return "fail 17"
-
     if (test2(p = *arrayOf<String>()) != "") return "fail 18"
     if (test2(p = *arrayOf<String>("1")) != "1") return "fail 19"
     if (test2(p = *arrayOf<String>("1", "2")) != "12") return "fail 20"
@@ -36,8 +32,6 @@ fun box(): String {
     if (test3(*arrayOf<String>("1")) != "1") return "fail 25"
     if (test3(*arrayOf<String>("1", "2")) != "12") return "fail 26"
 
-    if (test3(p = "1") != "1") return "fail 27"
-
     if (test3(p = *arrayOf<String>()) != "") return "fail 28"
     if (test3(p = *arrayOf<String>("1")) != "1") return "fail 29"
     if (test3(p = *arrayOf<String>("1", "2")) != "12") return "fail 30"

compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java

@@ -141,6 +141,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargInAnnotation.kt")
+        public void testSingleAssignmentToVarargInAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt");
+        }
+
         @TestMetadata("varargInAnnotationParameter.kt")
         public void testVarargInAnnotationParameter() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/varargInAnnotationParameter.kt");
@@ -10280,11 +10285,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @RunWith(JUnit3RunnerWithInners.class)
         public static class BigArity extends AbstractIrBlackBoxCodegenTest {
             private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
             }
 
             public void testAllFilesPresentInBigArity() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM_IR, true);
             }
 
             @TestMetadata("callWithIncorrectNumberOfArguments.kt")
@@ -21393,6 +21398,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/vararg/kt796_797.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargsInFunction.kt")
+        public void testSingleAssignmentToVarargsInFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt");
+        }
+
         @TestMetadata("spreadCopiesArray.kt")
         public void testSpreadCopiesArray() throws Exception {
             runTest("compiler/testData/codegen/box/vararg/spreadCopiesArray.kt");

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java

@@ -141,6 +141,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargInAnnotation.kt")
+        public void testSingleAssignmentToVarargInAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt");
+        }
+
         @TestMetadata("varargInAnnotationParameter.kt")
         public void testVarargInAnnotationParameter() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/varargInAnnotationParameter.kt");
@@ -21393,6 +21398,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/vararg/kt796_797.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargsInFunction.kt")
+        public void testSingleAssignmentToVarargsInFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt");
+        }
+
         @TestMetadata("spreadCopiesArray.kt")
         public void testSpreadCopiesArray() throws Exception {
             runTest("compiler/testData/codegen/box/vararg/spreadCopiesArray.kt");

compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -146,6 +146,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargInAnnotation.kt")
+        public void testSingleAssignmentToVarargInAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt");
+        }
+
         @TestMetadata("varargInAnnotationParameter.kt")
         public void testVarargInAnnotationParameter() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/varargInAnnotationParameter.kt");
@@ -10279,11 +10284,46 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class BigArity extends AbstractLightAnalysisModeTest {
+            @TestMetadata("callWithIncorrectNumberOfArguments.kt")
+            public void ignoreCallWithIncorrectNumberOfArguments() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/bigArity/callWithIncorrectNumberOfArguments.kt");
+            }
+
+            @TestMetadata("function255.kt")
+            public void ignoreFunction255() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/bigArity/function255.kt");
+            }
+
+            @TestMetadata("instanceOfCallableReference.kt")
+            public void ignoreInstanceOfCallableReference() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/bigArity/instanceOfCallableReference.kt");
+            }
+
+            @TestMetadata("invokeCallableReference.kt")
+            public void ignoreInvokeCallableReference() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/bigArity/invokeCallableReference.kt");
+            }
+
+            @TestMetadata("invokeLambda.kt")
+            public void ignoreInvokeLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/bigArity/invokeLambda.kt");
+            }
+
+            @TestMetadata("javaLambda.kt")
+            public void ignoreJavaLambda() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/bigArity/javaLambda.kt");
+            }
+
             @TestMetadata("noBigFunctionTypes.kt")
             public void ignoreNoBigFunctionTypes() throws Exception {
                 runTest("compiler/testData/codegen/box/functions/bigArity/noBigFunctionTypes.kt");
             }
 
+            @TestMetadata("subclass.kt")
+            public void ignoreSubclass() throws Exception {
+                runTest("compiler/testData/codegen/box/functions/bigArity/subclass.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
@@ -10291,41 +10331,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             public void testAllFilesPresentInBigArity() throws Exception {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/bigArity"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
             }
-
-            @TestMetadata("callWithIncorrectNumberOfArguments.kt")
-            public void testCallWithIncorrectNumberOfArguments() throws Exception {
-                runTest("compiler/testData/codegen/box/functions/bigArity/callWithIncorrectNumberOfArguments.kt");
-            }
-
-            @TestMetadata("function255.kt")
-            public void testFunction255() throws Exception {
-                runTest("compiler/testData/codegen/box/functions/bigArity/function255.kt");
-            }
-
-            @TestMetadata("instanceOfCallableReference.kt")
-            public void testInstanceOfCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/functions/bigArity/instanceOfCallableReference.kt");
-            }
-
-            @TestMetadata("invokeCallableReference.kt")
-            public void testInvokeCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/functions/bigArity/invokeCallableReference.kt");
-            }
-
-            @TestMetadata("invokeLambda.kt")
-            public void testInvokeLambda() throws Exception {
-                runTest("compiler/testData/codegen/box/functions/bigArity/invokeLambda.kt");
-            }
-
-            @TestMetadata("javaLambda.kt")
-            public void testJavaLambda() throws Exception {
-                runTest("compiler/testData/codegen/box/functions/bigArity/javaLambda.kt");
-            }
-
-            @TestMetadata("subclass.kt")
-            public void testSubclass() throws Exception {
-                runTest("compiler/testData/codegen/box/functions/bigArity/subclass.kt");
-            }
         }
 
         @TestMetadata("compiler/testData/codegen/box/functions/functionExpression")
@@ -11722,6 +11727,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NotNullAssertions extends AbstractLightAnalysisModeTest {
+            @TestMetadata("functionWithBigArity.kt")
+            public void ignoreFunctionWithBigArity() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/functionWithBigArity.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
@@ -11740,11 +11750,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/extensionReceiverParameter.kt");
             }
 
-            @TestMetadata("functionWithBigArity.kt")
-            public void testFunctionWithBigArity() throws Exception {
-                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/functionWithBigArity.kt");
-            }
-
             @TestMetadata("incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt")
             public void testIncWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt");
@@ -16699,6 +16704,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Call extends AbstractLightAnalysisModeTest {
+            @TestMetadata("bigArity.kt")
+            public void ignoreBigArity() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/call/bigArity.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
@@ -16707,11 +16717,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/call"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
             }
 
-            @TestMetadata("bigArity.kt")
-            public void testBigArity() throws Exception {
-                runTest("compiler/testData/codegen/box/reflection/call/bigArity.kt");
-            }
-
             @TestMetadata("callInstanceJavaMethod.kt")
             public void testCallInstanceJavaMethod() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/call/callInstanceJavaMethod.kt");
@@ -18140,6 +18145,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Parameters extends AbstractLightAnalysisModeTest {
+            @TestMetadata("bigArity.kt")
+            public void ignoreBigArity() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/parameters/bigArity.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
@@ -18148,11 +18158,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/parameters"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
             }
 
-            @TestMetadata("bigArity.kt")
-            public void testBigArity() throws Exception {
-                runTest("compiler/testData/codegen/box/reflection/parameters/bigArity.kt");
-            }
-
             @TestMetadata("boundInnerClassConstructor.kt")
             public void testBoundInnerClassConstructor() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/parameters/boundInnerClassConstructor.kt");
@@ -21393,6 +21398,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/vararg/kt796_797.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargsInFunction.kt")
+        public void testSingleAssignmentToVarargsInFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt");
+        }
+
         @TestMetadata("spreadCopiesArray.kt")
         public void testSpreadCopiesArray() throws Exception {
             runTest("compiler/testData/codegen/box/vararg/spreadCopiesArray.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java

@@ -136,6 +136,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargInAnnotation.kt")
+        public void testSingleAssignmentToVarargInAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt");
+        }
+
         @TestMetadata("varargInAnnotationParameter.kt")
         public void testVarargInAnnotationParameter() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/varargInAnnotationParameter.kt");
@@ -19378,6 +19383,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/vararg/kt796_797.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargsInFunction.kt")
+        public void testSingleAssignmentToVarargsInFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt");
+        }
+
         @TestMetadata("spreadCopiesArray.kt")
         public void testSpreadCopiesArray() throws Exception {
             runTest("compiler/testData/codegen/box/vararg/spreadCopiesArray.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java

@@ -136,6 +136,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/annotations/resolveWithLowPriorityAnnotation.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargInAnnotation.kt")
+        public void testSingleAssignmentToVarargInAnnotation() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/singleAssignmentToVarargInAnnotation.kt");
+        }
+
         @TestMetadata("varargInAnnotationParameter.kt")
         public void testVarargInAnnotationParameter() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/varargInAnnotationParameter.kt");
@@ -20373,6 +20378,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/vararg/kt796_797.kt");
         }
 
+        @TestMetadata("singleAssignmentToVarargsInFunction.kt")
+        public void testSingleAssignmentToVarargsInFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/vararg/singleAssignmentToVarargsInFunction.kt");
+        }
+
         @TestMetadata("spreadCopiesArray.kt")
         public void testSpreadCopiesArray() throws Exception {
             runTest("compiler/testData/codegen/box/vararg/spreadCopiesArray.kt");