From cd0012c5274fa14297ecf8f09d68b80e2bfa6cd4 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Thu, 13 Feb 2020 09:23:37 +0300
Subject: [PATCH] [NI-MIGRATE] Update CLI tests

---
 .../cli/jvm/newInferenceImpliesSamConversions.out      |  6 +++---
 .../newInferenceWithOldFlagImpliesSamConversions.out   |  6 +++---
 ...nversionsAreDisabledExplicitlyWithNewInference.args |  3 ++-
 ...onversionsAreDisabledExplicitlyWithNewInference.out | 10 +++++++++-
 .../cli/jvm/standaloneSamConversionsBaseline_1_3.args  |  4 +++-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out
index 5ef5c1a5788..ab51f06e1c5 100644
--- a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out
+++ b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out
@@ -7,7 +7,7 @@ This mode is not recommended for production use,
 as no stability/compatibility guarantees are given on
 compiler or generated code. Use it at your own risk!
 
-compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt:4:9: error: type mismatch: inferred type is () -> Unit but Runnable was expected
-    foo { }
+compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt:1:9: warning: parameter 'r' is never used
+fun foo(r: Runnable) {}
         ^
-COMPILATION_ERROR
+OK
diff --git a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out b/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out
index f87792ab1ad..45e1b102f14 100644
--- a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out
+++ b/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt:4:9: error: type mismatch: inferred type is () -> Unit but Runnable was expected
-    foo { }
+compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt:1:9: warning: parameter 'r' is never used
+fun foo(r: Runnable) {}
         ^
-COMPILATION_ERROR
+OK
diff --git a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args b/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args
index a5c4338283f..bead449c30c 100644
--- a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args
+++ b/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args
@@ -1,4 +1,5 @@
 $TESTDATA_DIR$/standaloneSamConversionsAreEnabledWithNewInference.kt
 -d
 $TEMP_DIR$
--Xnew-inference -XXLanguage\:-SamConversionPerArgument
+-Xnew-inference
+-XXLanguage\:-SamConversionPerArgument
diff --git a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.out b/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.out
index d83ef45f7de..8f5a386bea2 100644
--- a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.out
+++ b/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.out
@@ -1,4 +1,12 @@
-warning: flag is not supported by this version of the compiler: -Xnew-inference -XXLanguage:-SamConversionPerArgument
+warning: ATTENTION!
+This build uses unsafe internal compiler arguments:
+
+-XXLanguage:-SamConversionPerArgument
+
+This mode is not recommended for production use,
+as no stability/compatibility guarantees are given on
+compiler or generated code. Use it at your own risk!
+
 compiler/testData/cli/jvm/standaloneSamConversionsAreEnabledWithNewInference.kt:9:25: error: type mismatch: inferred type is () -> Unit but Runnable was expected
     ForceSam.compare(r, {})
                         ^
diff --git a/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.args b/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.args
index 27788462fdc..b0959da93b9 100644
--- a/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.args
+++ b/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.args
@@ -1,3 +1,5 @@
 $TESTDATA_DIR$/standaloneSamConversionsAreEnabledWithNewInference.kt
 -d
-$TEMP_DIR$
\ No newline at end of file
+$TEMP_DIR$
+-language-version
+1.3
\ No newline at end of file