Make some testing tools from InlinerTest available to other tests

2 files changed, 0 insertions, 20 deletions

diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
index 5c9bd1c188..44b6c7ca9e 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
@@ -22,7 +22,6 @@ object InlinerSeparateCompilationTest {
 @RunWith(classOf[JUnit4])
 class InlinerSeparateCompilationTest {
   import InlinerSeparateCompilationTest._
-  import InlinerTest.{listStringLines, assertInvoke, assertNoInvoke}
 
   @Test
   def inlnieMixedinMember(): Unit = {
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
index 75c1a0d3ad..bf10b88a24 100644
--- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
+++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
@@ -36,31 +36,12 @@ object InlinerTest extends ClearAfterClass.Clearable {
   notPerRun foreach compiler.perRunCaches.unrecordCache
 
   def clear(): Unit = { compiler = null; inlineOnlyCompiler = null }
-
-  implicit class listStringLines[T](val l: List[T]) extends AnyVal {
-    def stringLines = l.mkString("\n")
-  }
-
-  def assertNoInvoke(m: Method): Unit = assertNoInvoke(m.instructions)
-  def assertNoInvoke(ins: List[Instruction]): Unit = {
-    assert(!ins.exists(_.isInstanceOf[Invoke]), ins.stringLines)
-  }
-
-  def assertInvoke(m: Method, receiver: String, method: String): Unit = assertInvoke(m.instructions, receiver, method)
-  def assertInvoke(l: List[Instruction], receiver: String, method: String): Unit = {
-    assert(l.exists {
-      case Invoke(_, `receiver`, `method`, _, _) => true
-      case _ => false
-    }, l.stringLines)
-  }
 }
 
 @RunWith(classOf[JUnit4])
 class InlinerTest extends ClearAfterClass {
   ClearAfterClass.stateToClear = InlinerTest
 
-  import InlinerTest.{listStringLines, assertInvoke, assertNoInvoke}
-
   val compiler = InlinerTest.compiler
   import compiler.genBCode.bTypes._
   import compiler.genBCode.bTypes.backendUtils._