Improved tests

Author: pfcoperez

src/test/scala/scala/tools/refactoring/tests/implementations/ImplementMethodsTest.scala

@@ -7,27 +7,109 @@ import scala.tools.refactoring.tests.util.{TestHelper, TestRefactoring}
 class ImplementMethodsTest extends TestHelper with TestRefactoring {
   outer =>
 
-  val fromSource =
+  def implementMethods(pro: FileSet) = new TestRefactoringImpl(pro) {
+    override val refactoring = new ImplementMethods with TestProjectIndex
+    val changes = performRefactoring(())
+  }.changes
+
+  @Test
+  def implementMethodFromFirstMixing() = new FileSet() {
     """
       |package implementMethods
       |
       |trait T {
       |  def f(x: Int): String
       |}
       |
-      |object Obj extends /*(*/T/*)*/ {
+      |trait S {
+      |  def g(x: Int): Int
+      |}
       |
-      |  def g(x: Int): Int = 1
+      |object Obj extends /*(*/T/*)*/ with S {
+      |  val x: Int = ???
+      |}
+    """.stripMargin becomes
+    """
+      |package implementMethods
+      |
+      |trait T {
+      |  def f(x: Int): String
+      |}
+      |
+      |trait S {
+      |  def g(x: Int): Int
+      |}
+      |
+      |object Obj extends /*(*/T/*)*/ with S {
+      |  val x: Int = ???
+      |
+      |  def f(x: Int): String = {
+      |    ???
+      |  }
+      |}
+    """.stripMargin
+  } applyRefactoring implementMethods
+
+  @Test
+  def implementMethodFromSecondMixing() = new FileSet() {
+    """
+      |package implementMethods
+      |
+      |trait T {
+      |  def f(x: Int): String
+      |}
+      |
+      |trait S {
+      |  def g(x: Int): Int
+      |}
+      |
+      |object Obj extends T with /*(*/S/*)*/ {
+      |  val x: Int = ???
+      |}
+    """.stripMargin becomes
+    """
+      |package implementMethods
+      |
+      |trait T {
+      |  def f(x: Int): String
+      |}
       |
+      |trait S {
+      |  def g(x: Int): Int
+      |}
+      |
+      |object Obj extends T with /*(*/S/*)*/ {
+      |  val x: Int = ???
+      |
+      |  def g(x: Int): Int = {
+      |    ???
+      |  }
       |}
     """.stripMargin
+  } applyRefactoring implementMethods
 
-  val toSource =
+  @Test
+  def implementMethodsNotImplemented() = new FileSet() {
     """
       |package implementMethods
       |
       |trait T {
       |  def f(x: Int): String
+      |  def g(x: Int): Int
+      |}
+      |
+      |object Obj extends /*(*/T/*)*/ {
+      |
+      |  def g(x: Int): Int = 1
+      |
+      |}
+    """.stripMargin becomes
+    """
+      |package implementMethods
+      |
+      |trait T {
+      |  def f(x: Int): String
+      |  def g(x: Int): Int
       |}
       |
       |object Obj extends /*(*/T/*)*/ {
@@ -40,15 +122,6 @@ class ImplementMethodsTest extends TestHelper with TestRefactoring {
       |
       |}
     """.stripMargin
-
-  def implementMethods(pro: FileSet) = new TestRefactoringImpl(pro) {
-    override val refactoring = new ImplementMethods with TestProjectIndex
-    val changes = performRefactoring(())
-  }.changes
-
-  @Test
-  def doRefactor() = new FileSet() {
-    fromSource becomes toSource
   } applyRefactoring implementMethods
 
 }