T: Don't unescape test output

Author: mchernyavsky

src/main/kotlin/org/rust/cargo/runconfig/test/CargoTestEventsConverter.kt

@@ -15,7 +15,6 @@ import com.intellij.execution.testframework.sm.ServiceMessageBuilder
 import com.intellij.execution.testframework.sm.runner.OutputToGeneralTestEventsConverter
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
-import com.intellij.openapi.util.text.StringUtil.unescapeStringCharacters
 import com.intellij.openapi.util.text.StringUtil.unquoteString
 import com.intellij.util.execution.ParametersListUtil
 import jetbrains.buildServer.messages.serviceMessages.ServiceMessageVisitor
@@ -119,8 +118,7 @@ class CargoTestEventsConverter(
                 // Parse `rustdoc` test name:
                 // src/lib.rs - qualifiedName (line #i) -> qualifiedName (line #i)
                 val qualifiedName = it.name.substringAfter(" - ")
-                val stdout = it.stdout?.let(::unescape)
-                it.copy(name = "$target::$qualifiedName", stdout = stdout)
+                it.copy(name = "$target::$qualifiedName")
             } ?: return false
         val messages = createServiceMessagesFor(testMessage) ?: return false
         for (message in messages) {
@@ -358,8 +356,8 @@ class CargoTestEventsConverter(
             val message = groups["message"]?.value ?: error("Failed to find `message` capturing group")
 
             val diff = if (groups["sign"]?.value == "==") {
-                val left = groups["left"]?.value?.let(::unescape)
-                val right = groups["right"]?.value?.let(::unescape)
+                val left = groups["left"]?.value?.let(::unquoteString)
+                val right = groups["right"]?.value?.let(::unquoteString)
                 if (left != null && right != null) DiffResult(left, right) else null
             } else {
                 null
@@ -393,8 +391,6 @@ class CargoTestEventsConverter(
     }
 }
 
-private fun unescape(s: String): String = unquoteString(unescapeStringCharacters(s))
-
 private data class FailedTestOutput(val stdout: String, val failedMessage: String)
 private data class ErrorMessage(val message: String, val diff: DiffResult?, val backtrace: String?)
 private data class DiffResult(val left: String, val right: String)

src/test/kotlin/org/rustSlowTests/cargo/runconfig/test/CargoTestNodeInfoTest.kt

@@ -30,7 +30,7 @@ class CargoTestNodeInfoTest : CargoTestRunnerTestBase() {
 
     fun `test multiline string diff`() = checkErrors("""
        assert_eq!("a\naa", "bbb");
-    """, "", Diff("a\naa", "bbb"))
+    """, "", Diff("a\\naa", "bbb"))
 
     fun `test assert_eq with message`() = checkErrors("""
        assert_eq!(1, 2, "`1` != `2`");
@@ -52,26 +52,14 @@ class CargoTestNodeInfoTest : CargoTestRunnerTestBase() {
        assert_ne!(123, 123, "123 == 123");
     """, "123 == 123")
 
+    fun `test don't unescape error messages`() = checkErrors("""
+       assert_eq!("a\\\\b", "a\\b", "`a\\\\b` != `a\\b`");
+    """, "`a\\\\b` != `a\\b`")
+
     @MinRustcVersion("1.39.0")
-    fun `test successful output`() = checkOutput("""
-        println!("
-                   - ");
-    """,
-        output = """
-           - """,
-        shouldPass = true)
-
-    fun `test failed output`() = checkOutput("""
-        println!("
-                   - ");
-        panic!("
-                   - ");
-    """,
-        output = """
-           - 
-
-
-           - """)
+    fun `test don't unescape test output`() = checkOutput("""
+        println!("a\\\\b");
+    """, "a\\\\b")
 
     fun `test root output`() {
         val testProject = buildProject {
@@ -121,7 +109,7 @@ class CargoTestNodeInfoTest : CargoTestRunnerTestBase() {
         }
     }
 
-    private fun checkOutput(@Language("Rust") testFnText: String, output: String, shouldPass: Boolean = false) {
+    private fun checkOutput(@Language("Rust") testFnText: String, output: String, shouldPass: Boolean = true) {
         val testNode = getTestNode(testFnText, shouldPass)
         assertEquals(output, testNode.output.trimEnd('\n'))
     }