Wrap refactoring logic in ask calls to prevent race conditions

kiritsuku · kiritsuku · commit d09cab8e8f76 · 2014-08-19T12:05:42.000+02:00
diff --git a/org.scala-refactoring.library/src/test/scala/scala/tools/refactoring/tests/sourcegen/ReusingPrinterTest.scala b/org.scala-refactoring.library/src/test/scala/scala/tools/refactoring/tests/sourcegen/ReusingPrinterTest.scala
@@ -26,7 +26,7 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
     def printsTo(expectedOutput: String): Unit = {
       val sourceFile = new BatchSourceFile("noname", expectedOutput)
       val expected = stripWhitespacePreservers(expectedOutput).trim()
-      val actual = generate(original, sourceFile = Some(sourceFile)).asText.trim()
+      val actual = ask { () => generate(original, sourceFile = Some(sourceFile)).asText.trim() }
       if (actual != expected)
         throw new ComparisonFailure("", expected, actual)
     }
@@ -36,7 +36,7 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
   }
   final implicit class OrToDieAfter(input: (String, String)) {
     def after(trans: Transformation[Tree, Tree]): Unit = {
-      val t = trans(treeFrom(input._1))
+      val t = ask { () => trans(treeFrom(input._1)) }
       require(t.isDefined, "transformation was not successful")
       t foreach (_.printsTo(input._2))
     }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {`
`26`	`26`	`def printsTo(expectedOutput: String): Unit = {`
`27`	`27`	`val sourceFile = new BatchSourceFile("noname", expectedOutput)`
`28`	`28`	`val expected = stripWhitespacePreservers(expectedOutput).trim()`
`29`		`- val actual = generate(original, sourceFile = Some(sourceFile)).asText.trim()`
	`29`	`+ val actual = ask { () => generate(original, sourceFile = Some(sourceFile)).asText.trim() }`
`30`	`30`	`if (actual != expected)`
`31`	`31`	`throw new ComparisonFailure("", expected, actual)`
`32`	`32`	`}`
`@@ -36,7 +36,7 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {`
`36`	`36`	`}`
`37`	`37`	`final implicit class OrToDieAfter(input: (String, String)) {`
`38`	`38`	`def after(trans: Transformation[Tree, Tree]): Unit = {`
`39`		`- val t = trans(treeFrom(input._1))`
	`39`	`+ val t = ask { () => trans(treeFrom(input._1)) }`
`40`	`40`	`require(t.isDefined, "transformation was not successful")`
`41`	`41`	`t foreach (_.printsTo(input._2))`
`42`	`42`	`}`