Merge pull request #4051 from heathermiller/repl-cp-fix2

SI-6502 Reenables loading jars into the running REPL (regression in 2.10)

2 files changed, 109 insertions, 0 deletions

diff --git a/test/files/run/t6502.check b/test/files/run/t6502.check
new file mode 100644
index 0000000000..95d36ee221
--- /dev/null
+++ b/test/files/run/t6502.check
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000000..ced1b5812d
--- /dev/null
+++ b/test/files/run/t6502.scala
@@ -0,0 +1,101 @@
+import scala.tools.partest._
+import java.io.File
+import scala.tools.nsc.interpreter.ILoop
+
+object Test extends StoreReporterDirectTest {
+  def code = ???
+
+  def compileCode(code: String, jarFileName: String) = {
+    val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
+    compileString(newCompiler("-cp", classpath, "-d", s"${testOutput.path}/$jarFileName"))(code)
+  }
+
+  def app1 = """
+    package test
+
+    object Test extends App {
+      def test(): Unit = {
+        println("testing...")
+      }
+    }"""
+
+  def app2 = """
+    package test
+
+    object Test extends App {
+      def test(): Unit = {
+        println("testing differently...")
+      }
+    }"""
+
+  def app3 = """
+    package test
+
+    object Test3 extends App {
+      def test(): Unit = {
+        println("new object in existing package")
+      }
+    }"""
+
+  def test1(): Unit = {
+    val jar = "test1.jar"
+    compileCode(app1, jar)
+
+    val output = ILoop.run(List(s":require ${testOutput.path}/$jar", "test.Test.test()"))
+    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")
+  }
+
+  def test2(): Unit = {
+    // should reject jars with conflicting entries
+    val jar1 = "test1.jar"
+    val jar2 = "test2.jar"
+    compileCode(app2, jar2)
+
+    val output = ILoop.run(List(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar2"))
+    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")
+  }
+
+  def test3(): Unit = {
+    // should accept jars with overlapping packages, but no conflicts
+    val jar1 = "test1.jar"
+    val jar3 = "test3.jar"
+    compileCode(app3, jar3)
+
+    val output = ILoop.run(List(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar3", "test.Test3.test()"))
+    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")
+  }
+
+  def test4(): Unit = {
+    // twice the same jar should be rejected
+    val jar1   = "test1.jar"
+    val output = ILoop.run(List(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar1"))
+    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")
+
+    println(s"test4 res1: $res1")
+    println(s"test4 res2: $res2")
+  }
+
+  def show(): Unit = {
+    test1()
+    test2()
+    test3()
+    test4()
+  }
+}