1 files changed, 9 insertions, 30 deletions
diff --git a/test/files/run/t6502.scala b/test/files/run/t6502.scala
index f4fc39a03d..cb2b3ff449 100644
--- a/test/files/run/t6502.scala
+++ b/test/files/run/t6502.scala
@@ -1,6 +1,5 @@
 import scala.tools.nsc.Settings
 import scala.tools.nsc.interpreter.{ ILoop, replProps }
-import scala.tools.nsc.settings.ClassPathRepresentationType
 import scala.tools.partest._
 
 object Test extends StoreReporterDirectTest {
@@ -14,14 +13,6 @@ object Test extends StoreReporterDirectTest {
     compileString(newCompiler("-cp", classpath, "-d", s"${testOutput.path}/$jarFileName"))(code)
   }
 
-  // TODO flat classpath doesn't support the classpath invalidation yet so we force using the recursive one
-  // it's the only test which needed such a workaround
-  override def settings = {
-    val settings = new Settings
-    settings.YclasspathImpl.value = ClassPathRepresentationType.Recursive
-    settings
-  }
-
   def app1 = """
     package test
 
@@ -72,9 +63,8 @@ object Test extends StoreReporterDirectTest {
       s"[${added}] in [${output.lines.mkString("/")}]"
     )
     lines      = lines drop promptLength
-    assert {
-      lines.next.contains("testing...")
-    }
+    val r = lines.next
+    assert(r.contains("testing..."), r)
   }
 
   def test2(): Unit = {
@@ -91,14 +81,10 @@ object Test extends StoreReporterDirectTest {
     var lines  = output.lines.drop(headerLength)
     lines      = lines drop promptLength
     val added  = lines.next
-    assert {
-      added.contains("Added") && added.contains("test1.jar")
-    }
+    assert(added.contains("Added") && added.contains("test1.jar"), added)
     lines      = lines drop promptLength
     val msg    = lines.next
-    assert {
-      msg.contains("test2.jar") && msg.contains("existing classpath entries conflict")
-    }
+    assert(msg.contains("test2.jar") && msg.contains("contains a classfile that already exists on the classpath: test.Test$"), msg)
   }
 
   def test3(): Unit = {
@@ -116,13 +102,10 @@ object Test extends StoreReporterDirectTest {
     var lines  = output.lines.drop(headerLength)
     lines      = lines drop promptLength
     val added  = lines.next
-    assert {
-      added.contains("Added") && added.contains("test1.jar")
-    }
+    assert(added.contains("Added") && added.contains("test1.jar"), added)
     lines      = lines drop (2 * promptLength + 1)
-    assert {
-      lines.next.contains("new object in existing package")
-    }
+    val r = lines.next
+    assert(r.contains("new object in existing package"), r)
   }
 
   def test4(): Unit = {
@@ -136,14 +119,10 @@ object Test extends StoreReporterDirectTest {
     var lines  = output.lines.drop(headerLength)
     lines      = lines drop promptLength
     val added  = lines.next
-    assert {
-      added.contains("Added") && added.contains("test1.jar")
-    }
+    assert(added.contains("Added") && added.contains("test1.jar"), added)
     lines      = lines drop promptLength
     val msg    = lines.next
-    assert {
-      msg.contains("test1.jar") && msg.contains("existing classpath entries conflict")
-    }
+    assert(msg.contains("test1.jar") && msg.contains("contains a classfile that already exists on the classpath: test.Test$"), msg)
   }
 
   def test5(): Unit = {