feat(java-shell): don't duplicate error message (#1104)

Author: kornilova203

packages/java-shell/src/main/kotlin/com/mongodb/mongosh/MongoShellConverter.kt

@@ -92,7 +92,7 @@ internal class MongoShellConverter(private val context: MongoShellContext, priva
                     if (error.isHostObject && error.asHostObject<Any>() is Throwable) {
                         future.completeExceptionally(error.asHostObject<Any>() as Throwable)
                     } else {
-                        val message = error.toString() + (if (error.instanceOf(context, "Error")) "\n${error.getMember("stack").asString()}" else "")
+                        val message =  if (error.instanceOf(context, "Error")) error.getMember("stack").asString() else error.toString()
                         future.completeExceptionally(Exception(message))
                     }
                 })

packages/java-shell/src/test/kotlin/com/mongodb/mongosh/LiteralsTest.kt

@@ -32,6 +32,7 @@ class LiteralsTest : ShellTestCase() {
     @Test fun testObjectId()      = test()
     @Test fun testString()        = test()
     @Test fun testSymbol()        = test()
+    @Test fun testSyntaxError()   = test()
     @Test fun testTimestamp()     = test()
     @Test fun testUndefined()     = test()
     @Test fun testUnknownSymbol() = test()

packages/java-shell/src/test/kotlin/com/mongodb/mongosh/util.kt

@@ -51,7 +51,8 @@ fun doTest(testName: String, shell: MongoShell, testDataPath: String, db: String
                 val checkResultClass = properties.any { (key, _) -> key == "checkResultClass" }
                 val dontReplaceId = properties.any    { (key, _) -> key == "dontReplaceId" }
                 val dontCheckValue = properties.any   { (key, _) -> key == "dontCheckValue" }
-                val options = CompareOptions(checkResultClass, dontCheckValue, dontReplaceId, properties.mapNotNull { (key, value) ->
+                val printStackTrace = properties.any  { (key, _) -> key == "printStackTrace" }
+                val options = CompareOptions(checkResultClass, dontCheckValue, dontReplaceId, printStackTrace, properties.mapNotNull { (key, value) ->
                     when (key) {
                         "getArrayItem"     -> GetArrayItemCommand(value.toInt())
                         "extractProperty"  -> ExtractPropertyCommand(value)
@@ -89,7 +90,7 @@ fun doTest(testName: String, shell: MongoShell, testDataPath: String, db: String
                     System.err.println("IGNORED:")
                     e.printStackTrace()
                     val message = e.message
-                    val msg = if (message != null && message.contains('\n')) message.substring(0, message.indexOf('\n')) else message
+                    val msg = if (message != null && message.contains('\n') && !cmd.options.printStackTrace) message.substring(0, message.indexOf('\n')) else message
                     sb.append(e.javaClass.name).append(": ").append(msg?.trim())
                 }
             }
@@ -152,7 +153,7 @@ private object AllTypesComparator : Comparator<Any?> {
 }
 
 private class Command(val command: String, val options: CompareOptions)
-private class CompareOptions(val checkResultClass: Boolean, val dontCheckValue: Boolean, val dontReplaceId: Boolean, val commands: List<CompareCommand>)
+private class CompareOptions(val checkResultClass: Boolean, val dontCheckValue: Boolean, val dontReplaceId: Boolean, val printStackTrace: Boolean, val commands: List<CompareCommand>)
 private sealed class CompareCommand
 private class GetArrayItemCommand(val index: Int) : CompareCommand()
 private class ExtractPropertyCommand(val property: String) : CompareCommand()

packages/java-shell/src/test/resources/literal/syntaxError.expected.txt

@@ -0,0 +1,15 @@
+java.lang.Exception: SyntaxError: Missing semicolon. (1:6)
+
+> 1 | select 1;
+    |       ^
+  2 |
+    at Parser._raise (all-standalone.js:18680:17)
+    at Parser.raiseWithData (all-standalone.js:18673:17)
+    at Parser.raise (all-standalone.js:18634:17)
+    at Parser.semicolon (all-standalone.js:27791:10)
+    at Parser.parseExpressionStatement (all-standalone.js:31019:10)
+    at Parser.parseStatementContent (all-standalone.js:30608:19)
+    at Parser.parseStatement (all-standalone.js:30472:17)
+    at Parser.parseBlockOrModuleBlockBody (all-standalone.js:31061:25)
+    at Parser.parseBlockBody (all-standalone.js:31052:10)
+    at Parser.parseProgram (all-standalone.js:30393:10)

packages/java-shell/src/test/resources/literal/syntaxError.js

@@ -0,0 +1,2 @@
+// command printStackTrace
+select 1;