diff --git a/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddMissingOverrideTest.scala b/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddMissingOverrideTest.scala index 648f1bd030..0f88d96c47 100644 --- a/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddMissingOverrideTest.scala +++ b/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddMissingOverrideTest.scala @@ -21,6 +21,7 @@ class AddMissingOverrideTest { @Test def no_change_when_nothing_is_overriden() = """^ + package no_change_when_nothing_is_overriden trait T trait TT extends T { def meth = 0 @@ -28,6 +29,7 @@ class AddMissingOverrideTest { type Type = Int } """ becomes """^ + package no_change_when_nothing_is_overriden trait T trait TT extends T { def meth = 0 @@ -38,6 +40,7 @@ class AddMissingOverrideTest { @Test def no_change_when_everything_is_already_overriden() = """^ + package no_change_when_everything_is_already_overriden trait T { def meth: Int val value: Int @@ -49,6 +52,7 @@ class AddMissingOverrideTest { override type Type = Int } """ becomes """^ + package no_change_when_everything_is_already_overriden trait T { def meth: Int val value: Int @@ -63,6 +67,7 @@ class AddMissingOverrideTest { @Test def add_override_to_method() = """^ + package add_override_to_method trait T { def meth: Int } @@ -70,6 +75,7 @@ class AddMissingOverrideTest { def meth = 0 } """ becomes """^ + package add_override_to_method trait T { def meth: Int } @@ -80,6 +86,7 @@ class AddMissingOverrideTest { @Test def add_override_to_value() = """^ + package add_override_to_value trait T { val value: Int } @@ -87,6 +94,7 @@ class AddMissingOverrideTest { val value = 0 } """ becomes """^ + package add_override_to_value trait T { val value: Int } @@ -97,6 +105,7 @@ class AddMissingOverrideTest { @Test def add_override_to_type() = """^ + package add_override_to_type trait T { type Type } @@ -104,6 +113,7 @@ class AddMissingOverrideTest { type Type = Int } """ becomes """^ + package add_override_to_type trait T { type Type } @@ -114,6 +124,7 @@ class AddMissingOverrideTest { @Test def no_change_for_override_abstract() = """^ + package no_change_for_override_abstract trait T { def f = 0 } @@ -121,6 +132,7 @@ class AddMissingOverrideTest { abstract override def f = super.f+0 } """ becomes """^ + package no_change_for_override_abstract trait T { def f = 0 } @@ -131,12 +143,14 @@ class AddMissingOverrideTest { @Test def add_override_modifier_to_constructor_param() = """^ + package add_override_modifier_to_constructor_param trait T { def meth: Int } case class C(val meth: Int) extends T class D(val meth: Int) extends T """ becomes """^ + package add_override_modifier_to_constructor_param trait T { def meth: Int } @@ -146,12 +160,14 @@ class AddMissingOverrideTest { @Test def add_val_keyword_when_override_modifier_is_added_to_constructor_param() = """^ + package add_val_keyword_when_override_modifier_is_added_to_constructor_param trait T { def meth: Int } case class C(meth: Int) extends T class D(meth: Int) extends T """ becomes """^ + package add_val_keyword_when_override_modifier_is_added_to_constructor_param trait T { def meth: Int } @@ -161,6 +177,7 @@ class AddMissingOverrideTest { @Test def no_change_to_constructor_param_when_nothing_is_overriden() = """^ + package no_change_to_constructor_param_when_nothing_is_overriden trait T { def meth: Int } @@ -168,6 +185,7 @@ class AddMissingOverrideTest { class C(meth: Int) class D(meth: Int, func: Int) extends T """ becomes """^ + package no_change_to_constructor_param_when_nothing_is_overriden trait T { def meth: Int } @@ -178,6 +196,7 @@ class AddMissingOverrideTest { @Test @Ignore("Unimplemented. See ticket #1002222") def add_override_to_symbols_from_self_references() = """^ + package add_override_to_symbols_from_self_references trait T { def meth: Int } @@ -186,6 +205,7 @@ class AddMissingOverrideTest { def meth = 0 } """ becomes """^ + package add_override_to_symbols_from_self_references trait T { def meth: Int } @@ -197,6 +217,7 @@ class AddMissingOverrideTest { @Test def add_override_to_lazy_val() = """^ + package add_override_to_lazy_val trait T { def f: Int } @@ -204,6 +225,7 @@ class AddMissingOverrideTest { lazy val f = 0 } """ becomes """^ + package add_override_to_lazy_val trait T { def f: Int } @@ -214,6 +236,7 @@ class AddMissingOverrideTest { @Test def add_no_override_to_var_that_overrides_non_var() = """^ + package add_no_override_to_var_that_overrides_non_var trait T { def f: Int } @@ -221,6 +244,7 @@ class AddMissingOverrideTest { var f = 0 } """ becomes """^ + package add_no_override_to_var_that_overrides_non_var trait T { def f: Int } @@ -231,6 +255,7 @@ class AddMissingOverrideTest { @Test def add_override_to_var_that_overrides_a_var() = """^ + package add_override_to_var_that_overrides_a_var trait T { var f: Int } @@ -238,6 +263,7 @@ class AddMissingOverrideTest { var f = 0 } """ becomes """^ + package add_override_to_var_that_overrides_a_var trait T { var f: Int } diff --git a/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddReturnTypeToPublicSymbolsTest.scala b/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddReturnTypeToPublicSymbolsTest.scala index 5af1c44b20..b9c5a317d1 100644 --- a/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddReturnTypeToPublicSymbolsTest.scala +++ b/org.scala-ide.sdt.core.tests/src/org/scalaide/extensions/saveactions/AddReturnTypeToPublicSymbolsTest.scala @@ -19,12 +19,14 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_if_it_already_exists() = """^ + package add_no_return_type_if_it_already_exists class X { def meth: java.io.File = new java.io.File("") val value: java.io.File = new java.io.File("") var variable: java.io.File = new java.io.File("") } """ becomes """^ + package add_no_return_type_if_it_already_exists class X { def meth: java.io.File = new java.io.File("") val value: java.io.File = new java.io.File("") @@ -34,10 +36,12 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_to_private_def() = """^ + package add_no_return_type_to_private_def class X { private def meth = new java.io.File("") } """ becomes """^ + package add_no_return_type_to_private_def class X { private def meth = new java.io.File("") } @@ -45,10 +49,12 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_to_private_val() = """^ + package add_no_return_type_to_private_val class X { private val value = new java.io.File("") } """ becomes """^ + package add_no_return_type_to_private_val class X { private val value = new java.io.File("") } @@ -56,10 +62,12 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_to_private_var() = """^ + package add_no_return_type_to_private_var class X { private var variable = new java.io.File("") } """ becomes """^ + package add_no_return_type_to_private_var class X { private var variable = new java.io.File("") } @@ -67,6 +75,7 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_to_nested_def() = """^ + package add_no_return_type_to_nested_def class X { def meth: java.io.File = { def m = new java.io.File("") @@ -78,6 +87,7 @@ class AddReturnTypeToPublicSymbolsTest { } } """ becomes """^ + package add_no_return_type_to_nested_def class X { def meth: java.io.File = { def m = new java.io.File("") @@ -92,6 +102,7 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_to_nested_val() = """^ + package add_no_return_type_to_nested_val class X { val value: java.io.File = { val m = new java.io.File("") @@ -103,6 +114,7 @@ class AddReturnTypeToPublicSymbolsTest { } } """ becomes """^ + package add_no_return_type_to_nested_val class X { val value: java.io.File = { val m = new java.io.File("") @@ -117,6 +129,7 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_to_nested_var() = """^ + package add_no_return_type_to_nested_var class X { var variable: java.io.File = { var m = new java.io.File("") @@ -128,6 +141,7 @@ class AddReturnTypeToPublicSymbolsTest { } } """ becomes """^ + package add_no_return_type_to_nested_var class X { var variable: java.io.File = { var m = new java.io.File("") @@ -142,10 +156,12 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_return_type_to_public_def() = """^ + package add_return_type_to_public_def class X { def meth = new java.io.File("") } """ becomes """^ + package add_return_type_to_public_def class X { def meth: java.io.File = new java.io.File("") } @@ -153,10 +169,12 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_return_type_to_public_val() = """^ + package add_return_type_to_public_val class X { val value = new java.io.File("") } """ becomes """^ + package add_return_type_to_public_val class X { val value: java.io.File = new java.io.File("") } @@ -164,10 +182,12 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_return_type_to_public_var() = """^ + package add_return_type_to_public_var class X { val variable = new java.io.File("") } """ becomes """^ + package add_return_type_to_public_var class X { val variable: java.io.File = new java.io.File("") } @@ -175,6 +195,7 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_return_type_if_def_belongs_to_inner_class() = """^ + package add_return_type_if_def_belongs_to_inner_class class X { class Y { trait Z1 { @@ -189,6 +210,7 @@ class AddReturnTypeToPublicSymbolsTest { } } """ becomes """^ + package add_return_type_if_def_belongs_to_inner_class class X { class Y { trait Z1 { @@ -206,6 +228,7 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_if_def_belongs_to_private_inner_class() = """^ + package add_no_return_type_if_def_belongs_to_private_inner_class class X { private class Y { trait Z1 { @@ -220,6 +243,7 @@ class AddReturnTypeToPublicSymbolsTest { } } """ becomes """^ + package add_no_return_type_if_def_belongs_to_private_inner_class class X { private class Y { trait Z1 { @@ -237,6 +261,7 @@ class AddReturnTypeToPublicSymbolsTest { @Test def add_no_return_type_to_refinement_types() = """^ + package add_no_return_type_to_refinement_types class X { val t = new T { def meth = 0 @@ -249,6 +274,7 @@ class AddReturnTypeToPublicSymbolsTest { def meth: Int } """ becomes """^ + package add_no_return_type_to_refinement_types class X { val t = new T { def meth = 0