From 08f6b6c93c7535a770b43346441fef801d74f956 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 20 Mar 2017 21:15:19 +0100
Subject: [PATCH] minor: get rid of the compiler-test dependency in
 source-sections test

---
 .../source-sections-compiler.iml              |  1 -
 .../sourceSections/SourceSectionsTest.kt      | 24 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml b/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
index d005e5c5fdb..438a541ddcf 100644
--- a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
+++ b/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
@@ -19,6 +19,5 @@
     <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="module" module-name="daemon-client" scope="TEST" />
     <orderEntry type="module" module-name="daemon-common" scope="TEST" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt b/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt
index 1ec6e3fd624..6b5a1d913eb 100644
--- a/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt
+++ b/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.sourceSections
 
 import com.intellij.openapi.vfs.StandardFileSystems
 import junit.framework.TestCase
-import org.jetbrains.kotlin.cli.AbstractCliTest
+import org.jetbrains.kotlin.cli.common.CLICompiler
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.*
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
@@ -154,10 +154,12 @@ class SourceSectionsTest : TestCaseWithTmpdir() {
 
         sourceToOutput.forEach { (source, expectedOutput) ->
 
-            val args = listOf(source.canonicalPath, "-d", tmpdir.canonicalPath,
-                              "-Xplugin", sourceSectionsPluginJar.canonicalPath,
-                              "-P", TEST_ALLOWED_SECTIONS.joinToString(",") { "plugin:${SourceSectionsCommandLineProcessor.PLUGIN_ID}:${SourceSectionsCommandLineProcessor.SECTIONS_OPTION.name}=$it" })
-            val (output, code) = AbstractCliTest.executeCompilerGrabOutput(K2JVMCompiler(), args)
+            val args = arrayOf(source.canonicalPath, "-d", tmpdir.canonicalPath,
+                               "-Xplugin", sourceSectionsPluginJar.canonicalPath,
+                               "-P", TEST_ALLOWED_SECTIONS.joinToString(",") { "plugin:${SourceSectionsCommandLineProcessor.PLUGIN_ID}:${SourceSectionsCommandLineProcessor.SECTIONS_OPTION.name}=$it" })
+            val (output, code) = captureOut {
+                CLICompiler.doMainNoExit(K2JVMCompiler(), args)
+            }
 
             TestCase.assertEquals("Compilation failed:\n$output", 0, code.code)
 
@@ -221,7 +223,7 @@ class SourceSectionsTest : TestCaseWithTmpdir() {
     private fun verifyScriptOutput(scriptClass: Class<*>?, expectedOutput: File) {
         val scriptOut = captureOut {
             tryConstructClassFromStringArgs(scriptClass!!, emptyList())
-        }
+        }.first
         val expected = expectedOutput.readText()
 
         TestCase.assertEquals(expected, scriptOut)
@@ -238,18 +240,22 @@ internal inline fun withFlagFile(prefix: String, suffix: String? = null, body: (
     }
 }
 
-internal fun captureOut(body: () -> Unit): String {
+internal fun<T> captureOut(body: () -> T): Pair<String, T> {
     val outStream = ByteArrayOutputStream()
     val prevOut = System.out
+    val prevErr = System.err
     System.setOut(PrintStream(outStream))
-    try {
+    System.setErr(PrintStream(outStream))
+    val res =try {
         body()
     }
     finally {
         System.out.flush()
         System.setOut(prevOut)
+        System.err.flush()
+        System.setErr(prevErr)
     }
-    return outStream.toString()
+    return outStream.toString() to res
 }
 
 class TestMessageCollector : MessageCollector {