1 files changed, 29 insertions, 29 deletions

diff --git a/test/junit/scala/issues/OptimizedBytecodeTest.scala b/test/junit/scala/issues/OptimizedBytecodeTest.scala
index b074215534..af1c50acac 100644
--- a/test/junit/scala/issues/OptimizedBytecodeTest.scala
+++ b/test/junit/scala/issues/OptimizedBytecodeTest.scala
@@ -27,8 +27,8 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  def t(): Unit = while (true) m("...")
         |}
       """.stripMargin
-    val List(c) = compileClasses(code)
-    assertSameCode(getSingleMethod(c, "t"), List(Label(0), Jump(GOTO, Label(0))))
+    val c = compileClass(code)
+    assertSameCode(getMethod(c, "t"), List(Label(0), Jump(GOTO, Label(0))))
   }
 
   @Test
@@ -45,12 +45,12 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |    }
         |}
       """.stripMargin
-    val List(c) = compileClasses(code)
+    val c = compileClass(code)
 
-    assertSameSummary(getSingleMethod(c, "t"), List(
+    assertSameSummary(getMethod(c, "t"), List(
       LDC, ASTORE, ALOAD /*0*/, ALOAD /*1*/, "C$$$anonfun$1", IRETURN))
-    assertSameSummary(getSingleMethod(c, "C$$$anonfun$1"), List(LDC, "C$$$anonfun$2", IRETURN))
-    assertSameSummary(getSingleMethod(c, "C$$$anonfun$2"), List(-1 /*A*/, GOTO /*A*/))
+    assertSameSummary(getMethod(c, "C$$$anonfun$1"), List(LDC, "C$$$anonfun$2", IRETURN))
+    assertSameSummary(getMethod(c, "C$$$anonfun$2"), List(-1 /*A*/, GOTO /*A*/))
   }
 
   @Test
@@ -72,7 +72,7 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |}
       """.stripMargin
     val List(c, t, tMod) = compileClasses(code, allowMessage = _.msg.contains("not be exhaustive"))
-    assertSameSummary(getSingleMethod(c, "t"), List(GETSTATIC, "$qmark$qmark$qmark", ATHROW))
+    assertSameSummary(getMethod(c, "t"), List(GETSTATIC, "$qmark$qmark$qmark", ATHROW))
   }
 
   @Test
@@ -109,7 +109,7 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    compileClasses(code)
+    compileToBytes(code)
   }
 
   @Test
@@ -120,7 +120,7 @@ class OptimizedBytecodeTest extends BytecodeTesting {
       """.stripMargin
     val c2 = "class C { def t = warmup.Warmup.filter[Any](x => false) }"
     val List(c, _, _) = compileClassesSeparately(List(c1, c2), extraArgs = compilerArgs)
-    assertInvoke(getSingleMethod(c, "t"), "warmup/Warmup$", "filter")
+    assertInvoke(getMethod(c, "t"), "warmup/Warmup$", "filter")
   }
 
   @Test
@@ -134,7 +134,7 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    compileClasses(code)
+    compileToBytes(code)
   }
 
   @Test
@@ -162,7 +162,7 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    compileClasses(code)
+    compileToBytes(code)
   }
 
   @Test
@@ -178,7 +178,7 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    compileClasses(code)
+    compileToBytes(code)
   }
 
   @Test
