Merge pull request #5192 from dwijnand/wip/scala-repl-no-imports

Fully qualify types in REPL generated code

1 files changed, 19 insertions, 0 deletions

diff --git a/test/junit/scala/tools/nsc/interpreter/ScriptedTest.scala b/test/junit/scala/tools/nsc/interpreter/ScriptedTest.scala
index a8dc8eb3e0..01d17110d6 100644
--- a/test/junit/scala/tools/nsc/interpreter/ScriptedTest.scala
+++ b/test/junit/scala/tools/nsc/interpreter/ScriptedTest.scala
@@ -13,6 +13,14 @@ class ScriptedTest {
     // same as by service discovery
     //new ScriptEngineManager().getEngineByName("scala").asInstanceOf[ScriptEngine with Compilable]
 
+  // scripted, but also -Yno-predef -Yno-imports
+  def scriptedNoNothing: ScriptEngine with Compilable = {
+    val settings = new Settings()
+    settings.noimports.value = true
+    settings.nopredef.value = true
+    Scripted(settings = settings)
+  }
+
   @Test def eval() = {
     val engine = scripted
     engine.put("foo","bar")
@@ -24,6 +32,17 @@ class ScriptedTest {
     assert("barbar" == c.eval())
     assert("bazbaz" == c.eval(bindings))
   }
+  @Test def evalNoNothing() = {
+    val engine = scriptedNoNothing
+    engine.put("foo","bar")
+    assert("bar" == engine.eval("foo"))
+    val bindings = engine.createBindings()
+    bindings.put("foo","baz")
+    assert("baz" == engine.eval("foo", bindings))
+    val c = engine.compile("import scala.Predef.augmentString ; def f = foo.asInstanceOf[java.lang.String] ; f * 2")
+    assert("barbar" == c.eval())
+    assert("bazbaz" == c.eval(bindings))
+  }
   @Test def `SI-7933 multiple eval compiled script`() = {
     val engine = scripted
     val init = """val i = new java.util.concurrent.atomic.AtomicInteger"""