Merge pull request #201 from retronym/topic/tolerant-fresh-names

Make tests tolerant to differing fresh name suffixes

Author: misto

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{

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{

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)
+        }
       }
     }