@@ -217,8 +217,8 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    val List(c) = compileClasses(code)
-    assertSameSummary(getSingleMethod(c, "t"), List(
+    val c = compileClass(code)
+    assertSameSummary(getMethod(c, "t"), List(
         ALOAD /*1*/, INSTANCEOF /*Some*/, IFNE /*A*/,
         ALOAD /*0*/, "getInt", POP,
         -1 /*A*/, BIPUSH, IRETURN))
@@ -236,8 +236,8 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    val List(c) = compileClasses(code)
-    assertSameSummary(getSingleMethod(c, "t"), List(
+    val c = compileClass(code)
+    assertSameSummary(getMethod(c, "t"), List(
       -1 /*A*/, ILOAD /*1*/, TABLESWITCH,
       -1, ALOAD, "pr", RETURN,
       -1, ALOAD, "pr", RETURN,
@@ -261,8 +261,8 @@ class OptimizedBytecodeTest extends BytecodeTesting {
       """.stripMargin
 
     val cls = compileClassesSeparately(List(c1, c2), extraArgs = compilerArgs)
-    val c = cls.find(_.name == "C").get
-    assertSameSummary(getSingleMethod(c, "t"), List(
+    val c = findClass(cls, "C")
+    assertSameSummary(getMethod(c, "t"), List(
       GETSTATIC, IFNONNULL, ACONST_NULL, ATHROW, // module load and null checks not yet eliminated
       -1, ICONST_1, GETSTATIC, IFNONNULL, ACONST_NULL, ATHROW,
       -1, ICONST_2, IADD, IRETURN))
@@ -299,11 +299,11 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  def f2b() = identity(wrapper2(5))  // not inlined
         |}
       """.stripMargin
-    val List(c) = compileClasses(code, allowMessage = _.msg.contains("exception handler declared in the inlined method"))
-    assertInvoke(getSingleMethod(c, "f1a"), "C", "C$$$anonfun$1")
-    assertInvoke(getSingleMethod(c, "f1b"), "C", "wrapper1")
-    assertInvoke(getSingleMethod(c, "f2a"), "C", "C$$$anonfun$3")
-    assertInvoke(getSingleMethod(c, "f2b"), "C", "wrapper2")
+    val c = compileClass(code, allowMessage = _.msg.contains("exception handler declared in the inlined method"))
+    assertInvoke(getMethod(c, "f1a"), "C", "C$$$anonfun$1")
+    assertInvoke(getMethod(c, "f1b"), "C", "wrapper1")
+    assertInvoke(getMethod(c, "f2a"), "C", "C$$$anonfun$3")
+    assertInvoke(getMethod(c, "f2b"), "C", "wrapper2")
   }
 
   @Test
@@ -317,8 +317,8 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |  def t = mbarray_apply_minibox(null, 0)
         |}
       """.stripMargin
-    val List(c) = compileClasses(code)
-    assertNoInvoke(getSingleMethod(c, "t"))
+    val c = compileClass(code)
+    assertNoInvoke(getMethod(c, "t"))
   }
 
   @Test
@@ -336,7 +336,7 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |class Listt
       """.stripMargin
     val List(c, nil, nilMod, listt) = compileClasses(code)
-    assertInvoke(getSingleMethod(c, "t"), "C", "C$$$anonfun$1")
+    assertInvoke(getMethod(c, "t"), "C", "C$$$anonfun$1")
   }
 
   @Test
@@ -355,13 +355,13 @@ class OptimizedBytecodeTest extends BytecodeTesting {
         |}
       """.stripMargin
     val List(c, f) = compileClasses(code)
-    assertInvoke(getSingleMethod(c, "crash"), "C", "map")
+    assertInvoke(getMethod(c, "crash"), "C", "map")
   }
 
   @Test
   def optimiseEnablesNewOpt(): Unit = {
     val code = """class C { def t = (1 to 10) foreach println }"""
-    val List(c) = readAsmClasses(newCompiler(extraArgs = "-optimise -deprecation").compile(code, allowMessage = _.msg.contains("is deprecated")))
-    assertInvoke(getSingleMethod(c, "t"), "C", "C$$$anonfun$1") // range-foreach inlined from classpath
+    val List(c) = readAsmClasses(newCompiler(extraArgs = "-optimise -deprecation").compileToBytes(code, allowMessage = _.msg.contains("is deprecated")))
+    assertInvoke(getMethod(c, "t"), "C", "C$$$anonfun$1") // range-foreach inlined from classpath
   }
 }