Merge pull request #4251 from retronym/ticket/6502

SI-6502 More robust REPL :require

2 files changed, 50 insertions, 28 deletions

diff --git a/test/files/run/t6502.check b/test/files/run/t6502.check
deleted file mode 100644
index 95d36ee221..0000000000
--- a/test/files/run/t6502.check
+++ /dev/null
@@ -1,8 +0,0 @@
-test1 res1: true
-test1 res2: true
-test2 res1: true
-test2 res2: true
-test3 res1: true
-test3 res2: true
-test4 res1: true
-test4 res2: true
diff --git a/test/files/run/t6502.scala b/test/files/run/t6502.scala
index 4ce034a482..52fabef6b8 100644
--- a/test/files/run/t6502.scala
+++ b/test/files/run/t6502.scala
@@ -46,6 +46,12 @@ object Test extends StoreReporterDirectTest {
       }
     }"""
 
+  def app6 = """
+    package test6
+    class A extends Test { println("created test6.A") }
+    class Z extends Test { println("created test6.Z") }
+    trait Test"""
+
   def test1(): Unit = {
     val jar = "test1.jar"
     compileCode(app1, jar)
@@ -53,11 +59,12 @@ object Test extends StoreReporterDirectTest {
     val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar", "test.Test.test()")
     val output = ILoop.run(codeToRun, settings)
     val lines  = output.split("\n")
-    val res1   = lines(4).contains("Added") && lines(4).contains("test1.jar")
-    val res2   = lines(lines.length-3).contains("testing...")
-
-    println(s"test1 res1: $res1")
-    println(s"test1 res2: $res2")
+    assert {
+      lines(4).contains("Added") && lines(4).contains("test1.jar")
+    }
+    assert {
+      lines(lines.length-3).contains("testing...")
+    }
   }
 
   def test2(): Unit = {
@@ -69,11 +76,12 @@ object Test extends StoreReporterDirectTest {
     val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar2")
     val output = ILoop.run(codeToRun, settings)
     val lines  = output.split("\n")
-    val res1   = lines(4).contains("Added") && lines(4).contains("test1.jar")
-    val res2   = lines(lines.length-3).contains("test2.jar") && lines(lines.length-3).contains("existing classpath entries conflict")
-
-    println(s"test2 res1: $res1")
-    println(s"test2 res2: $res2")
+    assert {
+      lines(4).contains("Added") && lines(4).contains("test1.jar")
+    }
+    assert {
+      lines(lines.length-3).contains("test2.jar") && lines(lines.length-3).contains("existing classpath entries conflict")
+    }
   }
 
   def test3(): Unit = {
@@ -85,11 +93,12 @@ object Test extends StoreReporterDirectTest {
     val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar3", "test.Test3.test()")
     val output = ILoop.run(codeToRun, settings)
     val lines  = output.split("\n")
-    val res1   = lines(4).contains("Added") && lines(4).contains("test1.jar")
-    val res2   = lines(lines.length-3).contains("new object in existing package")
-
-    println(s"test3 res1: $res1")
-    println(s"test3 res2: $res2")
+    assert {
+      lines(4).contains("Added") && lines(4).contains("test1.jar")
+    }
+    assert {
+      lines(lines.length-3).contains("new object in existing package")
+    }
   }
 
   def test4(): Unit = {
@@ -98,11 +107,30 @@ object Test extends StoreReporterDirectTest {
     val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar1")
     val output = ILoop.run(codeToRun, settings)
     val lines  = output.split("\n")
-    val res1   = lines(4).contains("Added") && lines(4).contains("test1.jar")
-    val res2   = lines(lines.length-3).contains("test1.jar") && lines(lines.length-3).contains("existing classpath entries conflict")
+    assert {
+      lines(4).contains("Added") && lines(4).contains("test1.jar")
+    }
+    assert {
+      lines(lines.length-3).contains("test1.jar") && lines(lines.length-3).contains("existing classpath entries conflict")
+    }
+  }
 
-    println(s"test4 res1: $res1")
-    println(s"test4 res2: $res2")
+  def test5(): Unit = {
+    val codeToRun = ":require /does/not/exist.jar"
+    val output = ILoop.run(codeToRun, settings)
+    assert(!output.contains("NullPointerException"), output)
+    assert(output.contains("Cannot load '/does/not/exist.jar'"), output)
+  }
+
+  def test6(): Unit = {
+    // Avoid java.lang.NoClassDefFoundError triggered by the old appoach of using a Java
+    // classloader to parse .class files in order to read their names.
+    val jar = "test6.jar"
+    compileCode(app6, jar)
+    val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar", "import test6._; new A; new Z")
+    val output = ILoop.run(codeToRun, settings)
+    assert(output.contains("created test6.A"), output)
+    assert(output.contains("created test6.Z"), output)
   }
 
   def show(): Unit = {
@@ -110,7 +138,9 @@ object Test extends StoreReporterDirectTest {
     test2()
     test3()
     test4()
+    test5()
+    test6()
   }
 
-  def toCodeInSeparateLines(lines: String*): String = lines.map(_ + "\n").mkString
+  def toCodeInSeparateLines(lines: String*): String = lines mkString "\n"
 }