Merge pull request #618 from phiSgr/remove-stray-output

Prevent stray output from reaching stdout

Author: nikpachoo

executors/src/main/kotlin/JUnitExecutors.kt

@@ -22,13 +22,14 @@ class JUnitExecutors {
           jUnitCore.run(request)
         }
         System.setOut(standardOutput)
+
         standardOutput.print(mapper.writeValueAsString(output.groupBy({ it.className }, { it })))
+
       }
       catch (e: Exception) {
-        System.setOut(standardOutput)
-        print("[\"")
+        standardOutput.print("[\"")
         e.printStackTrace()
-        print("\"]")
+        standardOutput.print("\"]")
       }
     }
 

executors/src/main/kotlin/JavaRunnerExecutor.kt

@@ -41,15 +41,13 @@ class JavaRunnerExecutor {
         }
         System.out.flush()
         System.err.flush()
-        System.setOut(defaultOutputStream)
-        outputObj.text = outputStream.toString()
+        outputObj.text = synchronized(outputStream) { outputStream.toString() }
           .replace("</errStream><errStream>".toRegex(), "")
           .replace("</outStream><outStream>".toRegex(), "")
-        print(mapper.writeValueAsString(outputObj))
+        defaultOutputStream.print(mapper.writeValueAsString(outputObj))
       }
       catch (e: Throwable) {
-        System.setOut(defaultOutputStream)
-        System.out.println(mapper.writeValueAsString(RunOutput(exception = e)))
+        defaultOutputStream.println(mapper.writeValueAsString(RunOutput(exception = e)))
       }
     }
   }

executors/src/main/kotlin/OutputStreams.kt

@@ -8,21 +8,21 @@ import kotlin.jvm.Throws
 internal class ErrorStream(private val outputStream: OutputStream) : OutputStream() {
 
   @Throws(IOException::class)
-  override fun write(b: Int) {
+  override fun write(b: Int) = synchronized(outputStream) {
     outputStream.write("<errStream>".toByteArray())
     outputStream.write(b)
     outputStream.write("</errStream>".toByteArray())
   }
 
   @Throws(IOException::class)
-  override fun write(b: ByteArray) {
+  override fun write(b: ByteArray) = synchronized(outputStream) {
     outputStream.write("<errStream>".toByteArray())
     outputStream.write(b)
     outputStream.write("</errStream>".toByteArray())
   }
 
   @Throws(IOException::class)
-  override fun write(b: ByteArray, offset: Int, length: Int) {
+  override fun write(b: ByteArray, offset: Int, length: Int) = synchronized(outputStream) {
     outputStream.write("<errStream>".toByteArray())
     outputStream.write(b, offset, length)
     outputStream.write("</errStream>".toByteArray())
@@ -32,21 +32,21 @@ internal class ErrorStream(private val outputStream: OutputStream) : OutputStrea
 internal class OutStream(private val outputStream: OutputStream) : OutputStream() {
 
   @Throws(IOException::class)
-  override fun write(b: Int) {
+  override fun write(b: Int) = synchronized(outputStream) {
     outputStream.write("<outStream>".toByteArray())
     outputStream.write(b)
     outputStream.write("</outStream>".toByteArray())
   }
 
   @Throws(IOException::class)
-  override fun write(b: ByteArray) {
+  override fun write(b: ByteArray) = synchronized(outputStream) {
     outputStream.write("<outStream>".toByteArray())
     outputStream.write(b)
     outputStream.write("</outStream>".toByteArray())
   }
 
   @Throws(IOException::class)
-  override fun write(b: ByteArray, offset: Int, length: Int) {
+  override fun write(b: ByteArray, offset: Int, length: Int) = synchronized(outputStream) {
     outputStream.write("<outStream>".toByteArray())
     outputStream.write(b, offset, length)
     outputStream.write("</outStream>".toByteArray())

executors/src/main/kotlin/TestListener.kt

@@ -54,7 +54,9 @@ internal class TestListener : RunListener() {
     System.err.flush()
     JUnitExecutors.output[JUnitExecutors.output.size - 1].apply {
       executionTime = System.currentTimeMillis() - startTime
-      output = testOutputStream?.toString().orEmpty()
+      output = testOutputStream?.let {
+        synchronized(it) { it.toString() }
+      }.orEmpty()
         .replace("</errStream><errStream>".toRegex(), "")
         .replace("</outStream><outStream>".toRegex(), "")
     }

src/main/kotlin/com/compiler/server/model/ProgramOutput.kt

@@ -26,14 +26,7 @@ data class ProgramOutput(
       standardOutput.isBlank() -> ExecutionResult()
       else -> {
         try {
-          // coroutines can produce incorrect output. see example in `base coroutines test 7`
-          if (standardOutput.startsWith("{")) outputMapper.readValue(standardOutput, ExecutionResult::class.java)
-          else {
-            val result = outputMapper.readValue("{" + standardOutput.substringAfter("{"), ExecutionResult::class.java)
-            result.apply {
-              text = standardOutput.substringBefore("{") + text
-            }
-          }
+          outputMapper.readValue(standardOutput, ExecutionResult::class.java)
         } catch (e: Exception) {
           ExecutionResult(exception = e.toExceptionDescriptor())
         }

src/test/kotlin/com/compiler/server/CoroutinesRunnerTest.kt

@@ -57,10 +57,11 @@ class CoroutinesRunnerTest : BaseExecutorTest() {
 
   @Test
   fun `base coroutines test 7`() {
-    run(
+    val result = run(
       code = "import kotlinx.coroutines.*\n\nfun main() = runBlocking {\nGlobalScope.launch {\n    repeat(1000) { i ->\n        println(\"I'm sleeping \$i ...\")\n        delay(500L)\n    }\n}\ndelay(1300L) // just quit after delay    \n}",
-      contains = "I'm sleeping 0 ...\nI'm sleeping 1 ...\nI'm sleeping 2 ...\n"
+      contains = ""
     )
+    Assertions.assertEquals("<outStream>I'm sleeping 0 ...\nI'm sleeping 1 ...\nI'm sleeping 2 ...\n</outStream>", result.text)
   }
 
   @Test