forked from icsharpcode/ILSpy
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Replaced simple Test differ with full-blown DiffLib-backed implemen…
…tation (pulled in w/ NuGet), to improve failed test messages.
- Loading branch information
Showing
10 changed files
with
777 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using DiffLib; | ||
| using NUnit.Framework; | ||
|
|
||
| namespace ICSharpCode.Decompiler.Tests.Helpers | ||
| { | ||
| public class CodeAssert | ||
| { | ||
| public static void AreEqual(string input1, string input2) | ||
| { | ||
| var diff = new StringWriter(); | ||
| if (!Compare(input1, input2, diff)) { | ||
| Assert.Fail(diff.ToString()); | ||
| } | ||
| } | ||
|
|
||
| static bool Compare(string input1, string input2, StringWriter diff) | ||
| { | ||
| var differ = new AlignedDiff<string>( | ||
| NormalizeAndSplitCode(input1), | ||
| NormalizeAndSplitCode(input2), | ||
| new CodeLineEqualityComparer(), | ||
| new StringSimilarityComparer(), | ||
| new StringAlignmentFilter()); | ||
|
|
||
| bool result = true, ignoreChange; | ||
|
|
||
| int line1 = 0, line2 = 0; | ||
|
|
||
| foreach (var change in differ.Generate()) { | ||
| switch (change.Change) { | ||
| case ChangeType.Same: | ||
| diff.Write("{0,4} {1,4} ", ++line1, ++line2); | ||
| diff.Write(" "); | ||
| diff.WriteLine(change.Element1); | ||
| break; | ||
| case ChangeType.Added: | ||
| diff.Write(" {1,4} ", line1, ++line2); | ||
| result &= ignoreChange = ShouldIgnoreChange(change.Element2); | ||
| diff.Write(ignoreChange ? " " : " + "); | ||
| diff.WriteLine(change.Element2); | ||
| break; | ||
| case ChangeType.Deleted: | ||
| diff.Write("{0,4} ", ++line1, line2); | ||
| result &= ignoreChange = ShouldIgnoreChange(change.Element1); | ||
| diff.Write(ignoreChange ? " " : " - "); | ||
| diff.WriteLine(change.Element1); | ||
| break; | ||
| case ChangeType.Changed: | ||
| diff.Write("{0,4} ", ++line1, line2); | ||
| result = false; | ||
| diff.Write("(-) "); | ||
| diff.WriteLine(change.Element1); | ||
| diff.Write(" {1,4} ", line1, ++line2); | ||
| diff.Write("(+) "); | ||
| diff.WriteLine(change.Element2); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| class CodeLineEqualityComparer : IEqualityComparer<string> | ||
| { | ||
| private IEqualityComparer<string> baseComparer = EqualityComparer<string>.Default; | ||
|
|
||
| public bool Equals(string x, string y) | ||
| { | ||
| return baseComparer.Equals( | ||
| NormalizeLine(x), | ||
| NormalizeLine(y) | ||
| ); | ||
| } | ||
|
|
||
| public int GetHashCode(string obj) | ||
| { | ||
| return baseComparer.GetHashCode(NormalizeLine(obj)); | ||
| } | ||
| } | ||
|
|
||
| private static string NormalizeLine(string line) | ||
| { | ||
| line = line.Trim(); | ||
| var index = line.IndexOf("//"); | ||
| if (index >= 0) { | ||
| return line.Substring(0, index); | ||
| } else { | ||
| return line; | ||
| } | ||
| } | ||
|
|
||
| private static bool ShouldIgnoreChange(string line) | ||
| { | ||
| // for the result, we should ignore blank lines and added comments | ||
| return NormalizeLine(line) == string.Empty; | ||
| } | ||
|
|
||
| private static IEnumerable<string> NormalizeAndSplitCode(string input) | ||
| { | ||
| return input.Split(new[] { "\r\n", "\n\r", "\n", "\r" }, StringSplitOptions.None); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="DiffLib" version="1.0.0.55" /> | ||
| </packages> |
Binary file not shown.
Oops, something went wrong.