1 files changed, 8 insertions, 15 deletions
diff --git a/test/junit/scala/tools/nsc/backend/jvm/DefaultMethodTest.scala b/test/junit/scala/tools/nsc/backend/jvm/DefaultMethodTest.scala
index 2ce9d21331..c9a958ee4f 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/DefaultMethodTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/DefaultMethodTest.scala
@@ -4,36 +4,29 @@ import org.junit.Assert._
 import org.junit.Test
 
 import scala.collection.JavaConverters
+import scala.collection.JavaConverters._
 import scala.tools.asm.Opcodes
 import scala.tools.asm.tree.ClassNode
-import scala.tools.nsc.backend.jvm.CodeGenTools._
-import JavaConverters._
-import scala.tools.testing.ClearAfterClass
-
-object DefaultMethodTest extends ClearAfterClass.Clearable {
-  var compiler = newCompiler()
-  def clear(): Unit = { compiler = null }
-}
-
-class DefaultMethodTest extends ClearAfterClass {
-  ClearAfterClass.stateToClear = DefaultMethodTest
-  val compiler = DefaultMethodTest.compiler
+import scala.tools.testing.BytecodeTesting
+import scala.tools.testing.BytecodeTesting._
 
+class DefaultMethodTest extends BytecodeTesting {
+  import compiler._
   @Test
   def defaultMethodsViaGenBCode(): Unit = {
-    import compiler._
+    import global._
     val code = "package pack { trait T { def foo: Int }}"
     object makeFooDefaultMethod extends Transformer {
       val Foo = TermName("foo")
       /** Transforms a single tree. */
-      override def transform(tree: compiler.Tree): compiler.Tree = tree match {
+      override def transform(tree: global.Tree): global.Tree = tree match {
         case dd @ DefDef(_, Foo, _, _, _, _) =>
           dd.symbol.setFlag(reflect.internal.Flags.JAVA_DEFAULTMETHOD)
           copyDefDef(dd)(rhs = Literal(Constant(1)).setType(definitions.IntTpe))
         case _ => super.transform(tree)
       }
     }
-    val asmClasses: List[ClassNode] = readAsmClasses(compileTransformed(compiler)(code, Nil, makeFooDefaultMethod.transform(_)))
+    val asmClasses: List[ClassNode] = compiler.compileClassesTransformed(code, Nil, makeFooDefaultMethod.transform(_))
     val foo = asmClasses.head.methods.iterator.asScala.toList.last
     assertTrue("default method should not be abstract", (foo.access & Opcodes.ACC_ABSTRACT) == 0)
     assertTrue("default method body emitted", foo.instructions.size() > 0)