Skip to content
This repository was archived by the owner on Sep 3, 2020. It is now read-only.

Commit 8cc9d71

Browse files
committed
Run tests on the compiler thread to make them more stable.
This should fix the recent spurious failures we experienced.
1 parent 620d605 commit 8cc9d71

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

org.scala-refactoring.library/src/test/scala/scala/tools/refactoring/tests/sourcegen/ReusingPrinterTest.scala

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
4444
}
4545

4646
@Test
47-
def add_return_type_to_def() = """
47+
def add_return_type_to_def() = global.ask { () => """
4848
package add_return_type_to_def
4949
object X {
5050
def value = new java.io.File("")
@@ -57,9 +57,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
5757
val newTpt = tpt setOriginal mkReturn(List(tpt.tpe.typeSymbol))
5858
d.copy(tpt = newTpt) replaces d
5959
}}}
60+
}
6061

6162
@Test
62-
def add_return_type_to_val() = """
63+
def add_return_type_to_val() = global.ask { () => """
6364
package add_return_type_to_val
6465
object X {
6566
val value = new java.io.File("")
@@ -73,9 +74,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
7374
val newTpt = tpt setOriginal mkReturn(List(tpt.tpe.typeSymbol))
7475
d.copy(tpt = newTpt) replaces d
7576
}}}
77+
}
7678

7779
@Test
78-
def add_return_type_to_var() = """
80+
def add_return_type_to_var() = global.ask { () => """
7981
package add_return_type_to_var
8082
object X {
8183
var variable = new java.io.File("")
@@ -89,9 +91,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
8991
val newTpt = tpt setOriginal mkReturn(List(tpt.tpe.typeSymbol))
9092
d.copy(tpt = newTpt) replaces d
9193
}}}
94+
}
9295

9396
@Test
94-
def add_override_flag() = """
97+
def add_override_flag() = global.ask { () => """
9598
package add_override_flag
9699
trait T {
97100
def meth: Int
@@ -117,9 +120,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
117120
d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
118121
}
119122
}}
123+
}
120124

121125
@Test
122-
def add_override_final_flags_to_lazy_val() = """
126+
def add_override_final_flags_to_lazy_val() = global.ask { () => """
123127
package add_override_final_flags_to_lazy_val
124128
trait T {
125129
def meth: Int
@@ -145,9 +149,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
145149
d.copy(mods = d.mods.withFlag(Flag.OVERRIDE).withFlag(Flag.FINAL).withFlag(Flag.LAZY).withFlag(Tokens.VAL)) replaces d
146150
}
147151
}}
152+
}
148153

149154
@Test
150-
def add_override_protected_abstract_flag() = """
155+
def add_override_protected_abstract_flag() = global.ask { () => """
151156
package add_override_protected_abstract_flag
152157
trait T {
153158
protected def meth: Int = 0
@@ -173,9 +178,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
173178
d.copy(mods = d.mods.withFlag(Flag.ABSTRACT).withFlag(Flag.OVERRIDE).withFlag(Flag.PROTECTED)) replaces d
174179
}
175180
}}
181+
}
176182

177183
@Test
178-
def add_final_case_flag() = """
184+
def add_final_case_flag() = global.ask { () => """
179185
package add_final_case_flag
180186
class C(i: Int)
181187
""" becomes """
@@ -187,9 +193,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
187193
d.copy(mods = d.mods.withFlag(Flag.FINAL).withFlag(Flag.CASE).withFlag(Flag.PRIVATE)) replaces d
188194
}
189195
}}
196+
}
190197

191198
@Test
192-
def add_modifier_to_def_without_return_type() = """
199+
def add_modifier_to_def_without_return_type() = global.ask { () => """
193200
package add_modifier_to_def_without_return_type
194201
trait T {
195202
def meth: Int
@@ -215,9 +222,10 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
215222
d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
216223
}
217224
}}
225+
}
218226

219227
@Test
220-
def add_modifier_to_val_without_return_type() = """
228+
def add_modifier_to_val_without_return_type() = global.ask { () => """
221229
package add_modifier_to_val_without_return_type
222230
trait T {
223231
def meth: Int
@@ -244,4 +252,5 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
244252
d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
245253
}
246254
}}
255+
}
247256
}

0 commit comments

Comments
 (0)