SI-9740 Repl import fix -Yrepl-class-based

Under `-Yrepl-class-based`, templating must follow the same scoping
as under traditional object-based. The new test shows a typical
case where two values of the same simple name must be imported in
different scopes.

1 files changed, 6 insertions, 9 deletions

diff --git a/test/files/run/repl-javap-app.scala b/test/files/run/repl-javap-app.scala
index ad6076c2d5..f7e3baa2a1 100644
--- a/test/files/run/repl-javap-app.scala
+++ b/test/files/run/repl-javap-app.scala
@@ -8,14 +8,11 @@ object MyApp extends App {
 object Test extends ReplTest {
   def code = ":javap -app MyApp$"
 
-  override def welcoming = true
-
-  // The constant pool indices are not the same for GenASM / GenBCode, so
-  // replacing the exact numbers by XX.
-  lazy val hasConstantPoolRef = """(.*)(#\d\d)(.*)""".r
-
-  override def normalize(s: String) = s match {
-    case hasConstantPoolRef(start, ref, end) => start + "#XX" + end
-    case _ => super.normalize(s)
+  override def show() = {
+    val coded  = "Code:"
+    val strung = "String Hello, delayed world."
+    val lines  = eval().toList
+    assert (lines.count(s => s.endsWith(coded)) == 1)
+    assert (lines.count(s => s.endsWith(strung)) == 1)
   }
 }