Simpler class hiararchy in SimplifyTests to please JUnit

Author: OlivierBlanvillain

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -168,7 +168,7 @@ class CompilationTests extends ParallelTesting {
   @Test def runAll: Unit =
     compileFilesInDir("../tests/run", defaultOptions).checkRuns()
 
-  // The two tests that current fail under -optimise
+  // The two tests that currently fail under -optimise
   @Test def runNotOptimised: Unit =
     compileFilesInDir("../tests/run-not-optimised", defaultOptions.filterNot("-optimise".==)).checkRuns()
 

compiler/test/dotty/tools/dotc/SimplifyTests.scala

@@ -7,19 +7,19 @@ import dotty.tools.dotc.config.CompilerCommand
 import dotty.tools.dotc.core.Contexts.FreshContext
 import scala.tools.asm.tree.MethodNode
 
-class SimplifyPosTests extends DottyBytecodeOptimisedTest with SimplifyEquivalences
-class SimplifyNegTests extends DottyBytecodeTest          with SimplifyEquivalences
+class SimplifyPosTests extends SimplifyTests(optimise = true)
+class SimplifyNegTests extends SimplifyTests(optimise = false)
 
-class DottyBytecodeOptimisedTest extends DottyBytecodeTest {
+abstract class SimplifyTests(val optimise: Boolean) extends DottyBytecodeTest {
   override protected def initializeCtx(c: FreshContext): Unit = {
     super.initializeCtx(c)
-    val flags = Array("-optimise") // :+ "-Xprint:simplify"
-    val summary = CompilerCommand.distill(flags)(c)
-    c.setSettings(summary.sstate)
+    if (optimise) {
+      val flags = Array("-optimise") // :+ "-Xprint:simplify"
+      val summary = CompilerCommand.distill(flags)(c)
+      c.setSettings(summary.sstate)
+    }
   }
-}
 
-trait SimplifyEquivalences { self: DottyBytecodeTest =>
   def check(expr1: String, expr2: String, shared: String = ""): Unit = {
     import ASMConverters._
     val source =
@@ -45,7 +45,7 @@ trait SimplifyEquivalences { self: DottyBytecodeTest =>
       val A = instructions("A")
       val B = instructions("B")
       val diff = diffInstructions(A, B)
-      if (this.isInstanceOf[DottyBytecodeOptimisedTest])
+      if (optimise)
         assert(A == B, s"Bytecode wasn't same:\n$diff")
       else
         assert(A != B, s"Bytecode was the same:\n$diff")