2 files changed, 58 insertions, 31 deletions
diff --git a/test/junit/scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala b/test/junit/scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
new file mode 100644
index 0000000000..554e8c0150
--- /dev/null
+++ b/test/junit/scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
@@ -0,0 +1,58 @@
+package scala.tools.nsc
+package transform.patmat
+
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.Test
+import scala.tools.asm.Opcodes._
+import org.junit.Assert._
+
+import scala.tools.nsc.backend.jvm.AsmUtils._
+import scala.tools.nsc.backend.jvm.CodeGenTools
+import scala.tools.testing.AssertUtil._
+
+import CodeGenTools._
+import scala.tools.partest.ASMConverters
+import ASMConverters._
+import scala.tools.testing.ClearAfterClass
+
+object PatmatBytecodeTest extends ClearAfterClass.Clearable {
+  var compiler = newCompiler()
+  var optCompiler = newCompiler(extraArgs = "-Yopt:l:method")
+  def clear(): Unit = { compiler = null; optCompiler = null }
+}
+
+@RunWith(classOf[JUnit4])
+class PatmatBytecodeTest extends ClearAfterClass {
+  ClearAfterClass.stateToClear = PatmatBytecodeTest
+
+  val compiler = PatmatBytecodeTest.compiler
+  val optCompiler = PatmatBytecodeTest.optCompiler
+
+  @Test
+  def t6956(): Unit = {
+    val code =
+      """class C {
+        |  private[this] final val ONE = 1
+        |
+        |  def s1(i: Byte): Int = i match {
+        |    case ONE => 1
+        |    case 2 => 2
+        |    case 3 => 3
+        |    case _ => 0
+        |  }
+        |
+        |  def s2(i: Byte): Int = i match {
+        |    case 1 => 1
+        |    case 2 => 2
+        |    case 3 => 3
+        |    case _ => 0
+        |  }
+        |}
+      """.stripMargin
+
+    val List(c) = compileClasses(compiler)(code)
+    assert(getSingleMethod(c, "s1").instructions.count(_.opcode == TABLESWITCH) == 1, textify(c))
+    assert(getSingleMethod(c, "s2").instructions.count(_.opcode == TABLESWITCH) == 1, textify(c))
+  }
+}
diff --git a/test/pending/run/t6956.scala b/test/pending/run/t6956.scala
deleted file mode 100644
index 57d721807d..0000000000
--- a/test/pending/run/t6956.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-import scala.tools.partest.IcodeComparison
-
-class Switches {
-  private[this] final val ONE = 1
-
-  def switchBad(i: Byte): Int = i match {
-    case ONE => 1
-    case 2 => 2
-    case 3 => 3
-    case _ => 0
-  }
-
-  def switchOkay(i: Byte): Int = i match {
-    case 1 => 1
-    case 2 => 2
-    case 3 => 3
-    case _ => 0
-  }
-}
-
-object Test extends IcodeComparison {
-  // ensure we get two switches out of this -- ignore the rest of the output for robustness
-  // exclude the constant we emit for the "SWITCH ..." string below (we get the icode for all the code you see in this file)
-  override def show() = {
-    val expected = 2
-    val actual = (collectIcode() filter {
-      x => x.indexOf("SWITCH ...") >= 0 && x.indexOf("CONSTANT(") == -1
-    }).size
-    assert(actual == expected, s"switches expected: $expected, actual: $actual")
-  }
-}