From 6f2b1ecb09291604bb2ffd867b5cd7ae2e3a3bfe Mon Sep 17 00:00:00 2001
From: Anastasiya Shadrina <anastasia.shadrina@jetbrains.com>
Date: Wed, 10 Nov 2021 19:11:34 +0700
Subject: [PATCH] [Tests] Specify custom LF in AbstractVersionRequirementTest

---
 .../serialization/AbstractVersionRequirementTest.kt    |  9 ++++++---
 .../kotlin/serialization/JvmVersionRequirementTest.kt  | 10 +++++++---
 .../serialization/js/JsVersionRequirementTest.kt       |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt
index 90638f25044..be276585535 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractVersionRequirementTest.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.serialization
 
 import org.jetbrains.kotlin.config.AnalysisFlag
+import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -32,11 +33,12 @@ abstract class AbstractVersionRequirementTest : TestCaseWithTmpdir() {
         analysisFlags: Map<AnalysisFlag<*>, Any?> = emptyMap(),
         fqNamesWithRequirements: List<String>,
         fqNamesWithoutRequirement: List<String> = emptyList(),
-        shouldBeSingleRequirement: Boolean = true
+        shouldBeSingleRequirement: Boolean = true,
+        specificFeatures: Map<LanguageFeature, LanguageFeature.State> = emptyMap()
     ) {
         compileFiles(
             listOf(File("compiler/testData/versionRequirement/${getTestName(true)}.kt")),
-            tmpdir, customLanguageVersion, analysisFlags
+            tmpdir, customLanguageVersion, analysisFlags, specificFeatures
         )
         val module = loadModule(tmpdir)
 
@@ -116,7 +118,8 @@ abstract class AbstractVersionRequirementTest : TestCaseWithTmpdir() {
         files: List<File>,
         outputDirectory: File,
         languageVersion: LanguageVersion,
-        analysisFlags: Map<AnalysisFlag<*>, Any?>
+        analysisFlags: Map<AnalysisFlag<*>, Any?>,
+        specificFeatures: Map<LanguageFeature, LanguageFeature.State>
     )
 
     protected abstract fun loadModule(directory: File): ModuleDescriptor
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt
index 7bed7236d56..c8dd3ed8891 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/JvmVersionRequirementTest.kt
@@ -35,7 +35,8 @@ class JvmVersionRequirementTest : AbstractVersionRequirementTest() {
         files: List<File>,
         outputDirectory: File,
         languageVersion: LanguageVersion,
-        analysisFlags: Map<AnalysisFlag<*>, Any?>
+        analysisFlags: Map<AnalysisFlag<*>, Any?>,
+        specificFeatures: Map<LanguageFeature, LanguageFeature.State>
     ) {
         LoadDescriptorUtil.compileKotlinToDirAndGetModule(
             listOf(File("compiler/testData/versionRequirement/${getTestName(true)}.kt")), outputDirectory,
@@ -47,7 +48,7 @@ class JvmVersionRequirementTest : AbstractVersionRequirementTest() {
                         languageVersion,
                         ApiVersion.createByLanguageVersion(languageVersion),
                         analysisFlags.toMap() + mapOf(AnalysisFlags.explicitApiVersion to true),
-                        emptyMap()
+                        specificFeatures
                     )
                 },
                 EnvironmentConfigFiles.JVM_CONFIG_FILES
@@ -180,7 +181,10 @@ class JvmVersionRequirementTest : AbstractVersionRequirementTest() {
                 "test.topLevelFunWithCR",
                 "test.topLevelPropWithCR"
             ),
-            customLanguageVersion = LanguageVersion.KOTLIN_1_7
+            customLanguageVersion = LanguageVersion.KOTLIN_1_7,
+            specificFeatures = mapOf(
+                LanguageFeature.ContextReceivers to LanguageFeature.State.ENABLED
+            )
         )
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt
index 45505d549c9..a00b42cef6f 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt
@@ -36,7 +36,8 @@ class JsVersionRequirementTest : AbstractVersionRequirementTest() {
         files: List<File>,
         outputDirectory: File,
         languageVersion: LanguageVersion,
-        analysisFlags: Map<AnalysisFlag<*>, Any?>
+        analysisFlags: Map<AnalysisFlag<*>, Any?>,
+        specificFeatures: Map<LanguageFeature, LanguageFeature.State>
     ) {
         val environment = createEnvironment(languageVersion)
         val ktFiles = files.map { file ->