From f5b91d8e44ae2b045ebf5382c7ec690cfd1df12e Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 24 Oct 2018 12:43:30 +1000 Subject: [PATCH] Make tests tolerant to differing fresh name suffixes Makes these tests work with https://github.com/scala/scala/pull/7203 --- .../implementations/extraction/ExtractExtractorTest.scala | 2 +- .../implementations/extraction/ExtractValueTest.scala | 4 ++-- .../scala/tools/refactoring/tests/util/TestHelper.scala | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractExtractorTest.scala b/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractExtractorTest.scala index 034e091a..e04ec240 100644 --- a/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractExtractorTest.scala +++ b/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractExtractorTest.scala @@ -266,7 +266,7 @@ class ExtractExtractorTest extends TestHelper with TestRefactoring { } } """ - }.performRefactoring(extract(0)).assertEqualTree + }.performRefactoring(extract(0)).assertEqualTreeIgnoringFreshNames @Test def avoidNameCollisions() = new FileSet{ diff --git a/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractValueTest.scala b/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractValueTest.scala index ea250c9e..5b3dc102 100644 --- a/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractValueTest.scala +++ b/src/test/scala/scala/tools/refactoring/tests/implementations/extraction/ExtractValueTest.scala @@ -343,7 +343,7 @@ class ExtractValueTest extends TestHelper with TestRefactoring { } } """ - }.performRefactoring(extract(0)).assertEqualTree + }.performRefactoring(extract(0)).assertEqualTreeIgnoringFreshNames @Test def dontExtractWildcardPatterns() = new FileSet(expectCompilingCode = false) { @@ -364,7 +364,7 @@ class ExtractValueTest extends TestHelper with TestRefactoring { } } """ - }.performRefactoring(extract(0)).assertEqualTree + }.performRefactoring(extract(0)).assertEqualTreeIgnoringFreshNames @Test def extractIntoNewValBlock() = new FileSet{ diff --git a/src/test/scala/scala/tools/refactoring/tests/util/TestHelper.scala b/src/test/scala/scala/tools/refactoring/tests/util/TestHelper.scala index 4ca39345..3bf88820 100644 --- a/src/test/scala/scala/tools/refactoring/tests/util/TestHelper.scala +++ b/src/test/scala/scala/tools/refactoring/tests/util/TestHelper.scala @@ -281,6 +281,14 @@ trait TestHelper extends TestRules with Refactoring with CompilerProvider with c } assertEquals(expected, actual) } + def assertEqualTreeIgnoringFreshNames() = withResultTree { actualTree => + val expectedTree = treeFrom(srcs.head._2.code) + def clean(s: String) = s.replaceAll("""\$\d+""", """\$""") + val (expected, actual) = global.ask { () => + (clean(expectedTree.toString()), clean(actualTree.toString())) + } + assertEquals(expected, actual) + } } }