1 files changed, 10 insertions, 10 deletions
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
index ddd95ddc02..218b02f822 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
@@ -26,9 +26,9 @@ class ClosureOptimizerTest extends BytecodeTesting {
         |}
       """.stripMargin
 
-    val List(c) = compileClasses(code)
-    val t = findAsmMethod(c, "t")
-    val List(bodyCall) = findInstr(t, "INVOKESTATIC C.C$$$anonfun$1 ()Lscala/runtime/Nothing$")
+    val c = compileClass(code)
+    val t = getAsmMethod(c, "t")
+    val bodyCall = findInstr(t, "INVOKESTATIC C.C$$$anonfun$1 ()Lscala/runtime/Nothing$")
     assert(bodyCall.getNext.getOpcode == ATHROW)
   }
 
@@ -42,9 +42,9 @@ class ClosureOptimizerTest extends BytecodeTesting {
         |}
       """.stripMargin
 
-    val List(c) = compileClasses(code)
-    val t = findAsmMethod(c, "t")
-    val List(bodyCall) = findInstr(t, "INVOKESTATIC C.C$$$anonfun$1 ()Lscala/runtime/Null$")
+    val c = compileClass(code)
+    val t = getAsmMethod(c, "t")
+    val bodyCall = findInstr(t, "INVOKESTATIC C.C$$$anonfun$1 ()Lscala/runtime/Null$")
     assert(bodyCall.getNext.getOpcode == POP)
     assert(bodyCall.getNext.getNext.getOpcode == ACONST_NULL)
   }
@@ -59,8 +59,8 @@ class ClosureOptimizerTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    val List(c) = compileClasses(code)
-    assertSameCode(getSingleMethod(c, "t"),
+    val c = compileClass(code)
+    assertSameCode(getMethod(c, "t"),
       List(VarOp(ALOAD, 1), Invoke(INVOKEVIRTUAL, "scala/collection/immutable/List", "head", "()Ljava/lang/Object;", false),
         TypeOp(CHECKCAST, "java/lang/String"), Invoke(INVOKESTATIC, "C", "C$$$anonfun$1", "(Ljava/lang/String;)Ljava/lang/String;", false),
         Op(ARETURN)))
@@ -80,7 +80,7 @@ class ClosureOptimizerTest extends BytecodeTesting {
         |  }
         |}
       """.stripMargin
-    val List(c) = compileClasses(code)
-    assertSameSummary(getSingleMethod(c, "t"), List(NEW, DUP, LDC, "<init>", ATHROW))
+    val c = compileClass(code)
+    assertSameSummary(getMethod(c, "t"), List(NEW, DUP, LDC, "<init>", ATHROW))
   }
 }