Merge pull request #379 from ashawley/scala-2.13.2-error-msg

Change test of error message for 2.13.2

Author: SethTisue

jvm/src/test/scala-2.x/scala/xml/CompilerErrors.scala

@@ -4,14 +4,30 @@ import org.junit.Test
 
 class CompilerErrors extends CompilerTesting {
   @Test
-  def t7185() =
-    expectXmlError("""|overloaded method value apply with alternatives:
+  def t7185() = {
+    // Error message 2.13.1 and earlier:
+    // expectXmlError("""|overloaded method value apply with alternatives:
+    //                   |  (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
+    //                   |  (i: Int)scala.xml.Node
+    //                   | cannot be applied to ()""".stripMargin,
+    //  """|object Test {
+    //     |  <e></e>()
+    //     |}""")
+
+    // Error message changed in Scala 2.13.2
+    // https://github.com/scala/scala/pull/8592
+    expectXmlError("overloaded method", // " apply "
+     """|object Test {
+        |  <e></e>()
+        |}""")
+    expectXmlError("""|with alternatives:
                       |  (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
                       |  (i: Int)scala.xml.Node
                       | cannot be applied to ()""".stripMargin,
      """|object Test {
         |  <e></e>()
         |}""")
+  }
 
   @Test
   def t1878_typer() =