From ecf40e5c7aacd5e6125c4df9e9ee489d470dba73 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <simon.ogorodnik@jetbrains.com>
Date: Wed, 19 Apr 2023 16:30:11 +0000
Subject: [PATCH] Revert "KT-57927: Fix deserialization of
 K2JVMCompilerArguments in FP/MT tests"

This reverts commit f8fdfc5d332b171b0e9e410b09a0b1e30d0d510e.

The change should be reverted as original change of the format in the
K2JVMCompilerArguments was reverted by commit:
5d0bf2de2404cf52879942dd16a4a30ad170cb47

Merge-request: KT-MR-9684
Merged-by: Simon Ogorodnik <Simon.Ogorodnik@gmail.com>
---
 .../kotlin/fir/AbstractModularizedTest.kt     | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt
index d8f571b9350..e87d83e1996 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt
@@ -149,42 +149,8 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() {
         return modules.map { node -> loadModule(node).also { it.arguments = arguments } }
     }
 
-    // TODO: remove once support for snapshot 2022 is ended
-    private fun updateCompilerArgumentsXml(element: Element) {
-        fun convertOptionToList(optionElement: Element) {
-            if (optionElement.getAttribute("value") == null) return
-            val paths = optionElement.getAttributeValue("value").split(":")
-
-            optionElement.removeAttribute("value")
-
-            val listElement = Element("list")
-            paths.forEach { path ->
-                val pathElement = Element("option")
-                pathElement.setAttribute("value", path)
-                listElement.addContent(pathElement)
-            }
-
-            optionElement.addContent(listElement)
-        }
-
-
-        fun findOptionElements(parentElement: Element, optionName: String): List<Element> {
-            return parentElement.getChildren("option")
-                .filter { it.getAttributeValue("name") == optionName }
-        }
-
-        // See KT-57927
-        findOptionElements(element, "classpath").forEach {
-            convertOptionToList(it)
-        }
-        findOptionElements(element, "pluginClasspath").forEach {
-            convertOptionToList(it)
-        }
-    }
-
     private fun loadCompilerArguments(argumentsRoot: Element): CommonCompilerArguments? {
         val element = argumentsRoot.children.singleOrNull() ?: return null
-        updateCompilerArgumentsXml(element)
         return when (element.name) {
             "K2JVMCompilerArguments" -> K2JVMCompilerArguments().also { XmlSerializer.deserializeInto(it, element) }
             else -> null