Fix GradleBuildToolSuite after ANSI tweaks

Previously, the tests assumed that the output from Gradle/Maven went
straight to `System.{out,error}`. Now, the output goes through Moped and
it gets captured for testing purposes.

Author: olafurpg

tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala

@@ -37,7 +37,7 @@ abstract class BaseBuildToolSuite extends MopedSuite(LsifJava.app) {
       original: String,
       expectedSemanticdbFiles: Int = 0,
       extraArguments: List[String] = Nil,
-      expectedError: String = "",
+      expectedError: Option[String => Unit] = None,
       expectedPackages: String = "",
       initCommand: => List[String] = Nil
   ): Unit = {
@@ -59,11 +59,12 @@ abstract class BaseBuildToolSuite extends MopedSuite(LsifJava.app) {
       if (extraArguments.contains("--verbose")) {
         println(app.capturedOutput)
       }
-      if (expectedError.nonEmpty) {
-        assert(clue(exit) != 0, clues(app.capturedOutput))
-        assertNoDiff(app.capturedOutput, expectedError)
-      } else {
-        assertEquals(exit, 0, clues(app.capturedOutput))
+      expectedError match {
+        case Some(fn) =>
+          assert(clue(exit) != 0, clues(app.capturedOutput))
+          fn(app.capturedOutput)
+        case None =>
+          assertEquals(exit, 0, clues(app.capturedOutput))
       }
       val semanticdbFiles =
         if (!Files.isDirectory(targetroot))

tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala

@@ -103,10 +103,13 @@ class GradleBuildToolSuite extends BaseBuildToolSuite {
        |/src/main/java/Example.java
        |public class Example {}
        |""".stripMargin,
-    expectedError =
-      """|info: /workingDirectory/gradlew --init-script /cache/java-toolchains.gradle lsifDetectJavaToolchains
-         |error: lsif-java does not support Gradle 6.7 when used together with Java toolchains. To fix this problem, upgrade to Gradle version 6.8 or newer and try again.
-         |""".stripMargin,
+    expectedError = Some { error =>
+      assert(
+        clue(error).contains(
+          """error: lsif-java does not support Gradle 6.7 when used together with Java toolchains. To fix this problem, upgrade to Gradle version 6.8 or newer and try again."""
+        )
+      )
+    },
     initCommand = gradleVersion("6.7")
   )