Merge pull request #29 from wonderful-panda/master

fix fragile tests about PolyAssert

Author: robfe

PowerAssertTests/Approvals/EndToEndTest.PolyAssert.approved.txt

@@ -1,7 +1,7 @@
 PowerAssert.MultipleAssertions.PolyAssertException: PolyAssert encountered 3 failures:
 > I will report all the errors i saw when i get disposed
 ============================================================
-ERROR in EndToEndTest.PolyAssert at ...\EndToEndTest.cs:484:
+ERROR in EndToEndTest.PolyAssert at ...\EndToEndTest.cs:<line>:
 ============================================================
 IsTrue failed, expression was:
 
@@ -14,7 +14,7 @@ x == 5
 ============================================================
 
 ============================================================
-ERROR in EndToEndTest.PolyAssert at ...\EndToEndTest.cs:486:
+ERROR in EndToEndTest.PolyAssert at ...\EndToEndTest.cs:<line>:
 ============================================================
 IsTrue failed, expression was:
 
@@ -27,7 +27,7 @@ x == 7
 ============================================================
 
 ============================================================
-ERROR in EndToEndTest.PolyAssert at ...\EndToEndTest.cs:487:
+ERROR in EndToEndTest.PolyAssert at ...\EndToEndTest.cs:<line>:
 ============================================================
 Wah wah
 ============================================================

PowerAssertTests/Approvals/EndToEndTest.PolyAssertCanFinishEarly.approved.txt

@@ -2,7 +2,7 @@
 > Sometimes you do want to end the test early after all
 > So just call StopIfErrorsHaveOccurred (behaves the same as disposing the PolyAssert)
 ============================================================
-ERROR in EndToEndTest.PolyAssertCanFinishEarly at ...\EndToEndTest.cs:509:
+ERROR in EndToEndTest.PolyAssertCanFinishEarly at ...\EndToEndTest.cs:<line>:
 ============================================================
 Wah wah
 ============================================================

PowerAssertTests/Approvals/EndToEndTest.cs

@@ -565,6 +565,8 @@ string Scrubber(string s)
             //the throwhelper seems to be present on some environments' stack traces but not others, cut it out to make tha approvals pass on most machines
             s = Regex.Replace(s, @"\n.*ThrowHelper.*\n", "\n"); 
             s = Regex.Replace(s, @"\r?\n", "\n");
+            // replace line number in polyassert headers
+            s = Regex.Replace(s, @"(?<=^ERROR in.*:)\d+(?=:$)", "<line>", RegexOptions.Multiline);
             return s;
         }
     }

PowerAssertTests/PowerAssertTests.csproj

@@ -93,6 +93,8 @@
     <Content Include="Approvals\EndToEndTest.BinaryArrayElement.approved.txt" />
     <Content Include="Approvals\EndToEndTest.BrokenEqualityTestInstanceEquals.approved.txt" />
     <Content Include="Approvals\EndToEndTest.Casting.approved.txt" />
+    <Content Include="Approvals\EndToEndTest.PolyAssert.approved.txt" />
+    <Content Include="Approvals\EndToEndTest.PolyAssertCanFinishEarly.approved.txt" />
     <Content Include="Approvals\EndToEndTest.UnaryCastOfBinary.approved.txt" />
     <Content Include="Approvals\EndToEndTest.CompareDelegateAndObject.approved.txt" />
     <Content Include="Approvals\EndToEndTest.CompareTwoCloseFloats.approved.txt" />