Skip to content

Commit

Permalink
Add tests for AddMissingOverride
Browse files Browse the repository at this point in the history
  • Loading branch information
kiritsuku committed Sep 2, 2014
1 parent e341031 commit bebdc8a
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
package org.scalaide.extensions.saveactions

import org.scalaide.core.compiler.ScalaPresentationCompiler
import scala.reflect.internal.util.SourceFile
import org.junit.Test

object AddMissingOverrideTest extends CompilerSaveActionTests {
override def saveAction(spc: ScalaPresentationCompiler, tree: ScalaPresentationCompiler#Tree, sf: SourceFile, selectionStart: Int, selectionEnd: Int) =
new AddMissingOverride {
override val global = spc
override val sourceFile = sf
override val selection = new FileSelection(
sf.file, tree.asInstanceOf[global.Tree], selectionStart, selectionEnd)
}
}

class AddMissingOverrideTest {
import AddMissingOverrideTest._

@Test
def no_change_when_nothing_is_overriden() = """^
trait T
trait TT extends T {
def meth = 0
val value = 0
type Type = Int
}
""" becomes """^
trait T
trait TT extends T {
def meth = 0
val value = 0
type Type = Int
}
""" after SaveEvent

@Test
def no_change_when_everything_is_already_overriden() = """^
trait T {
def meth: Int
val value: Int
type Type
}
trait TT extends T {
override def meth = 0
override val value = 0
override type Type = Int
}
""" becomes """^
trait T {
def meth: Int
val value: Int
type Type
}
trait TT extends T {
override def meth = 0
override val value = 0
override type Type = Int
}
""" after SaveEvent

@Test
def add_override_to_method() = """^
trait T {
def meth: Int
}
trait TT extends T {
def meth = 0
}
""" becomes """^
trait T {
def meth: Int
}
trait TT extends T {
override def meth = 0
}
""" after SaveEvent

@Test
def add_override_to_value() = """^
trait T {
val value: Int
}
trait TT extends T {
val value = 0
}
""" becomes """^
trait T {
val value: Int
}
trait TT extends T {
override val value = 0
}
""" after SaveEvent

@Test
def add_override_to_type() = """^
trait T {
type Type
}
trait TT extends T {
type Type = Int
}
""" becomes """^
trait T {
type Type
}
trait TT extends T {
override type Type = Int
}
""" after SaveEvent
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import org.junit.runners.Suite
@RunWith(classOf[Suite])
@Suite.SuiteClasses(Array(
classOf[RemoveTrailingWhitespaceTest],
classOf[AddNewLineAtEndOfFileTest]
classOf[AddNewLineAtEndOfFileTest],
classOf[AddMissingOverrideTest]
))
class SaveActionTestSuite
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.scalaide.core.internal.extensions.saveactions

import org.scalaide.core.compiler.ScalaPresentationCompiler
import scala.reflect.internal.util.SourceFile
import org.scalaide.extensions.CompilerSupport

import org.scalaide.core.compiler.ScalaPresentationCompiler
import org.scalaide.extensions.saveactions.AddMissingOverride

object AddMissingOverrideCreator {
Expand All @@ -18,4 +18,4 @@ object AddMissingOverrideCreator {
override val selection = new FileSelection(
sf.file, t.asInstanceOf[global.Tree], selectionStart, selectionEnd)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ object AddMissingOverrideSetting extends SaveActionSetting(
trait AddMissingOverride extends SaveAction with CompilerSupport {
import global._

def setting = AddMissingOverrideSetting
override def setting = AddMissingOverrideSetting

def perform() = {
override def perform() = {
val symbolWithoutOverride = filter {
case d: ValDef =>
val getter = d.symbol.getterIn(d.symbol.owner)
Expand Down Expand Up @@ -57,4 +57,4 @@ trait AddMissingOverride extends SaveAction with CompilerSupport {
}
transformFile(refactoring)
}
}
}

0 comments on commit bebdc8a

Please sign in to comment.