Clean up bytecode testing methods.

1 files changed, 7 insertions, 7 deletions

diff --git a/test/junit/scala/tools/nsc/backend/jvm/IndySammyTest.scala b/test/junit/scala/tools/nsc/backend/jvm/IndySammyTest.scala
index d7c1f191d0..2bcbcc870c 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/IndySammyTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/IndySammyTest.scala
@@ -39,13 +39,13 @@ class IndySammyTest extends BytecodeTesting {
   def test(from: String, to: String, arg: String, body: String => String = x => x)
           (expectedSig: String, lamBody: List[Instruction], appArgs: List[Instruction], ret: Instruction)
           (allowMessage: StoreReporter#Info => Boolean = _ => false) = {
-    val cls = compileClasses(s"${classPrologue(from, to)}")
-    val methodNodes = compileMethods(lamDef(from, to, body) +";"+ appDef(arg), allowMessage)
+    val List(funClass, vcClass, vcCompanion) = compileClasses(s"${classPrologue(from, to)}")
+    val c = compileClass(s"class C { ${lamDef(from, to, body)}; ${appDef(arg)} }", allowMessage = allowMessage)
 
-    val applySig = cls.head.methods.get(0).desc
-    val anonfun = methodNodes.find(_.name contains "$anonfun$").map(convertMethod).get
-    val lamInsn = methodNodes.find(_.name == "lam").map(instructionsFromMethod).get.dropNonOp
-    val applyInvoke = methodNodes.find(_.name == "app").map(convertMethod).get
+    val applySig = getAsmMethod(funClass, "apply").desc
+    val anonfun = getMethod(c, "C$$$anonfun$1")
+    val lamInsn = getInstructions(c, "lam").dropNonOp
+    val applyInvoke = getMethod(c, "app")
 
     assertEquals(expectedSig, applySig)
     assert(lamInsn.length == 2 && lamInsn.head.isInstanceOf[InvokeDynamic], lamInsn)
@@ -140,7 +140,7 @@ class IndySammyTest extends BytecodeTesting {
   // Tests ThisReferringMethodsTraverser
   @Test
   def testStaticIfNoThisReference: Unit = {
-    val methodNodes = compileMethods("def foo = () => () => () => 42")
+    val methodNodes = compileAsmMethods("def foo = () => () => () => 42")
     methodNodes.forall(m => !m.name.contains("anonfun") || (m.access & ACC_STATIC) == ACC_STATIC)
   }
 }