diff --git a/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs b/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs index 5c520113..f53bcfad 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs @@ -18,6 +18,7 @@ using System; using System.Linq; + using NUnit.Framework; namespace ICSharpCode.AvalonEdit.Document @@ -31,12 +32,12 @@ public void NoChanges() TextDocument document = new TextDocument("initial text"); ITextSource snapshot1 = document.CreateSnapshot(); ITextSource snapshot2 = document.CreateSnapshot(); - Assert.AreEqual(0, snapshot1.Version.CompareAge(snapshot2.Version)); - Assert.AreEqual(0, snapshot1.Version.GetChangesTo(snapshot2.Version).Count()); - Assert.AreEqual(document.Text, snapshot1.Text); - Assert.AreEqual(document.Text, snapshot2.Text); + Assert.That(snapshot1.Version.CompareAge(snapshot2.Version), Is.EqualTo(0)); + Assert.That(snapshot1.Version.GetChangesTo(snapshot2.Version).Count(), Is.EqualTo(0)); + Assert.That(snapshot1.Text, Is.EqualTo(document.Text)); + Assert.That(snapshot2.Text, Is.EqualTo(document.Text)); } - + [Test] public void ForwardChanges() { @@ -45,16 +46,16 @@ public void ForwardChanges() document.Replace(0, 7, "nw"); document.Insert(1, "e"); ITextSource snapshot2 = document.CreateSnapshot(); - Assert.AreEqual(-1, snapshot1.Version.CompareAge(snapshot2.Version)); + Assert.That(snapshot1.Version.CompareAge(snapshot2.Version), Is.EqualTo(-1)); TextChangeEventArgs[] arr = snapshot1.Version.GetChangesTo(snapshot2.Version).ToArray(); - Assert.AreEqual(2, arr.Length); - Assert.AreEqual("nw", arr[0].InsertedText.Text); - Assert.AreEqual("e", arr[1].InsertedText.Text); - - Assert.AreEqual("initial text", snapshot1.Text); - Assert.AreEqual("new text", snapshot2.Text); + Assert.That(arr.Length, Is.EqualTo(2)); + Assert.That(arr[0].InsertedText.Text, Is.EqualTo("nw")); + Assert.That(arr[1].InsertedText.Text, Is.EqualTo("e")); + + Assert.That(snapshot1.Text, Is.EqualTo("initial text")); + Assert.That(snapshot2.Text, Is.EqualTo("new text")); } - + [Test] public void BackwardChanges() { @@ -63,14 +64,14 @@ public void BackwardChanges() document.Replace(0, 7, "nw"); document.Insert(1, "e"); ITextSource snapshot2 = document.CreateSnapshot(); - Assert.AreEqual(1, snapshot2.Version.CompareAge(snapshot1.Version)); + Assert.That(snapshot2.Version.CompareAge(snapshot1.Version), Is.EqualTo(1)); TextChangeEventArgs[] arr = snapshot2.Version.GetChangesTo(snapshot1.Version).ToArray(); - Assert.AreEqual(2, arr.Length); - Assert.AreEqual("", arr[0].InsertedText.Text); - Assert.AreEqual("initial", arr[1].InsertedText.Text); - - Assert.AreEqual("initial text", snapshot1.Text); - Assert.AreEqual("new text", snapshot2.Text); + Assert.That(arr.Length, Is.EqualTo(2)); + Assert.That(arr[0].InsertedText.Text, Is.Empty); + Assert.That(arr[1].InsertedText.Text, Is.EqualTo("initial")); + + Assert.That(snapshot1.Text, Is.EqualTo("initial text")); + Assert.That(snapshot2.Text, Is.EqualTo("new text")); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Document/CollapsingTests.cs b/ICSharpCode.AvalonEdit.Tests/Document/CollapsingTests.cs index 629295e8..f38556f6 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/CollapsingTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/CollapsingTests.cs @@ -17,7 +17,9 @@ // DEALINGS IN THE SOFTWARE. using System; + using ICSharpCode.AvalonEdit.Rendering; + using NUnit.Framework; namespace ICSharpCode.AvalonEdit.Document @@ -27,7 +29,7 @@ public class CollapsingTests { TextDocument document; HeightTree heightTree; - + [SetUp] public void Setup() { @@ -38,40 +40,40 @@ public void Setup() heightTree.SetHeight(line, line.LineNumber); } } - + CollapsedLineSection SimpleCheck(int from, int to) { CollapsedLineSection sec1 = heightTree.CollapseText(document.GetLineByNumber(from), document.GetLineByNumber(to)); for (int i = 1; i < from; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } for (int i = from; i <= to; i++) { - Assert.IsTrue(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.True); } for (int i = to + 1; i <= 10; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } CheckHeights(); return sec1; } - + [Test] public void SimpleCheck() { SimpleCheck(4, 6); } - + [Test] public void SimpleUncollapse() { CollapsedLineSection sec1 = heightTree.CollapseText(document.GetLineByNumber(4), document.GetLineByNumber(6)); sec1.Uncollapse(); for (int i = 1; i <= 10; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } CheckHeights(); } - + [Test] public void FullCheck() { @@ -80,9 +82,9 @@ public void FullCheck() try { SimpleCheck(from, to).Uncollapse(); for (int i = 1; i <= 10; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } - CheckHeights(); + CheckHeights(); } catch { Console.WriteLine("from = " + from + ", to = " + to); throw; @@ -90,24 +92,24 @@ public void FullCheck() } } } - + [Test] public void InsertInCollapsedSection() { CollapsedLineSection sec1 = heightTree.CollapseText(document.GetLineByNumber(4), document.GetLineByNumber(6)); document.Insert(document.GetLineByNumber(5).Offset, "a\nb\nc"); for (int i = 1; i < 4; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } for (int i = 4; i <= 8; i++) { - Assert.IsTrue(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.True); } for (int i = 9; i <= 12; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } CheckHeights(); } - + [Test] public void RemoveInCollapsedSection() { @@ -116,17 +118,17 @@ public void RemoveInCollapsedSection() int line6Offset = document.GetLineByNumber(6).Offset; document.Remove(line4Offset, line6Offset - line4Offset); for (int i = 1; i < 3; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } for (int i = 3; i <= 5; i++) { - Assert.IsTrue(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.True); } for (int i = 6; i <= 8; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } CheckHeights(); } - + [Test] public void RemoveEndOfCollapsedSection() { @@ -135,17 +137,17 @@ public void RemoveEndOfCollapsedSection() int line8Offset = document.GetLineByNumber(8).Offset; document.Remove(line5Offset, line8Offset - line5Offset); for (int i = 1; i < 3; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } for (int i = 3; i <= 5; i++) { - Assert.IsTrue(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.True); } for (int i = 6; i <= 7; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } CheckHeights(); } - + [Test] public void RemoveCollapsedSection() { @@ -153,15 +155,15 @@ public void RemoveCollapsedSection() int line3Offset = document.GetLineByNumber(3).Offset; document.Remove(line3Offset - 1, 1); for (int i = 1; i <= 9; i++) { - Assert.IsFalse(heightTree.GetIsCollapsed(i)); + Assert.That(heightTree.GetIsCollapsed(i), Is.False); } CheckHeights(); - Assert.AreSame(null, sec1.Start); - Assert.AreSame(null, sec1.End); + Assert.That(sec1.Start, Is.SameAs(null)); + Assert.That(sec1.End, Is.SameAs(null)); // section gets uncollapsed when it is removed - Assert.IsFalse(sec1.IsCollapsed); + Assert.That(sec1.IsCollapsed, Is.False); } - + void CheckHeights() { HeightTests.CheckHeights(document, heightTree); diff --git a/ICSharpCode.AvalonEdit.Tests/Document/HeightTests.cs b/ICSharpCode.AvalonEdit.Tests/Document/HeightTests.cs index b39e914f..b4a048d5 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/HeightTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/HeightTests.cs @@ -83,9 +83,9 @@ internal static void CheckHeights(TextDocument document, HeightTree heightTree) visualPositions[i+1]=visualPositions[i]+heights[i]; } foreach (DocumentLine ls in document.Lines) { - Assert.AreEqual(visualPositions[ls.LineNumber-1], heightTree.GetVisualPosition(ls)); + Assert.That(heightTree.GetVisualPosition(ls), Is.EqualTo(visualPositions[ls.LineNumber - 1])); } - Assert.AreEqual(visualPositions[document.LineCount], heightTree.TotalHeight); + Assert.That(heightTree.TotalHeight, Is.EqualTo(visualPositions[document.LineCount])); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Document/LineManagerTests.cs b/ICSharpCode.AvalonEdit.Tests/Document/LineManagerTests.cs index 63e7e2d1..8f280c5f 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/LineManagerTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/LineManagerTests.cs @@ -19,6 +19,7 @@ using System; using System.Collections.Generic; using System.Linq; + using NUnit.Framework; namespace ICSharpCode.AvalonEdit.Document @@ -27,557 +28,547 @@ namespace ICSharpCode.AvalonEdit.Document public class LineManagerTests { TextDocument document; - + [SetUp] public void SetUp() { document = new TextDocument(); } - + [Test] public void CheckEmptyDocument() { - Assert.AreEqual("", document.Text); - Assert.AreEqual(0, document.TextLength); - Assert.AreEqual(1, document.LineCount); + Assert.That(document.Text, Is.Empty); + Assert.That(document.TextLength, Is.EqualTo(0)); + Assert.That(document.LineCount, Is.EqualTo(1)); } - + [Test] public void CheckClearingDocument() { document.Text = "Hello,\nWorld!"; - Assert.AreEqual(2, document.LineCount); + Assert.That(document.LineCount, Is.EqualTo(2)); var oldLines = document.Lines.ToArray(); document.Text = ""; - Assert.AreEqual("", document.Text); - Assert.AreEqual(0, document.TextLength); - Assert.AreEqual(1, document.LineCount); - Assert.AreSame(oldLines[0], document.Lines.Single()); - Assert.IsFalse(oldLines[0].IsDeleted); - Assert.IsTrue(oldLines[1].IsDeleted); - Assert.IsNull(oldLines[0].NextLine); - Assert.IsNull(oldLines[1].PreviousLine); + Assert.That(document.Text, Is.Empty); + Assert.That(document.TextLength, Is.EqualTo(0)); + Assert.That(document.LineCount, Is.EqualTo(1)); + Assert.That(document.Lines.Single(), Is.SameAs(oldLines[0])); + Assert.That(oldLines[0].IsDeleted, Is.False); + Assert.That(oldLines[1].IsDeleted, Is.True); + Assert.That(oldLines[0].NextLine, Is.Null); + Assert.That(oldLines[1].PreviousLine, Is.Null); } - + [Test] public void CheckGetLineInEmptyDocument() { - Assert.AreEqual(1, document.Lines.Count); + Assert.That(document.Lines.Count, Is.EqualTo(1)); List lines = new List(document.Lines); - Assert.AreEqual(1, lines.Count); + Assert.That(lines.Count, Is.EqualTo(1)); DocumentLine line = document.Lines[0]; - Assert.AreSame(line, lines[0]); - Assert.AreSame(line, document.GetLineByNumber(1)); - Assert.AreSame(line, document.GetLineByOffset(0)); + Assert.That(lines[0], Is.SameAs(line)); + Assert.That(document.GetLineByNumber(1), Is.SameAs(line)); + Assert.That(document.GetLineByOffset(0), Is.SameAs(line)); } - + [Test] public void CheckLineSegmentInEmptyDocument() { DocumentLine line = document.GetLineByNumber(1); - Assert.AreEqual(1, line.LineNumber); - Assert.AreEqual(0, line.Offset); - Assert.IsFalse(line.IsDeleted); - Assert.AreEqual(0, line.Length); - Assert.AreEqual(0, line.TotalLength); - Assert.AreEqual(0, line.DelimiterLength); + Assert.That(line.LineNumber, Is.EqualTo(1)); + Assert.That(line.Offset, Is.EqualTo(0)); + Assert.That(line.IsDeleted, Is.False); + Assert.That(line.Length, Is.EqualTo(0)); + Assert.That(line.TotalLength, Is.EqualTo(0)); + Assert.That(line.DelimiterLength, Is.EqualTo(0)); } - + [Test] public void LineIndexOfTest() { DocumentLine line = document.GetLineByNumber(1); - Assert.AreEqual(0, document.Lines.IndexOf(line)); + Assert.That(document.Lines.IndexOf(line), Is.EqualTo(0)); DocumentLine lineFromOtherDocument = new TextDocument().GetLineByNumber(1); - Assert.AreEqual(-1, document.Lines.IndexOf(lineFromOtherDocument)); + Assert.That(document.Lines.IndexOf(lineFromOtherDocument), Is.EqualTo(-1)); document.Text = "a\nb\nc"; DocumentLine middleLine = document.GetLineByNumber(2); - Assert.AreEqual(1, document.Lines.IndexOf(middleLine)); + Assert.That(document.Lines.IndexOf(middleLine), Is.EqualTo(1)); document.Remove(1, 3); - Assert.IsTrue(middleLine.IsDeleted); - Assert.AreEqual(-1, document.Lines.IndexOf(middleLine)); + Assert.That(middleLine.IsDeleted, Is.True); + Assert.That(document.Lines.IndexOf(middleLine), Is.EqualTo(-1)); } - + [Test] public void InsertInEmptyDocument() { document.Insert(0, "a"); - Assert.AreEqual(document.LineCount, 1); + Assert.That(document.LineCount, Is.EqualTo(1)); DocumentLine line = document.GetLineByNumber(1); - Assert.AreEqual("a", document.GetText(line)); + Assert.That(document.GetText(line), Is.EqualTo("a")); } - + [Test] public void SetText() { document.Text = "a"; - Assert.AreEqual(document.LineCount, 1); + Assert.That(document.LineCount, Is.EqualTo(1)); DocumentLine line = document.GetLineByNumber(1); - Assert.AreEqual("a", document.GetText(line)); + Assert.That(document.GetText(line), Is.EqualTo("a")); } - + [Test] public void InsertNothing() { document.Insert(0, ""); - Assert.AreEqual(document.LineCount, 1); - Assert.AreEqual(document.TextLength, 0); + Assert.That(document.LineCount, Is.EqualTo(1)); + Assert.That(document.TextLength, Is.EqualTo(0)); } - + [Test] public void InsertNull() { - Assert.Throws(() => document.Insert(0, (string) null)); + Assert.Throws(() => document.Insert(0, (string)null)); } - + [Test] public void SetTextNull() { Assert.Throws(() => document.Text = null); } - + [Test] public void RemoveNothing() { document.Remove(0, 0); - Assert.AreEqual(document.LineCount, 1); - Assert.AreEqual(document.TextLength, 0); + Assert.That(document.LineCount, Is.EqualTo(1)); + Assert.That(document.TextLength, Is.EqualTo(0)); } - + [Test] public void GetCharAt0EmptyDocument() { Assert.Throws(() => document.GetCharAt(0)); } - + [Test] public void GetCharAtNegativeOffset() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.GetCharAt(-1); }); } - + [Test] public void GetCharAtEndOffset() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.GetCharAt(document.TextLength); }); } - + [Test] public void InsertAtNegativeOffset() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.Insert(-1, "text"); }); } - + [Test] public void InsertAfterEndOffset() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.Insert(4, "text"); }); } - + [Test] public void RemoveNegativeAmount() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "abcd"; document.Remove(2, -1); }); } - + [Test] public void RemoveTooMuch() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "abcd"; document.Remove(2, 10); }); } - + [Test] public void GetLineByNumberNegative() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.GetLineByNumber(-1); }); } - + [Test] public void GetLineByNumberTooHigh() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.GetLineByNumber(3); }); } - + [Test] public void GetLineByOffsetNegative() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.GetLineByOffset(-1); }); } - - + + [Test] public void GetLineByOffsetToHigh() { - Assert.Throws(() => - { + Assert.Throws(() => { document.Text = "a\nb"; document.GetLineByOffset(10); }); } - + [Test] public void InsertAtEndOffset() { document.Text = "a\nb"; CheckDocumentLines("a", - "b"); + "b"); document.Insert(3, "text"); CheckDocumentLines("a", - "btext"); + "btext"); } - + [Test] public void GetCharAt() { document.Text = "a\r\nb"; - Assert.AreEqual('a', document.GetCharAt(0)); - Assert.AreEqual('\r', document.GetCharAt(1)); - Assert.AreEqual('\n', document.GetCharAt(2)); - Assert.AreEqual('b', document.GetCharAt(3)); + Assert.That(document.GetCharAt(0), Is.EqualTo('a')); + Assert.That(document.GetCharAt(1), Is.EqualTo('\r')); + Assert.That(document.GetCharAt(2), Is.EqualTo('\n')); + Assert.That(document.GetCharAt(3), Is.EqualTo('b')); } - + [Test] public void CheckMixedNewLineTest() { const string mixedNewlineText = "line 1\nline 2\r\nline 3\rline 4"; document.Text = mixedNewlineText; - Assert.AreEqual(mixedNewlineText, document.Text); - Assert.AreEqual(4, document.LineCount); + Assert.That(document.Text, Is.EqualTo(mixedNewlineText)); + Assert.That(document.LineCount, Is.EqualTo(4)); for (int i = 1; i < 4; i++) { DocumentLine line = document.GetLineByNumber(i); - Assert.AreEqual(i, line.LineNumber); - Assert.AreEqual("line " + i, document.GetText(line)); + Assert.That(line.LineNumber, Is.EqualTo(i)); + Assert.That(document.GetText(line), Is.EqualTo("line " + i)); } - Assert.AreEqual(1, document.GetLineByNumber(1).DelimiterLength); - Assert.AreEqual(2, document.GetLineByNumber(2).DelimiterLength); - Assert.AreEqual(1, document.GetLineByNumber(3).DelimiterLength); - Assert.AreEqual(0, document.GetLineByNumber(4).DelimiterLength); + Assert.That(document.GetLineByNumber(1).DelimiterLength, Is.EqualTo(1)); + Assert.That(document.GetLineByNumber(2).DelimiterLength, Is.EqualTo(2)); + Assert.That(document.GetLineByNumber(3).DelimiterLength, Is.EqualTo(1)); + Assert.That(document.GetLineByNumber(4).DelimiterLength, Is.EqualTo(0)); } - + [Test] public void LfCrIsTwoNewLinesTest() { document.Text = "a\n\rb"; - Assert.AreEqual("a\n\rb", document.Text); + Assert.That(document.Text, Is.EqualTo("a\n\rb")); CheckDocumentLines("a", - "", - "b"); + "", + "b"); } - + [Test] public void RemoveFirstPartOfDelimiter() { document.Text = "a\r\nb"; document.Remove(1, 1); - Assert.AreEqual("a\nb", document.Text); + Assert.That(document.Text, Is.EqualTo("a\nb")); CheckDocumentLines("a", - "b"); + "b"); } - + [Test] public void RemoveLineContentAndJoinDelimiters() { document.Text = "a\rb\nc"; document.Remove(2, 1); - Assert.AreEqual("a\r\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nc")); CheckDocumentLines("a", - "c"); + "c"); } - + [Test] public void RemoveLineContentAndJoinDelimiters2() { document.Text = "a\rb\nc\nd"; document.Remove(2, 3); - Assert.AreEqual("a\r\nd", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nd")); CheckDocumentLines("a", - "d"); + "d"); } - + [Test] public void RemoveLineContentAndJoinDelimiters3() { document.Text = "a\rb\r\nc"; document.Remove(2, 2); - Assert.AreEqual("a\r\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nc")); CheckDocumentLines("a", - "c"); + "c"); } - + [Test] public void RemoveLineContentAndJoinNonMatchingDelimiters() { document.Text = "a\nb\nc"; document.Remove(2, 1); - Assert.AreEqual("a\n\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\n\nc")); CheckDocumentLines("a", - "", - "c"); + "", + "c"); } - + [Test] public void RemoveLineContentAndJoinNonMatchingDelimiters2() { document.Text = "a\nb\rc"; document.Remove(2, 1); - Assert.AreEqual("a\n\rc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\n\rc")); CheckDocumentLines("a", - "", - "c"); + "", + "c"); } - + [Test] public void RemoveMultilineUpToFirstPartOfDelimiter() { document.Text = "0\n1\r\n2"; document.Remove(1, 3); - Assert.AreEqual("0\n2", document.Text); + Assert.That(document.Text, Is.EqualTo("0\n2")); CheckDocumentLines("0", - "2"); + "2"); } - + [Test] public void RemoveSecondPartOfDelimiter() { document.Text = "a\r\nb"; document.Remove(2, 1); - Assert.AreEqual("a\rb", document.Text); + Assert.That(document.Text, Is.EqualTo("a\rb")); CheckDocumentLines("a", - "b"); + "b"); } - + [Test] public void RemoveFromSecondPartOfDelimiter() { document.Text = "a\r\nb\nc"; document.Remove(2, 3); - Assert.AreEqual("a\rc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\rc")); CheckDocumentLines("a", - "c"); + "c"); } - + [Test] public void RemoveFromSecondPartOfDelimiterToDocumentEnd() { document.Text = "a\r\nb"; document.Remove(2, 2); - Assert.AreEqual("a\r", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r")); CheckDocumentLines("a", - ""); + ""); } - + [Test] public void RemoveUpToMatchingDelimiter1() { document.Text = "a\r\nb\nc"; document.Remove(2, 2); - Assert.AreEqual("a\r\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nc")); CheckDocumentLines("a", - "c"); + "c"); } - + [Test] public void RemoveUpToMatchingDelimiter2() { document.Text = "a\r\nb\r\nc"; document.Remove(2, 3); - Assert.AreEqual("a\r\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nc")); CheckDocumentLines("a", - "c"); + "c"); } - + [Test] public void RemoveUpToNonMatchingDelimiter() { document.Text = "a\r\nb\rc"; document.Remove(2, 2); - Assert.AreEqual("a\r\rc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\rc")); CheckDocumentLines("a", - "", - "c"); + "", + "c"); } - + [Test] public void RemoveTwoCharDelimiter() { document.Text = "a\r\nb"; document.Remove(1, 2); - Assert.AreEqual("ab", document.Text); + Assert.That(document.Text, Is.EqualTo("ab")); CheckDocumentLines("ab"); } - + [Test] public void RemoveOneCharDelimiter() { document.Text = "a\nb"; document.Remove(1, 1); - Assert.AreEqual("ab", document.Text); + Assert.That(document.Text, Is.EqualTo("ab")); CheckDocumentLines("ab"); } - + void CheckDocumentLines(params string[] lines) { - Assert.AreEqual(lines.Length, document.LineCount, "LineCount"); + Assert.That(document.LineCount, Is.EqualTo(lines.Length), "LineCount"); for (int i = 0; i < lines.Length; i++) { - Assert.AreEqual(lines[i], document.GetText(document.Lines[i]), "Text of line " + (i + 1)); + Assert.That(document.GetText(document.Lines[i]), Is.EqualTo(lines[i]), "Text of line " + (i + 1)); } } - + [Test] public void FixUpFirstPartOfDelimiter() { document.Text = "a\n\nb"; document.Replace(1, 1, "\r"); - Assert.AreEqual("a\r\nb", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nb")); CheckDocumentLines("a", - "b"); + "b"); } - + [Test] public void FixUpSecondPartOfDelimiter() { document.Text = "a\r\rb"; document.Replace(2, 1, "\n"); - Assert.AreEqual("a\r\nb", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nb")); CheckDocumentLines("a", - "b"); + "b"); } - + [Test] public void InsertInsideDelimiter() { document.Text = "a\r\nc"; document.Insert(2, "b"); - Assert.AreEqual("a\rb\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\rb\nc")); CheckDocumentLines("a", - "b", - "c"); + "b", + "c"); } - + [Test] public void InsertInsideDelimiter2() { document.Text = "a\r\nd"; document.Insert(2, "b\nc"); - Assert.AreEqual("a\rb\nc\nd", document.Text); + Assert.That(document.Text, Is.EqualTo("a\rb\nc\nd")); CheckDocumentLines("a", - "b", - "c", - "d"); + "b", + "c", + "d"); } - + [Test] public void InsertInsideDelimiter3() { document.Text = "a\r\nc"; document.Insert(2, "b\r"); - Assert.AreEqual("a\rb\r\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\rb\r\nc")); CheckDocumentLines("a", - "b", - "c"); + "b", + "c"); } - + [Test] public void ExtendDelimiter1() { document.Text = "a\nc"; document.Insert(1, "b\r"); - Assert.AreEqual("ab\r\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("ab\r\nc")); CheckDocumentLines("ab", - "c"); + "c"); } - + [Test] public void ExtendDelimiter2() { document.Text = "a\rc"; document.Insert(2, "\nb"); - Assert.AreEqual("a\r\nbc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\r\nbc")); CheckDocumentLines("a", - "bc"); + "bc"); } - + [Test] public void ReplaceLineContentBetweenMatchingDelimiters() { document.Text = "a\rb\nc"; document.Replace(2, 1, "x"); - Assert.AreEqual("a\rx\nc", document.Text); + Assert.That(document.Text, Is.EqualTo("a\rx\nc")); CheckDocumentLines("a", - "x", - "c"); + "x", + "c"); } - + [Test] public void GetOffset() { document.Text = "Hello,\nWorld!"; - Assert.AreEqual(0, document.GetOffset(1, 1)); - Assert.AreEqual(1, document.GetOffset(1, 2)); - Assert.AreEqual(5, document.GetOffset(1, 6)); - Assert.AreEqual(6, document.GetOffset(1, 7)); - Assert.AreEqual(7, document.GetOffset(2, 1)); - Assert.AreEqual(8, document.GetOffset(2, 2)); - Assert.AreEqual(12, document.GetOffset(2, 6)); - Assert.AreEqual(13, document.GetOffset(2, 7)); + Assert.That(document.GetOffset(1, 1), Is.EqualTo(0)); + Assert.That(document.GetOffset(1, 2), Is.EqualTo(1)); + Assert.That(document.GetOffset(1, 6), Is.EqualTo(5)); + Assert.That(document.GetOffset(1, 7), Is.EqualTo(6)); + Assert.That(document.GetOffset(2, 1), Is.EqualTo(7)); + Assert.That(document.GetOffset(2, 2), Is.EqualTo(8)); + Assert.That(document.GetOffset(2, 6), Is.EqualTo(12)); + Assert.That(document.GetOffset(2, 7), Is.EqualTo(13)); } - + [Test] public void GetOffsetIgnoreNegativeColumns() { document.Text = "Hello,\nWorld!"; - Assert.AreEqual(0, document.GetOffset(1, -1)); - Assert.AreEqual(0, document.GetOffset(1, -100)); - Assert.AreEqual(0, document.GetOffset(1, 0)); - Assert.AreEqual(7, document.GetOffset(2, -1)); - Assert.AreEqual(7, document.GetOffset(2, -100)); - Assert.AreEqual(7, document.GetOffset(2, 0)); + Assert.That(document.GetOffset(1, -1), Is.EqualTo(0)); + Assert.That(document.GetOffset(1, -100), Is.EqualTo(0)); + Assert.That(document.GetOffset(1, 0), Is.EqualTo(0)); + Assert.That(document.GetOffset(2, -1), Is.EqualTo(7)); + Assert.That(document.GetOffset(2, -100), Is.EqualTo(7)); + Assert.That(document.GetOffset(2, 0), Is.EqualTo(7)); } - + [Test] public void GetOffsetIgnoreTooHighColumns() { document.Text = "Hello,\nWorld!"; - Assert.AreEqual(6, document.GetOffset(1, 8)); - Assert.AreEqual(6, document.GetOffset(1, 100)); - Assert.AreEqual(13, document.GetOffset(2, 8)); - Assert.AreEqual(13, document.GetOffset(2, 100)); + Assert.That(document.GetOffset(1, 8), Is.EqualTo(6)); + Assert.That(document.GetOffset(1, 100), Is.EqualTo(6)); + Assert.That(document.GetOffset(2, 8), Is.EqualTo(13)); + Assert.That(document.GetOffset(2, 100), Is.EqualTo(13)); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Document/RandomizedLineManagerTest.cs b/ICSharpCode.AvalonEdit.Tests/Document/RandomizedLineManagerTest.cs index c4262aae..03dd7dd7 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/RandomizedLineManagerTest.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/RandomizedLineManagerTest.cs @@ -80,7 +80,7 @@ public void LargeReplacements() string newText = new string(buffer, 0, newTextLength); string expectedText = document.Text.Remove(offset, length).Insert(offset, newText); document.Replace(offset, length, newText); - Assert.AreEqual(expectedText, document.Text); + Assert.That(document.Text, Is.EqualTo(expectedText)); CheckLines(); } } @@ -94,24 +94,24 @@ void CheckLines() char c = text[i]; if (c == '\r' && i + 1 < text.Length && text[i + 1] == '\n') { DocumentLine line = document.GetLineByNumber(lineNumber); - Assert.AreEqual(lineNumber, line.LineNumber); - Assert.AreEqual(2, line.DelimiterLength); - Assert.AreEqual(lineStart, line.Offset); - Assert.AreEqual(i - lineStart, line.Length); + Assert.That(line.LineNumber, Is.EqualTo(lineNumber)); + Assert.That(line.DelimiterLength, Is.EqualTo(2)); + Assert.That(line.Offset, Is.EqualTo(lineStart)); + Assert.That(line.Length, Is.EqualTo(i - lineStart)); i++; // consume \n lineNumber++; lineStart = i+1; } else if (c == '\r' || c == '\n') { DocumentLine line = document.GetLineByNumber(lineNumber); - Assert.AreEqual(lineNumber, line.LineNumber); - Assert.AreEqual(1, line.DelimiterLength); - Assert.AreEqual(lineStart, line.Offset); - Assert.AreEqual(i - lineStart, line.Length); + Assert.That(line.LineNumber, Is.EqualTo(lineNumber)); + Assert.That(line.DelimiterLength, Is.EqualTo(1)); + Assert.That(line.Offset, Is.EqualTo(lineStart)); + Assert.That(line.Length, Is.EqualTo(i - lineStart)); lineNumber++; lineStart = i+1; } } - Assert.AreEqual(lineNumber, document.LineCount); + Assert.That(document.LineCount, Is.EqualTo(lineNumber)); } [Test] @@ -171,10 +171,10 @@ public void CollapsingTest() foreach (CollapsedLineSection cs in collapsedSections) { if (cs.Start != null) { expectedCount++; - Assert.IsTrue(treeSections.Contains(cs)); + Assert.That(treeSections.Contains(cs), Is.True); } } - Assert.AreEqual(expectedCount, treeSections.Count); + Assert.That(treeSections.Count, Is.EqualTo(expectedCount)); CheckLines(); HeightTests.CheckHeights(document, heightTree); } diff --git a/ICSharpCode.AvalonEdit.Tests/Document/TextAnchorTest.cs b/ICSharpCode.AvalonEdit.Tests/Document/TextAnchorTest.cs index a551e437..1078ed84 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/TextAnchorTest.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/TextAnchorTest.cs @@ -40,11 +40,11 @@ public void AnchorInEmptyDocument() TextAnchor a2 = document.CreateAnchor(0); a1.MovementType = AnchorMovementType.BeforeInsertion; a2.MovementType = AnchorMovementType.AfterInsertion; - Assert.AreEqual(0, a1.Offset); - Assert.AreEqual(0, a2.Offset); + Assert.That(a1.Offset, Is.EqualTo(0)); + Assert.That(a2.Offset, Is.EqualTo(0)); document.Insert(0, "x"); - Assert.AreEqual(0, a1.Offset); - Assert.AreEqual(1, a2.Offset); + Assert.That(a1.Offset, Is.EqualTo(0)); + Assert.That(a2.Offset, Is.EqualTo(1)); } [Test] @@ -64,25 +64,25 @@ public void AnchorsSurviveDeletion() //Console.WriteLine(document.GetTextAnchorTreeAsString()); } for (int i = 0; i < 11; i++) { - Assert.AreEqual(i, a1[i].Offset); - Assert.AreEqual(i, a2[i].Offset); + Assert.That(a1[i].Offset, Is.EqualTo(i)); + Assert.That(a2[i].Offset, Is.EqualTo(i)); } document.Remove(1, 8); for (int i = 0; i < 11; i++) { if (i <= 1) { - Assert.IsFalse(a1[i].IsDeleted); - Assert.IsFalse(a2[i].IsDeleted); - Assert.AreEqual(i, a1[i].Offset); - Assert.AreEqual(i, a2[i].Offset); + Assert.That(a1[i].IsDeleted, Is.False); + Assert.That(a2[i].IsDeleted, Is.False); + Assert.That(a1[i].Offset, Is.EqualTo(i)); + Assert.That(a2[i].Offset, Is.EqualTo(i)); } else if (i <= 8) { - Assert.IsFalse(a1[i].IsDeleted); - Assert.IsTrue(a2[i].IsDeleted); - Assert.AreEqual(1, a1[i].Offset); + Assert.That(a1[i].IsDeleted, Is.False); + Assert.That(a2[i].IsDeleted, Is.True); + Assert.That(a1[i].Offset, Is.EqualTo(1)); } else { - Assert.IsFalse(a1[i].IsDeleted); - Assert.IsFalse(a2[i].IsDeleted); - Assert.AreEqual(i - 8, a1[i].Offset); - Assert.AreEqual(i - 8, a2[i].Offset); + Assert.That(a1[i].IsDeleted, Is.False); + Assert.That(a2[i].IsDeleted, Is.False); + Assert.That(a1[i].Offset, Is.EqualTo(i - 8)); + Assert.That(a2[i].Offset, Is.EqualTo(i - 8)); } } } @@ -110,7 +110,7 @@ public void CreateAnchors() expectedOffsets.Add(offset); } for (int i = 0; i < anchors.Count; i++) { - Assert.AreEqual(expectedOffsets[i], anchors[i].Offset); + Assert.That(anchors[i].Offset, Is.EqualTo(expectedOffsets[i])); } GC.KeepAlive(anchors); } @@ -135,7 +135,7 @@ public void CreateAndGCAnchors() GC.Collect(); } for (int j = 0; j < anchors.Count; j++) { - Assert.AreEqual(expectedOffsets[j], anchors[j].Offset); + Assert.That(anchors[j].Offset, Is.EqualTo(expectedOffsets[j])); } } GC.KeepAlive(anchors); @@ -155,12 +155,12 @@ public void MoveAnchorsDuringReplace() middleSurvivorRight.MovementType = AnchorMovementType.AfterInsertion; TextAnchor end = document.CreateAnchor(3); document.Replace(1, 2, "BxC"); - - Assert.AreEqual(1, start.Offset); - Assert.IsTrue(middleDeletable.IsDeleted); - Assert.AreEqual(1, middleSurvivorLeft.Offset); - Assert.AreEqual(4, middleSurvivorRight.Offset); - Assert.AreEqual(4, end.Offset); + + Assert.That(start.Offset, Is.EqualTo(1)); + Assert.That(middleDeletable.IsDeleted, Is.True); + Assert.That(middleSurvivorLeft.Offset, Is.EqualTo(1)); + Assert.That(middleSurvivorRight.Offset, Is.EqualTo(4)); + Assert.That(end.Offset, Is.EqualTo(4)); } [Test] @@ -220,7 +220,7 @@ public void CreateAndMoveAnchors() if (anchors[i].SurviveDeletion) { expectedOffsets[i] = removalOffset; } else { - Assert.IsTrue(anchors[i].IsDeleted); + Assert.That(anchors[i].IsDeleted, Is.True); anchors.RemoveAt(i); expectedOffsets.RemoveAt(i); } @@ -243,7 +243,7 @@ public void CreateAndMoveAnchors() else expectedOffsets[i] = replaceOffset; } else { - Assert.IsTrue(anchors[i].IsDeleted); + Assert.That(anchors[i].IsDeleted, Is.True); anchors.RemoveAt(i); expectedOffsets.RemoveAt(i); } @@ -255,9 +255,9 @@ public void CreateAndMoveAnchors() } break; } - Assert.AreEqual(anchors.Count, expectedOffsets.Count); + Assert.That(expectedOffsets.Count, Is.EqualTo(anchors.Count)); for (int j = 0; j < anchors.Count; j++) { - Assert.AreEqual(expectedOffsets[j], anchors[j].Offset); + Assert.That(anchors[j].Offset, Is.EqualTo(expectedOffsets[j])); } } GC.KeepAlive(anchors); @@ -296,12 +296,12 @@ public void ReplaceSpacesWithTab() TextAnchor deletedMiddle = document.CreateAnchor(3); document.Replace(1, 4, "\t", OffsetChangeMappingType.CharacterReplace); - Assert.AreEqual("a\tb", document.Text); + Assert.That(document.Text, Is.EqualTo("a\tb")); // yes, the movement is a bit strange; but that's how CharacterReplace works when the text gets shorter - Assert.AreEqual(1, before.Offset); - Assert.AreEqual(2, after.Offset); - Assert.AreEqual(2, survivingMiddle.Offset); - Assert.AreEqual(2, deletedMiddle.Offset); + Assert.That(before.Offset, Is.EqualTo(1)); + Assert.That(after.Offset, Is.EqualTo(2)); + Assert.That(survivingMiddle.Offset, Is.EqualTo(2)); + Assert.That(deletedMiddle.Offset, Is.EqualTo(2)); } [Test] @@ -318,11 +318,11 @@ public void ReplaceTwoCharactersWithThree() before.MovementType = AnchorMovementType.AfterInsertion; document.Replace(1, 2, "123", OffsetChangeMappingType.CharacterReplace); - Assert.AreEqual("a123b", document.Text); - Assert.AreEqual(1, before.Offset); - Assert.AreEqual(4, after.Offset); - Assert.AreEqual(2, middleA.Offset); - Assert.AreEqual(2, middleB.Offset); + Assert.That(document.Text, Is.EqualTo("a123b")); + Assert.That(before.Offset, Is.EqualTo(1)); + Assert.That(after.Offset, Is.EqualTo(4)); + Assert.That(middleA.Offset, Is.EqualTo(2)); + Assert.That(middleB.Offset, Is.EqualTo(2)); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Document/TextSegmentTreeTest.cs b/ICSharpCode.AvalonEdit.Tests/Document/TextSegmentTreeTest.cs index 1f76c776..b98dddee 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/TextSegmentTreeTest.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/TextSegmentTreeTest.cs @@ -61,9 +61,9 @@ public void SetUp() [Test] public void FindInEmptyTree() { - Assert.AreSame(null, tree.FindFirstSegmentWithStartAfter(0)); - Assert.AreEqual(0, tree.FindSegmentsContaining(0).Count); - Assert.AreEqual(0, tree.FindOverlappingSegments(10, 20).Count); + Assert.That(tree.FindFirstSegmentWithStartAfter(0), Is.SameAs(null)); + Assert.That(tree.FindSegmentsContaining(0).Count, Is.EqualTo(0)); + Assert.That(tree.FindOverlappingSegments(10, 20).Count, Is.EqualTo(0)); } [Test] @@ -73,15 +73,15 @@ public void FindFirstSegmentWithStartAfter() var s2 = new TestTextSegment(10, 10); tree.Add(s1); tree.Add(s2); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(-100)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(0)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(4)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(5)); - Assert.AreSame(s2, tree.FindFirstSegmentWithStartAfter(6)); - Assert.AreSame(s2, tree.FindFirstSegmentWithStartAfter(9)); - Assert.AreSame(s2, tree.FindFirstSegmentWithStartAfter(10)); - Assert.AreSame(null, tree.FindFirstSegmentWithStartAfter(11)); - Assert.AreSame(null, tree.FindFirstSegmentWithStartAfter(100)); + Assert.That(tree.FindFirstSegmentWithStartAfter(-100), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(0), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(4), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(5), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(6), Is.SameAs(s2)); + Assert.That(tree.FindFirstSegmentWithStartAfter(9), Is.SameAs(s2)); + Assert.That(tree.FindFirstSegmentWithStartAfter(10), Is.SameAs(s2)); + Assert.That(tree.FindFirstSegmentWithStartAfter(11), Is.SameAs(null)); + Assert.That(tree.FindFirstSegmentWithStartAfter(100), Is.SameAs(null)); } [Test] @@ -95,17 +95,17 @@ public void FindFirstSegmentWithStartAfterWithDuplicates() tree.Add(s1b); tree.Add(s2); tree.Add(s2b); - Assert.AreSame(s1b, tree.GetNextSegment(s1)); - Assert.AreSame(s2b, tree.GetNextSegment(s2)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(-100)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(0)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(4)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(5)); - Assert.AreSame(s2, tree.FindFirstSegmentWithStartAfter(6)); - Assert.AreSame(s2, tree.FindFirstSegmentWithStartAfter(9)); - Assert.AreSame(s2, tree.FindFirstSegmentWithStartAfter(10)); - Assert.AreSame(null, tree.FindFirstSegmentWithStartAfter(11)); - Assert.AreSame(null, tree.FindFirstSegmentWithStartAfter(100)); + Assert.That(tree.GetNextSegment(s1), Is.SameAs(s1b)); + Assert.That(tree.GetNextSegment(s2), Is.SameAs(s2b)); + Assert.That(tree.FindFirstSegmentWithStartAfter(-100), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(0), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(4), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(5), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(6), Is.SameAs(s2)); + Assert.That(tree.FindFirstSegmentWithStartAfter(9), Is.SameAs(s2)); + Assert.That(tree.FindFirstSegmentWithStartAfter(10), Is.SameAs(s2)); + Assert.That(tree.FindFirstSegmentWithStartAfter(11), Is.SameAs(null)); + Assert.That(tree.FindFirstSegmentWithStartAfter(100), Is.SameAs(null)); } [Test] @@ -119,11 +119,11 @@ public void FindFirstSegmentWithStartAfterWithDuplicates2() tree.Add(s2); tree.Add(s3); tree.Add(s4); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(0)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(1)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(4)); - Assert.AreSame(s1, tree.FindFirstSegmentWithStartAfter(5)); - Assert.AreSame(null, tree.FindFirstSegmentWithStartAfter(6)); + Assert.That(tree.FindFirstSegmentWithStartAfter(0), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(1), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(4), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(5), Is.SameAs(s1)); + Assert.That(tree.FindFirstSegmentWithStartAfter(6), Is.SameAs(null)); } TestTextSegment AddSegment(int offset, int length) @@ -153,16 +153,16 @@ void TestRetrieval(int offset, int length) continue; expected.Add(e); } - Assert.IsTrue(actual.IsSubsetOf(expected)); - Assert.IsTrue(expected.IsSubsetOf(actual)); + Assert.That(actual.IsSubsetOf(expected), Is.True); + Assert.That(expected.IsSubsetOf(actual), Is.True); } void CheckSegments() { - Assert.AreEqual(expectedSegments.Count, tree.Count); + Assert.That(tree.Count, Is.EqualTo(expectedSegments.Count)); foreach (TestTextSegment s in expectedSegments) { - Assert.AreEqual(s.ExpectedOffset, s.StartOffset /*, "startoffset for " + s*/); - Assert.AreEqual(s.ExpectedLength, s.Length /*, "length for " + s*/); + Assert.That(s.StartOffset, Is.EqualTo(s.ExpectedOffset) /*, "startoffset for " + s*/); + Assert.That(s.Length, Is.EqualTo(s.ExpectedLength) /*, "length for " + s*/); } } diff --git a/ICSharpCode.AvalonEdit.Tests/Document/TextUtilitiesTests.cs b/ICSharpCode.AvalonEdit.Tests/Document/TextUtilitiesTests.cs index 06d3e358..87516467 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/TextUtilitiesTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/TextUtilitiesTests.cs @@ -28,31 +28,31 @@ public class TextUtilitiesTests [Test] public void TestGetWhitespaceAfter() { - Assert.AreEqual(new SimpleSegment(2, 3), TextUtilities.GetWhitespaceAfter(new StringTextSource("a \t \tb"), 2)); + Assert.That(TextUtilities.GetWhitespaceAfter(new StringTextSource("a \t \tb"), 2), Is.EqualTo(new SimpleSegment(2, 3))); } [Test] public void TestGetWhitespaceAfterDoesNotSkipNewLine() { - Assert.AreEqual(new SimpleSegment(2, 3), TextUtilities.GetWhitespaceAfter(new StringTextSource("a \t \tb"), 2)); + Assert.That(TextUtilities.GetWhitespaceAfter(new StringTextSource("a \t \tb"), 2), Is.EqualTo(new SimpleSegment(2, 3))); } [Test] public void TestGetWhitespaceAfterEmptyResult() { - Assert.AreEqual(new SimpleSegment(2, 0), TextUtilities.GetWhitespaceAfter(new StringTextSource("a b"), 2)); + Assert.That(TextUtilities.GetWhitespaceAfter(new StringTextSource("a b"), 2), Is.EqualTo(new SimpleSegment(2, 0))); } [Test] public void TestGetWhitespaceAfterEndOfString() { - Assert.AreEqual(new SimpleSegment(2, 0), TextUtilities.GetWhitespaceAfter(new StringTextSource("a "), 2)); + Assert.That(TextUtilities.GetWhitespaceAfter(new StringTextSource("a "), 2), Is.EqualTo(new SimpleSegment(2, 0))); } [Test] public void TestGetWhitespaceAfterUntilEndOfString() { - Assert.AreEqual(new SimpleSegment(2, 3), TextUtilities.GetWhitespaceAfter(new StringTextSource("a \t \t"), 2)); + Assert.That(TextUtilities.GetWhitespaceAfter(new StringTextSource("a \t \t"), 2), Is.EqualTo(new SimpleSegment(2, 3))); } #endregion @@ -60,31 +60,31 @@ public void TestGetWhitespaceAfterUntilEndOfString() [Test] public void TestGetWhitespaceBefore() { - Assert.AreEqual(new SimpleSegment(1, 3), TextUtilities.GetWhitespaceBefore(new StringTextSource("a\t \t b"), 4)); + Assert.That(TextUtilities.GetWhitespaceBefore(new StringTextSource("a\t \t b"), 4), Is.EqualTo(new SimpleSegment(1, 3))); } [Test] public void TestGetWhitespaceBeforeDoesNotSkipNewLine() { - Assert.AreEqual(new SimpleSegment(2, 1), TextUtilities.GetWhitespaceBefore(new StringTextSource("a\n b"), 3)); + Assert.That(TextUtilities.GetWhitespaceBefore(new StringTextSource("a\n b"), 3), Is.EqualTo(new SimpleSegment(2, 1))); } [Test] public void TestGetWhitespaceBeforeEmptyResult() { - Assert.AreEqual(new SimpleSegment(2, 0), TextUtilities.GetWhitespaceBefore(new StringTextSource(" a b"), 2)); + Assert.That(TextUtilities.GetWhitespaceBefore(new StringTextSource(" a b"), 2), Is.EqualTo(new SimpleSegment(2, 0))); } [Test] public void TestGetWhitespaceBeforeStartOfString() { - Assert.AreEqual(new SimpleSegment(0, 0), TextUtilities.GetWhitespaceBefore(new StringTextSource(" a"), 0)); + Assert.That(TextUtilities.GetWhitespaceBefore(new StringTextSource(" a"), 0), Is.EqualTo(new SimpleSegment(0, 0))); } [Test] public void TestGetWhitespaceBeforeUntilStartOfString() { - Assert.AreEqual(new SimpleSegment(0, 2), TextUtilities.GetWhitespaceBefore(new StringTextSource(" \t a"), 2)); + Assert.That(TextUtilities.GetWhitespaceBefore(new StringTextSource(" \t a"), 2), Is.EqualTo(new SimpleSegment(0, 2))); } #endregion } diff --git a/ICSharpCode.AvalonEdit.Tests/Document/UndoStackTests.cs b/ICSharpCode.AvalonEdit.Tests/Document/UndoStackTests.cs index 2c9c425d..9eca13b9 100644 --- a/ICSharpCode.AvalonEdit.Tests/Document/UndoStackTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Document/UndoStackTests.cs @@ -32,7 +32,7 @@ public void ContinueUndoGroup() doc.Insert(1, "b"); doc.UndoStack.EndUndoGroup(); doc.UndoStack.Undo(); - Assert.AreEqual("", doc.Text); + Assert.That(doc.Text, Is.Empty); } [Test] @@ -46,7 +46,7 @@ public void ContinueEmptyUndoGroup() doc.Insert(1, "b"); doc.UndoStack.EndUndoGroup(); doc.UndoStack.Undo(); - Assert.AreEqual("a", doc.Text); + Assert.That(doc.Text, Is.EqualTo("a")); } [Test] @@ -61,7 +61,7 @@ public void ContinueEmptyUndoGroup_WithOptionalEntries() doc.Insert(1, "b"); doc.UndoStack.EndUndoGroup(); doc.UndoStack.Undo(); - Assert.AreEqual("a", doc.Text); + Assert.That(doc.Text, Is.EqualTo("a")); } [Test] @@ -75,7 +75,7 @@ public void EmptyContinuationGroup() doc.Insert(1, "b"); doc.UndoStack.EndUndoGroup(); doc.UndoStack.Undo(); - Assert.AreEqual("", doc.Text); + Assert.That(doc.Text, Is.Empty); } class StubUndoableAction : IUndoableOperation diff --git a/ICSharpCode.AvalonEdit.Tests/Editing/ChangeDocumentTests.cs b/ICSharpCode.AvalonEdit.Tests/Editing/ChangeDocumentTests.cs index d77c6d2f..15f3f5b9 100644 --- a/ICSharpCode.AvalonEdit.Tests/Editing/ChangeDocumentTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Editing/ChangeDocumentTests.cs @@ -35,9 +35,9 @@ public void ClearCaretAndSelectionOnDocumentChange() textArea.Caret.Offset = 6; textArea.Selection = Selection.Create(textArea, 3, 6); textArea.Document = new TextDocument("1\n2nd"); - Assert.AreEqual(0, textArea.Caret.Offset); - Assert.AreEqual(new TextLocation(1, 1), textArea.Caret.Location); - Assert.IsTrue(textArea.Selection.IsEmpty); + Assert.That(textArea.Caret.Offset, Is.EqualTo(0)); + Assert.That(textArea.Caret.Location, Is.EqualTo(new TextLocation(1, 1))); + Assert.That(textArea.Selection.IsEmpty, Is.True); } [Test] @@ -48,9 +48,9 @@ public void SetDocumentToNull() textArea.Caret.Offset = 6; textArea.Selection = Selection.Create(textArea, 3, 6); textArea.Document = null; - Assert.AreEqual(0, textArea.Caret.Offset); - Assert.AreEqual(new TextLocation(1, 1), textArea.Caret.Location); - Assert.IsTrue(textArea.Selection.IsEmpty); + Assert.That(textArea.Caret.Offset, Is.EqualTo(0)); + Assert.That(textArea.Caret.Location, Is.EqualTo(new TextLocation(1, 1))); + Assert.That(textArea.Selection.IsEmpty, Is.True); } [Test] @@ -61,16 +61,16 @@ public void CheckEventOrderOnDocumentChange() StringBuilder b = new StringBuilder(); textArea.TextView.DocumentChanged += delegate { b.Append("TextView.DocumentChanged;"); - Assert.AreSame(newDocument, textArea.TextView.Document); - Assert.AreSame(newDocument, textArea.Document); + Assert.That(textArea.TextView.Document, Is.SameAs(newDocument)); + Assert.That(textArea.Document, Is.SameAs(newDocument)); }; textArea.DocumentChanged += delegate { b.Append("TextArea.DocumentChanged;"); - Assert.AreSame(newDocument, textArea.TextView.Document); - Assert.AreSame(newDocument, textArea.Document); + Assert.That(textArea.TextView.Document, Is.SameAs(newDocument)); + Assert.That(textArea.Document, Is.SameAs(newDocument)); }; textArea.Document = newDocument; - Assert.AreEqual("TextView.DocumentChanged;TextArea.DocumentChanged;", b.ToString()); + Assert.That(b.ToString(), Is.EqualTo("TextView.DocumentChanged;TextArea.DocumentChanged;")); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Editing/TextSegmentReadOnlySectionTests.cs b/ICSharpCode.AvalonEdit.Tests/Editing/TextSegmentReadOnlySectionTests.cs index 23cbeb5b..894dbf61 100644 --- a/ICSharpCode.AvalonEdit.Tests/Editing/TextSegmentReadOnlySectionTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Editing/TextSegmentReadOnlySectionTests.cs @@ -39,57 +39,57 @@ public void SetUp() [Test] public void InsertionPossibleWhenNothingIsReadOnly() { - Assert.IsTrue(provider.CanInsert(0)); - Assert.IsTrue(provider.CanInsert(100)); + Assert.That(provider.CanInsert(0), Is.True); + Assert.That(provider.CanInsert(100), Is.True); } [Test] public void DeletionPossibleWhenNothingIsReadOnly() { var result = provider.GetDeletableSegments(new SimpleSegment(10, 20)).ToList(); - Assert.AreEqual(1, result.Count); - Assert.AreEqual(10, result[0].Offset); - Assert.AreEqual(20, result[0].Length); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0].Offset, Is.EqualTo(10)); + Assert.That(result[0].Length, Is.EqualTo(20)); } [Test] public void EmptyDeletionPossibleWhenNothingIsReadOnly() { var result = provider.GetDeletableSegments(new SimpleSegment(10, 0)).ToList(); - Assert.AreEqual(1, result.Count); - Assert.AreEqual(10, result[0].Offset); - Assert.AreEqual(0, result[0].Length); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0].Offset, Is.EqualTo(10)); + Assert.That(result[0].Length, Is.EqualTo(0)); } [Test] public void InsertionPossibleBeforeReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, EndOffset = 15 }); - Assert.IsTrue(provider.CanInsert(5)); + Assert.That(provider.CanInsert(5), Is.True); } [Test] public void InsertionPossibleAtStartOfReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, EndOffset = 15 }); - Assert.IsTrue(provider.CanInsert(10)); + Assert.That(provider.CanInsert(10), Is.True); } [Test] public void InsertionImpossibleInsideReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, EndOffset = 15 }); - Assert.IsFalse(provider.CanInsert(11)); - Assert.IsFalse(provider.CanInsert(12)); - Assert.IsFalse(provider.CanInsert(13)); - Assert.IsFalse(provider.CanInsert(14)); + Assert.That(provider.CanInsert(11), Is.False); + Assert.That(provider.CanInsert(12), Is.False); + Assert.That(provider.CanInsert(13), Is.False); + Assert.That(provider.CanInsert(14), Is.False); } [Test] public void InsertionPossibleAtEndOfReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, EndOffset = 15 }); - Assert.IsTrue(provider.CanInsert(15)); + Assert.That(provider.CanInsert(15), Is.True); } [Test] @@ -97,7 +97,7 @@ public void InsertionPossibleBetweenReadOnlySegments() { segments.Add(new TextSegment { StartOffset = 10, EndOffset = 15 }); segments.Add(new TextSegment { StartOffset = 15, EndOffset = 20 }); - Assert.IsTrue(provider.CanInsert(15)); + Assert.That(provider.CanInsert(15), Is.True); } [Test] @@ -105,7 +105,7 @@ public void DeletionImpossibleInReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(11, 2)).ToList(); - Assert.AreEqual(0, result.Count); + Assert.That(result.Count, Is.EqualTo(0)); } [Test] @@ -113,7 +113,7 @@ public void EmptyDeletionImpossibleInReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(11, 0)).ToList(); - Assert.AreEqual(0, result.Count); + Assert.That(result.Count, Is.EqualTo(0)); } [Test] @@ -121,9 +121,9 @@ public void EmptyDeletionPossibleAtStartOfReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(10, 0)).ToList(); - Assert.AreEqual(1, result.Count); - Assert.AreEqual(10, result[0].Offset); - Assert.AreEqual(0, result[0].Length); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0].Offset, Is.EqualTo(10)); + Assert.That(result[0].Length, Is.EqualTo(0)); } [Test] @@ -131,9 +131,9 @@ public void EmptyDeletionPossibleAtEndOfReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 10, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(15, 0)).ToList(); - Assert.AreEqual(1, result.Count); - Assert.AreEqual(15, result[0].Offset); - Assert.AreEqual(0, result[0].Length); + Assert.That(result.Count, Is.EqualTo(1)); + Assert.That(result[0].Offset, Is.EqualTo(15)); + Assert.That(result[0].Length, Is.EqualTo(0)); } [Test] @@ -141,11 +141,11 @@ public void DeletionAroundReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 20, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(15, 16)).ToList(); - Assert.AreEqual(2, result.Count); - Assert.AreEqual(15, result[0].Offset); - Assert.AreEqual(5, result[0].Length); - Assert.AreEqual(25, result[1].Offset); - Assert.AreEqual(6, result[1].Length); + Assert.That(result.Count, Is.EqualTo(2)); + Assert.That(result[0].Offset, Is.EqualTo(15)); + Assert.That(result[0].Length, Is.EqualTo(5)); + Assert.That(result[1].Offset, Is.EqualTo(25)); + Assert.That(result[1].Length, Is.EqualTo(6)); } [Test] @@ -153,7 +153,7 @@ public void DeleteLastCharacterInReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 20, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(24, 1)).ToList(); - Assert.AreEqual(0, result.Count); + Assert.That(result.Count, Is.EqualTo(0)); /* // we would need this result for the old Backspace code so that the last character doesn't get selected: Assert.AreEqual(1, result.Count); Assert.AreEqual(25, result[0].Offset); @@ -165,7 +165,7 @@ public void DeleteFirstCharacterInReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 20, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(20, 1)).ToList(); - Assert.AreEqual(0, result.Count); + Assert.That(result.Count, Is.EqualTo(0)); /* // we would need this result for the old Delete code so that the first character doesn't get selected: Assert.AreEqual(1, result.Count); Assert.AreEqual(2, result[0].Offset); @@ -177,7 +177,7 @@ public void DeleteWholeReadOnlySegment() { segments.Add(new TextSegment { StartOffset = 20, Length = 5 }); var result = provider.GetDeletableSegments(new SimpleSegment(20, 5)).ToList(); - Assert.AreEqual(0, result.Count); + Assert.That(result.Count, Is.EqualTo(0)); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Highlighting/DeserializationTests.cs b/ICSharpCode.AvalonEdit.Tests/Highlighting/DeserializationTests.cs index 1ea3ab07..2cf27040 100644 --- a/ICSharpCode.AvalonEdit.Tests/Highlighting/DeserializationTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Highlighting/DeserializationTests.cs @@ -6,6 +6,7 @@ using ICSharpCode.AvalonEdit.Highlighting.Xshd; using Newtonsoft.Json; + using NUnit.Framework; @@ -31,7 +32,7 @@ public void TestRoundTripColor() string jsonString = JsonConvert.SerializeObject(color); HighlightingColor color2 = JsonConvert.DeserializeObject(jsonString); - Assert.AreEqual(color, color2); + Assert.That(color2, Is.EqualTo(color)); } [TestCase("CSharp-Mode.xshd")] @@ -43,9 +44,9 @@ public void XshdSerializationDoesNotCrash(string resourceName) xshd = HighlightingLoader.LoadXshd(reader, false); } } - Assert.AreEqual("C#", xshd.Name); - Assert.IsNotEmpty(xshd.Extensions); - Assert.AreEqual(".cs", xshd.Extensions[0]); + Assert.That(xshd.Name, Is.EqualTo("C#")); + Assert.That(xshd.Extensions, Is.Not.Empty); + Assert.That(xshd.Extensions[0], Is.EqualTo(".cs")); Assert.DoesNotThrow(() => JsonConvert.SerializeObject(xshd)); } diff --git a/ICSharpCode.AvalonEdit.Tests/Highlighting/HtmlClipboardTests.cs b/ICSharpCode.AvalonEdit.Tests/Highlighting/HtmlClipboardTests.cs index 0d7ffd99..24575504 100644 --- a/ICSharpCode.AvalonEdit.Tests/Highlighting/HtmlClipboardTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Highlighting/HtmlClipboardTests.cs @@ -40,9 +40,9 @@ public void FullDocumentTest() { var segment = new TextSegment { StartOffset = 0, Length = document.TextLength }; string html = HtmlClipboard.CreateHtmlFragment(document, highlighter, segment, new HtmlOptions()); - Assert.AreEqual("using System.Text;
" + Environment.NewLine + - "    string " + - "text = SomeMethod();", html); + Assert.That(html, Is.EqualTo("using System.Text;
" + Environment.NewLine + + "    string " + + "text = SomeMethod();")); } [Test] @@ -50,7 +50,7 @@ public void PartOfHighlightedWordTest() { var segment = new TextSegment { StartOffset = 1, Length = 3 }; string html = HtmlClipboard.CreateHtmlFragment(document, highlighter, segment, new HtmlOptions()); - Assert.AreEqual("sin", html); + Assert.That(html, Is.EqualTo("sin")); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Highlighting/RichTextTests.cs b/ICSharpCode.AvalonEdit.Tests/Highlighting/RichTextTests.cs index e3876b58..973eb8df 100644 --- a/ICSharpCode.AvalonEdit.Tests/Highlighting/RichTextTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Highlighting/RichTextTests.cs @@ -38,9 +38,9 @@ public void ConcatTest() var text2 = new RichText("text2", textModel2); RichText text3 = RichText.Concat(text1, RichText.Empty, text2); - Assert.AreEqual(text1.GetHighlightingAt(0), text3.GetHighlightingAt(0)); - Assert.AreNotEqual(text1.GetHighlightingAt(0), text3.GetHighlightingAt(5)); - Assert.AreEqual(text2.GetHighlightingAt(0), text3.GetHighlightingAt(5)); + Assert.That(text3.GetHighlightingAt(0), Is.EqualTo(text1.GetHighlightingAt(0))); + Assert.That(text3.GetHighlightingAt(5), Is.Not.EqualTo(text1.GetHighlightingAt(0))); + Assert.That(text3.GetHighlightingAt(5), Is.EqualTo(text2.GetHighlightingAt(0))); } [Test] @@ -52,7 +52,7 @@ public void ToHtmlTest() textModel.SetFontWeight(15, 1, FontWeights.Bold); var text = new RichText("This has spaces!", textModel); var html = text.ToHtml(new HtmlOptions()); - Assert.AreEqual("This has spaces!", html); + Assert.That(html, Is.EqualTo("This has spaces!")); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj b/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj index 4a7ccf17..1c2a4c27 100644 --- a/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj +++ b/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj @@ -8,7 +8,7 @@ true ..\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.snk ic#code - 2000-2022 AlphaSierraPapa for the SharpDevelop Team + 2000-2025 AlphaSierraPapa for the SharpDevelop Team Tests for WPF-based extensible text editor false @@ -25,9 +25,9 @@ - - - + + + diff --git a/ICSharpCode.AvalonEdit.Tests/Search/FindTests.cs b/ICSharpCode.AvalonEdit.Tests/Search/FindTests.cs index 2e633124..0a0f9031 100644 --- a/ICSharpCode.AvalonEdit.Tests/Search/FindTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Search/FindTests.cs @@ -18,7 +18,9 @@ using System; using System.Linq; + using ICSharpCode.AvalonEdit.Document; + using NUnit.Framework; namespace ICSharpCode.AvalonEdit.Search @@ -32,98 +34,99 @@ public void SkipWordBorderSimple() var strategy = SearchStrategyFactory.Create("All", false, true, SearchMode.Normal); var text = new StringTextSource(" FindAllTests "); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.IsEmpty(results, "No results should be found!"); + + + Assert.That(results, Is.Empty, "No results should be found!"); } - + [Test] public void SkipWordBorder() { var strategy = SearchStrategyFactory.Create("AllTests", false, true, SearchMode.Normal); var text = new StringTextSource("name=\"{FindAllTests}\""); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.IsEmpty(results, "No results should be found!"); + + Assert.That(results, Is.Empty, "No results should be found!"); } - + [Test] public void SkipWordBorder2() { var strategy = SearchStrategyFactory.Create("AllTests", false, true, SearchMode.Normal); var text = new StringTextSource("name=\"FindAllTests "); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.IsEmpty(results, "No results should be found!"); + + Assert.That(results, Is.Empty, "No results should be found!"); } - + [Test] public void SkipWordBorder3() { var strategy = SearchStrategyFactory.Create("// find", false, true, SearchMode.Normal); var text = new StringTextSource(" // findtest"); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.IsEmpty(results, "No results should be found!"); + + Assert.That(results, Is.Empty, "No results should be found!"); } - + [Test] public void WordBorderTest() { var strategy = SearchStrategyFactory.Create("// find", false, true, SearchMode.Normal); var text = new StringTextSource(" // find me"); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.AreEqual(1, results.Length, "One result should be found!"); - Assert.AreEqual(" ".Length, results[0].Offset); - Assert.AreEqual("// find".Length, results[0].Length); + + Assert.That(results.Length, Is.EqualTo(1), "One result should be found!"); + Assert.That(results[0].Offset, Is.EqualTo(" ".Length)); + Assert.That(results[0].Length, Is.EqualTo("// find".Length)); } - + [Test] public void ResultAtStart() { var strategy = SearchStrategyFactory.Create("result", false, true, SearchMode.Normal); var text = new StringTextSource("result // find me"); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.AreEqual(1, results.Length, "One result should be found!"); - Assert.AreEqual(0, results[0].Offset); - Assert.AreEqual("result".Length, results[0].Length); + + Assert.That(results.Length, Is.EqualTo(1), "One result should be found!"); + Assert.That(results[0].Offset, Is.EqualTo(0)); + Assert.That(results[0].Length, Is.EqualTo("result".Length)); } - + [Test] public void ResultAtEnd() { var strategy = SearchStrategyFactory.Create("me", false, true, SearchMode.Normal); var text = new StringTextSource("result // find me"); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.AreEqual(1, results.Length, "One result should be found!"); - Assert.AreEqual("result // find ".Length, results[0].Offset); - Assert.AreEqual("me".Length, results[0].Length); + + Assert.That(results.Length, Is.EqualTo(1), "One result should be found!"); + Assert.That(results[0].Offset, Is.EqualTo("result // find ".Length)); + Assert.That(results[0].Length, Is.EqualTo("me".Length)); } - + [Test] public void TextWithDots() { var strategy = SearchStrategyFactory.Create("Text", false, true, SearchMode.Normal); var text = new StringTextSource(".Text."); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.AreEqual(1, results.Length, "One result should be found!"); - Assert.AreEqual(".".Length, results[0].Offset); - Assert.AreEqual("Text".Length, results[0].Length); + + Assert.That(results.Length, Is.EqualTo(1), "One result should be found!"); + Assert.That(results[0].Offset, Is.EqualTo(".".Length)); + Assert.That(results[0].Length, Is.EqualTo("Text".Length)); } - + [Test] public void SimpleTest() { var strategy = SearchStrategyFactory.Create("AllTests", false, false, SearchMode.Normal); var text = new StringTextSource("name=\"FindAllTests "); var results = strategy.FindAll(text, 0, text.TextLength).ToArray(); - - Assert.AreEqual(1, results.Length, "One result should be found!"); - Assert.AreEqual("name=\"Find".Length, results[0].Offset); - Assert.AreEqual("AllTests".Length, results[0].Length); + + Assert.That(results.Length, Is.EqualTo(1), "One result should be found!"); + Assert.That(results[0].Offset, Is.EqualTo("name=\"Find".Length)); + Assert.That(results[0].Length, Is.EqualTo("AllTests".Length)); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Utils/CaretNavigationTests.cs b/ICSharpCode.AvalonEdit.Tests/Utils/CaretNavigationTests.cs index 76813e7b..65172df4 100644 --- a/ICSharpCode.AvalonEdit.Tests/Utils/CaretNavigationTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Utils/CaretNavigationTests.cs @@ -39,117 +39,117 @@ int GetPrevCaretStop(string text, int offset, CaretPositioningMode mode) [Test] public void CaretStopInEmptyString() { - Assert.AreEqual(0, GetNextCaretStop("", -1, CaretPositioningMode.Normal)); - Assert.AreEqual(-1, GetNextCaretStop("", 0, CaretPositioningMode.Normal)); - Assert.AreEqual(-1, GetPrevCaretStop("", 0, CaretPositioningMode.Normal)); - Assert.AreEqual(0, GetPrevCaretStop("", 1, CaretPositioningMode.Normal)); - - Assert.AreEqual(-1, GetNextCaretStop("", -1, CaretPositioningMode.WordStart)); - Assert.AreEqual(-1, GetNextCaretStop("", -1, CaretPositioningMode.WordBorder)); - Assert.AreEqual(-1, GetPrevCaretStop("", 1, CaretPositioningMode.WordStart)); - Assert.AreEqual(-1, GetPrevCaretStop("", 1, CaretPositioningMode.WordBorder)); + Assert.That(GetNextCaretStop("", -1, CaretPositioningMode.Normal), Is.EqualTo(0)); + Assert.That(GetNextCaretStop("", 0, CaretPositioningMode.Normal), Is.EqualTo(-1)); + Assert.That(GetPrevCaretStop("", 0, CaretPositioningMode.Normal), Is.EqualTo(-1)); + Assert.That(GetPrevCaretStop("", 1, CaretPositioningMode.Normal), Is.EqualTo(0)); + + Assert.That(GetNextCaretStop("", -1, CaretPositioningMode.WordStart), Is.EqualTo(-1)); + Assert.That(GetNextCaretStop("", -1, CaretPositioningMode.WordBorder), Is.EqualTo(-1)); + Assert.That(GetPrevCaretStop("", 1, CaretPositioningMode.WordStart), Is.EqualTo(-1)); + Assert.That(GetPrevCaretStop("", 1, CaretPositioningMode.WordBorder), Is.EqualTo(-1)); } [Test] public void StartOfDocumentWithWordStart() { - Assert.AreEqual(0, GetNextCaretStop("word", -1, CaretPositioningMode.Normal)); - Assert.AreEqual(0, GetNextCaretStop("word", -1, CaretPositioningMode.WordStart)); - Assert.AreEqual(0, GetNextCaretStop("word", -1, CaretPositioningMode.WordBorder)); - - Assert.AreEqual(0, GetPrevCaretStop("word", 1, CaretPositioningMode.Normal)); - Assert.AreEqual(0, GetPrevCaretStop("word", 1, CaretPositioningMode.WordStart)); - Assert.AreEqual(0, GetPrevCaretStop("word", 1, CaretPositioningMode.WordBorder)); + Assert.That(GetNextCaretStop("word", -1, CaretPositioningMode.Normal), Is.EqualTo(0)); + Assert.That(GetNextCaretStop("word", -1, CaretPositioningMode.WordStart), Is.EqualTo(0)); + Assert.That(GetNextCaretStop("word", -1, CaretPositioningMode.WordBorder), Is.EqualTo(0)); + + Assert.That(GetPrevCaretStop("word", 1, CaretPositioningMode.Normal), Is.EqualTo(0)); + Assert.That(GetPrevCaretStop("word", 1, CaretPositioningMode.WordStart), Is.EqualTo(0)); + Assert.That(GetPrevCaretStop("word", 1, CaretPositioningMode.WordBorder), Is.EqualTo(0)); } [Test] public void StartOfDocumentNoWordStart() { - Assert.AreEqual(0, GetNextCaretStop(" word", -1, CaretPositioningMode.Normal)); - Assert.AreEqual(1, GetNextCaretStop(" word", -1, CaretPositioningMode.WordStart)); - Assert.AreEqual(1, GetNextCaretStop(" word", -1, CaretPositioningMode.WordBorder)); - - Assert.AreEqual(0, GetPrevCaretStop(" word", 1, CaretPositioningMode.Normal)); - Assert.AreEqual(-1, GetPrevCaretStop(" word", 1, CaretPositioningMode.WordStart)); - Assert.AreEqual(-1, GetPrevCaretStop(" word", 1, CaretPositioningMode.WordBorder)); + Assert.That(GetNextCaretStop(" word", -1, CaretPositioningMode.Normal), Is.EqualTo(0)); + Assert.That(GetNextCaretStop(" word", -1, CaretPositioningMode.WordStart), Is.EqualTo(1)); + Assert.That(GetNextCaretStop(" word", -1, CaretPositioningMode.WordBorder), Is.EqualTo(1)); + + Assert.That(GetPrevCaretStop(" word", 1, CaretPositioningMode.Normal), Is.EqualTo(0)); + Assert.That(GetPrevCaretStop(" word", 1, CaretPositioningMode.WordStart), Is.EqualTo(-1)); + Assert.That(GetPrevCaretStop(" word", 1, CaretPositioningMode.WordBorder), Is.EqualTo(-1)); } [Test] public void EndOfDocumentWordBorder() { - Assert.AreEqual(4, GetNextCaretStop("word", 3, CaretPositioningMode.Normal)); - Assert.AreEqual(-1, GetNextCaretStop("word", 3, CaretPositioningMode.WordStart)); - Assert.AreEqual(4, GetNextCaretStop("word", 3, CaretPositioningMode.WordBorder)); - - Assert.AreEqual(4, GetPrevCaretStop("word", 5, CaretPositioningMode.Normal)); - Assert.AreEqual(0, GetPrevCaretStop("word", 5, CaretPositioningMode.WordStart)); - Assert.AreEqual(4, GetPrevCaretStop("word", 5, CaretPositioningMode.WordBorder)); + Assert.That(GetNextCaretStop("word", 3, CaretPositioningMode.Normal), Is.EqualTo(4)); + Assert.That(GetNextCaretStop("word", 3, CaretPositioningMode.WordStart), Is.EqualTo(-1)); + Assert.That(GetNextCaretStop("word", 3, CaretPositioningMode.WordBorder), Is.EqualTo(4)); + + Assert.That(GetPrevCaretStop("word", 5, CaretPositioningMode.Normal), Is.EqualTo(4)); + Assert.That(GetPrevCaretStop("word", 5, CaretPositioningMode.WordStart), Is.EqualTo(0)); + Assert.That(GetPrevCaretStop("word", 5, CaretPositioningMode.WordBorder), Is.EqualTo(4)); } [Test] public void EndOfDocumentNoWordBorder() { - Assert.AreEqual(4, GetNextCaretStop("txt ", 3, CaretPositioningMode.Normal)); - Assert.AreEqual(-1, GetNextCaretStop("txt ", 3, CaretPositioningMode.WordStart)); - Assert.AreEqual(-1, GetNextCaretStop("txt ", 3, CaretPositioningMode.WordBorder)); - - Assert.AreEqual(4, GetPrevCaretStop("txt ", 5, CaretPositioningMode.Normal)); - Assert.AreEqual(0, GetPrevCaretStop("txt ", 5, CaretPositioningMode.WordStart)); - Assert.AreEqual(3, GetPrevCaretStop("txt ", 5, CaretPositioningMode.WordBorder)); + Assert.That(GetNextCaretStop("txt ", 3, CaretPositioningMode.Normal), Is.EqualTo(4)); + Assert.That(GetNextCaretStop("txt ", 3, CaretPositioningMode.WordStart), Is.EqualTo(-1)); + Assert.That(GetNextCaretStop("txt ", 3, CaretPositioningMode.WordBorder), Is.EqualTo(-1)); + + Assert.That(GetPrevCaretStop("txt ", 5, CaretPositioningMode.Normal), Is.EqualTo(4)); + Assert.That(GetPrevCaretStop("txt ", 5, CaretPositioningMode.WordStart), Is.EqualTo(0)); + Assert.That(GetPrevCaretStop("txt ", 5, CaretPositioningMode.WordBorder), Is.EqualTo(3)); } [Test] public void SingleCharacterOutsideBMP() { string c = "\U0001D49E"; - Assert.AreEqual(2, GetNextCaretStop(c, 0, CaretPositioningMode.Normal)); - Assert.AreEqual(0, GetPrevCaretStop(c, 2, CaretPositioningMode.Normal)); + Assert.That(GetNextCaretStop(c, 0, CaretPositioningMode.Normal), Is.EqualTo(2)); + Assert.That(GetPrevCaretStop(c, 2, CaretPositioningMode.Normal), Is.EqualTo(0)); } [Test] public void DetectWordBordersOutsideBMP() { string c = " a\U0001D49Eb "; - Assert.AreEqual(1, GetNextCaretStop(c, 0, CaretPositioningMode.WordBorder)); - Assert.AreEqual(5, GetNextCaretStop(c, 1, CaretPositioningMode.WordBorder)); - - Assert.AreEqual(5, GetPrevCaretStop(c, 6, CaretPositioningMode.WordBorder)); - Assert.AreEqual(1, GetPrevCaretStop(c, 5, CaretPositioningMode.WordBorder)); + Assert.That(GetNextCaretStop(c, 0, CaretPositioningMode.WordBorder), Is.EqualTo(1)); + Assert.That(GetNextCaretStop(c, 1, CaretPositioningMode.WordBorder), Is.EqualTo(5)); + + Assert.That(GetPrevCaretStop(c, 6, CaretPositioningMode.WordBorder), Is.EqualTo(5)); + Assert.That(GetPrevCaretStop(c, 5, CaretPositioningMode.WordBorder), Is.EqualTo(1)); } [Test] public void DetectWordBordersOutsideBMP2() { string c = " \U0001D49E\U0001D4AA "; - Assert.AreEqual(1, GetNextCaretStop(c, 0, CaretPositioningMode.WordBorder)); - Assert.AreEqual(5, GetNextCaretStop(c, 1, CaretPositioningMode.WordBorder)); - - Assert.AreEqual(5, GetPrevCaretStop(c, 6, CaretPositioningMode.WordBorder)); - Assert.AreEqual(1, GetPrevCaretStop(c, 5, CaretPositioningMode.WordBorder)); + Assert.That(GetNextCaretStop(c, 0, CaretPositioningMode.WordBorder), Is.EqualTo(1)); + Assert.That(GetNextCaretStop(c, 1, CaretPositioningMode.WordBorder), Is.EqualTo(5)); + + Assert.That(GetPrevCaretStop(c, 6, CaretPositioningMode.WordBorder), Is.EqualTo(5)); + Assert.That(GetPrevCaretStop(c, 5, CaretPositioningMode.WordBorder), Is.EqualTo(1)); } [Test] public void CombiningMark() { string str = " x͆ "; - Assert.AreEqual(3, GetNextCaretStop(str, 1, CaretPositioningMode.Normal)); - Assert.AreEqual(1, GetPrevCaretStop(str, 3, CaretPositioningMode.Normal)); + Assert.That(GetNextCaretStop(str, 1, CaretPositioningMode.Normal), Is.EqualTo(3)); + Assert.That(GetPrevCaretStop(str, 3, CaretPositioningMode.Normal), Is.EqualTo(1)); } [Test] public void StackedCombiningMark() { string str = " x͆͆͆͆ "; - Assert.AreEqual(6, GetNextCaretStop(str, 1, CaretPositioningMode.Normal)); - Assert.AreEqual(1, GetPrevCaretStop(str, 6, CaretPositioningMode.Normal)); + Assert.That(GetNextCaretStop(str, 1, CaretPositioningMode.Normal), Is.EqualTo(6)); + Assert.That(GetPrevCaretStop(str, 6, CaretPositioningMode.Normal), Is.EqualTo(1)); } [Test] public void SingleClosingBraceAtLineEnd() { string str = "\t\t}"; - Assert.AreEqual(2, GetNextCaretStop(str, 1, CaretPositioningMode.WordStart)); - Assert.AreEqual(-1, GetPrevCaretStop(str, 1, CaretPositioningMode.WordStart)); + Assert.That(GetNextCaretStop(str, 1, CaretPositioningMode.WordStart), Is.EqualTo(2)); + Assert.That(GetPrevCaretStop(str, 1, CaretPositioningMode.WordStart), Is.EqualTo(-1)); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Utils/CompressingTreeListTests.cs b/ICSharpCode.AvalonEdit.Tests/Utils/CompressingTreeListTests.cs index f6e2c038..521829e0 100644 --- a/ICSharpCode.AvalonEdit.Tests/Utils/CompressingTreeListTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Utils/CompressingTreeListTests.cs @@ -29,7 +29,7 @@ public class CompressingTreeListTests public void EmptyTreeList() { CompressingTreeList list = new CompressingTreeList(string.Equals); - Assert.AreEqual(0, list.Count); + Assert.That(list.Count, Is.EqualTo(0)); foreach (string v in list) { Assert.Fail(); } @@ -44,7 +44,7 @@ public void CheckAdd10BillionElements() CompressingTreeList list = new CompressingTreeList(string.Equals); list.InsertRange(0, billion, "A"); list.InsertRange(1, billion, "B"); - Assert.AreEqual(2 * billion, list.Count); + Assert.That(list.Count, Is.EqualTo(2 * billion)); Assert.Throws(delegate { list.InsertRange(2, billion, "C"); }); } @@ -57,7 +57,7 @@ public void AddRepeated() list.Add(42); list.Insert(0, 42); list.Insert(1, 42); - Assert.AreEqual(new[] { 42, 42, 42, 42, 42 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 42, 42, 42, 42, 42 })); } [Test] @@ -67,15 +67,15 @@ public void RemoveRange() for (int i = 1; i <= 3; i++) { list.InsertRange(list.Count, 2, i); } - Assert.AreEqual(new[] { 1, 1, 2, 2, 3, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 1, 2, 2, 3, 3 })); list.RemoveRange(1, 4); - Assert.AreEqual(new[] { 1, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 3 })); list.Insert(1, 1); list.InsertRange(2, 2, 2); list.Insert(4, 1); - Assert.AreEqual(new[] { 1, 1, 2, 2, 1, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 1, 2, 2, 1, 3 })); list.RemoveRange(2, 2); - Assert.AreEqual(new[] { 1, 1, 1, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 1, 1, 3 })); } [Test] @@ -85,9 +85,9 @@ public void RemoveAtEnd() for (int i = 1; i <= 3; i++) { list.InsertRange(list.Count, 2, i); } - Assert.AreEqual(new[] { 1, 1, 2, 2, 3, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 1, 2, 2, 3, 3 })); list.RemoveRange(3, 3); - Assert.AreEqual(new[] { 1, 1, 2 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 1, 2 })); } [Test] @@ -97,9 +97,9 @@ public void RemoveAtStart() for (int i = 1; i <= 3; i++) { list.InsertRange(list.Count, 2, i); } - Assert.AreEqual(new[] { 1, 1, 2, 2, 3, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 1, 2, 2, 3, 3 })); list.RemoveRange(0, 1); - Assert.AreEqual(new[] { 1, 2, 2, 3, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 2, 2, 3, 3 })); } [Test] @@ -109,9 +109,9 @@ public void RemoveAtStart2() for (int i = 1; i <= 3; i++) { list.InsertRange(list.Count, 2, i); } - Assert.AreEqual(new[] { 1, 1, 2, 2, 3, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 1, 2, 2, 3, 3 })); list.RemoveRange(0, 3); - Assert.AreEqual(new[] { 2, 3, 3 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 2, 3, 3 })); } [Test] @@ -121,8 +121,8 @@ public void Transform() list.AddRange(new[] { 0, 1, 1, 0 }); int calls = 0; list.Transform(i => { calls++; return i + 1; }); - Assert.AreEqual(3, calls); - Assert.AreEqual(new[] { 1, 2, 2, 1 }, list.ToArray()); + Assert.That(calls, Is.EqualTo(3)); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 1, 2, 2, 1 })); } [Test] @@ -131,7 +131,7 @@ public void TransformToZero() CompressingTreeList list = new CompressingTreeList((a, b) => a == b); list.AddRange(new[] { 0, 1, 1, 0 }); list.Transform(i => 0); - Assert.AreEqual(new[] { 0, 0, 0, 0 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 0, 0, 0, 0 })); } [Test] @@ -140,7 +140,7 @@ public void TransformRange() CompressingTreeList list = new CompressingTreeList((a, b) => a == b); list.AddRange(new[] { 0, 1, 1, 1, 0, 0 }); list.TransformRange(2, 3, i => 0); - Assert.AreEqual(new[] { 0, 1, 0, 0, 0, 0 }, list.ToArray()); + Assert.That(list.ToArray(), Is.EqualTo(new[] { 0, 1, 0, 0, 0, 0 })); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Utils/ExtensionMethodsTests.cs b/ICSharpCode.AvalonEdit.Tests/Utils/ExtensionMethodsTests.cs index 9f77f681..aa85c78d 100644 --- a/ICSharpCode.AvalonEdit.Tests/Utils/ExtensionMethodsTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Utils/ExtensionMethodsTests.cs @@ -27,25 +27,25 @@ public class ExtensionMethodsTests [Test] public void ZeroIsNotCloseToOne() { - Assert.IsFalse(0.0.IsClose(1)); + Assert.That(0.0.IsClose(1), Is.False); } [Test] public void ZeroIsCloseToZero() { - Assert.IsTrue(0.0.IsClose(0)); + Assert.That(0.0.IsClose(0), Is.True); } [Test] public void InfinityIsCloseToInfinity() { - Assert.IsTrue(double.PositiveInfinity.IsClose(double.PositiveInfinity)); + Assert.That(double.PositiveInfinity.IsClose(double.PositiveInfinity), Is.True); } [Test] public void NaNIsNotCloseToNaN() { - Assert.IsFalse(double.NaN.IsClose(double.NaN)); + Assert.That(double.NaN.IsClose(double.NaN), Is.False); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Utils/IndentationStringTests.cs b/ICSharpCode.AvalonEdit.Tests/Utils/IndentationStringTests.cs index a580791d..0f3cde20 100644 --- a/ICSharpCode.AvalonEdit.Tests/Utils/IndentationStringTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Utils/IndentationStringTests.cs @@ -28,24 +28,24 @@ public class IndentationStringTests public void IndentWithSingleTab() { var options = new TextEditorOptions { IndentationSize = 4, ConvertTabsToSpaces = false }; - Assert.AreEqual("\t", options.IndentationString); - Assert.AreEqual("\t", options.GetIndentationString(2)); - Assert.AreEqual("\t", options.GetIndentationString(3)); - Assert.AreEqual("\t", options.GetIndentationString(4)); - Assert.AreEqual("\t", options.GetIndentationString(5)); - Assert.AreEqual("\t", options.GetIndentationString(6)); + Assert.That(options.IndentationString, Is.EqualTo("\t")); + Assert.That(options.GetIndentationString(2), Is.EqualTo("\t")); + Assert.That(options.GetIndentationString(3), Is.EqualTo("\t")); + Assert.That(options.GetIndentationString(4), Is.EqualTo("\t")); + Assert.That(options.GetIndentationString(5), Is.EqualTo("\t")); + Assert.That(options.GetIndentationString(6), Is.EqualTo("\t")); } [Test] public void IndentWith4Spaces() { var options = new TextEditorOptions { IndentationSize = 4, ConvertTabsToSpaces = true }; - Assert.AreEqual(" ", options.IndentationString); - Assert.AreEqual(" ", options.GetIndentationString(2)); - Assert.AreEqual(" ", options.GetIndentationString(3)); - Assert.AreEqual(" ", options.GetIndentationString(4)); - Assert.AreEqual(" ", options.GetIndentationString(5)); - Assert.AreEqual(" ", options.GetIndentationString(6)); + Assert.That(options.IndentationString, Is.EqualTo(" ")); + Assert.That(options.GetIndentationString(2), Is.EqualTo(" ")); + Assert.That(options.GetIndentationString(3), Is.EqualTo(" ")); + Assert.That(options.GetIndentationString(4), Is.EqualTo(" ")); + Assert.That(options.GetIndentationString(5), Is.EqualTo(" ")); + Assert.That(options.GetIndentationString(6), Is.EqualTo(" ")); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/Utils/RopeTests.cs b/ICSharpCode.AvalonEdit.Tests/Utils/RopeTests.cs index 21e6c573..d74e7af7 100644 --- a/ICSharpCode.AvalonEdit.Tests/Utils/RopeTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/Utils/RopeTests.cs @@ -30,24 +30,24 @@ public class RopeTests public void EmptyRope() { Rope empty = new Rope(); - Assert.AreEqual(0, empty.Length); - Assert.AreEqual("", empty.ToString()); + Assert.That(empty.Length, Is.EqualTo(0)); + Assert.That(empty.ToString(), Is.Empty); } [Test] public void EmptyRopeFromString() { Rope empty = new Rope(string.Empty); - Assert.AreEqual(0, empty.Length); - Assert.AreEqual("", empty.ToString()); + Assert.That(empty.Length, Is.EqualTo(0)); + Assert.That(empty.ToString(), Is.Empty); } [Test] public void InitializeRopeFromShortString() { Rope rope = new Rope("Hello, World"); - Assert.AreEqual(12, rope.Length); - Assert.AreEqual("Hello, World", rope.ToString()); + Assert.That(rope.Length, Is.EqualTo(12)); + Assert.That(rope.ToString(), Is.EqualTo("Hello, World")); } string BuildLongString(int lines) @@ -65,9 +65,9 @@ public void InitializeRopeFromLongString() { string text = BuildLongString(1000); Rope rope = new Rope(text); - Assert.AreEqual(text.Length, rope.Length); - Assert.AreEqual(text, rope.ToString()); - Assert.AreEqual(text.ToCharArray(), rope.ToArray()); + Assert.That(rope.Length, Is.EqualTo(text.Length)); + Assert.That(rope.ToString(), Is.EqualTo(text)); + Assert.That(rope.ToArray(), Is.EqualTo(text.ToCharArray())); } [Test] @@ -78,12 +78,12 @@ public void TestToArrayAndToStringWithParts() string textPart = text.Substring(1200, 600); char[] arrayPart = textPart.ToCharArray(); - Assert.AreEqual(textPart, rope.ToString(1200, 600)); - Assert.AreEqual(arrayPart, rope.ToArray(1200, 600)); + Assert.That(rope.ToString(1200, 600), Is.EqualTo(textPart)); + Assert.That(rope.ToArray(1200, 600), Is.EqualTo(arrayPart)); Rope partialRope = rope.GetRange(1200, 600); - Assert.AreEqual(textPart, partialRope.ToString()); - Assert.AreEqual(arrayPart, partialRope.ToArray()); + Assert.That(partialRope.ToString(), Is.EqualTo(textPart)); + Assert.That(partialRope.ToArray(), Is.EqualTo(arrayPart)); } [Test] @@ -97,7 +97,7 @@ public void ConcatenateStringToRope() b.Append(' '); rope.Add(' '); } - Assert.AreEqual(b.ToString(), rope.ToString()); + Assert.That(rope.ToString(), Is.EqualTo(b.ToString())); } [Test] @@ -110,7 +110,7 @@ public void ConcatenateSmallRopesToRope() b.Append(' '); rope.AddRange(CharRope.Create(i.ToString() + " ")); } - Assert.AreEqual(b.ToString(), rope.ToString()); + Assert.That(rope.ToString(), Is.EqualTo(b.ToString())); } [Test] @@ -119,7 +119,7 @@ public void AppendLongTextToEmptyRope() string text = BuildLongString(1000); Rope rope = new Rope(); rope.AddText(text); - Assert.AreEqual(text, rope.ToString()); + Assert.That(rope.ToString(), Is.EqualTo(text)); } [Test] @@ -135,7 +135,7 @@ public void ConcatenateStringToRopeBackwards() rope.Insert(0, ' '); rope.InsertText(0, i.ToString()); } - Assert.AreEqual(b.ToString(), rope.ToString()); + Assert.That(rope.ToString(), Is.EqualTo(b.ToString())); } [Test] @@ -150,7 +150,7 @@ public void ConcatenateSmallRopesToRopeBackwards() for (int i = 1000; i >= 1; i--) { rope.InsertRange(0, CharRope.Create(i.ToString() + " ")); } - Assert.AreEqual(b.ToString(), rope.ToString()); + Assert.That(rope.ToString(), Is.EqualTo(b.ToString())); } [Test] @@ -171,7 +171,7 @@ public void ConcatenateStringToRopeByInsertionInMiddle() rope.InsertText(middle, (999-i).ToString("d3")); rope.Insert(middle + 3, ' '); } - Assert.AreEqual(b.ToString(), rope.ToString()); + Assert.That(rope.ToString(), Is.EqualTo(b.ToString())); } [Test] @@ -189,7 +189,7 @@ public void ConcatenateSmallRopesByInsertionInMiddle() middle += 4; rope.InsertRange(middle, CharRope.Create((1001-i).ToString("d3") + " ")); } - Assert.AreEqual(b.ToString(), rope.ToString()); + Assert.That(rope.ToString(), Is.EqualTo(b.ToString())); } } } diff --git a/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs b/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs index b933d742..a0fa26be 100644 --- a/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs +++ b/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs @@ -35,7 +35,7 @@ public void TextViewCanBeCollectedTest() { WeakReference wr = TextViewCanBeCollectedTest_CreateTextView(); GarbageCollect(); - Assert.IsFalse(wr.IsAlive); + Assert.That(wr.IsAlive, Is.False); } // Use separate no-inline method so that the JIT can't keep a strong @@ -50,19 +50,19 @@ WeakReference TextViewCanBeCollectedTest_CreateTextView() public void DocumentDoesNotHoldReferenceToTextView() { TextDocument textDocument = new TextDocument(); - Assert.AreEqual(0, textDocument.LineTrackers.Count); + Assert.That(textDocument.LineTrackers.Count, Is.EqualTo(0)); WeakReference wr = DocumentDoesNotHoldReferenceToTextView_CreateTextView(textDocument); - Assert.AreEqual(1, textDocument.LineTrackers.Count); + Assert.That(textDocument.LineTrackers.Count, Is.EqualTo(1)); GarbageCollect(); - Assert.IsFalse(wr.IsAlive); + Assert.That(wr.IsAlive, Is.False); // document cannot immediately clear the line tracker - Assert.AreEqual(1, textDocument.LineTrackers.Count); + Assert.That(textDocument.LineTrackers.Count, Is.EqualTo(1)); // but it should clear it on the next change textDocument.Insert(0, "a"); - Assert.AreEqual(0, textDocument.LineTrackers.Count); + Assert.That(textDocument.LineTrackers.Count, Is.EqualTo(0)); } [MethodImpl(MethodImplOptions.NoInlining)] @@ -80,7 +80,7 @@ public void DocumentDoesNotHoldReferenceToTextArea() WeakReference wr = DocumentDoesNotHoldReferenceToTextArea_CreateTextArea(textDocument); GarbageCollect(); - Assert.IsFalse(wr.IsAlive); + Assert.That(wr.IsAlive, Is.False); GC.KeepAlive(textDocument); } @@ -99,7 +99,7 @@ public void DocumentDoesNotHoldReferenceToTextEditor() WeakReference wr = DocumentDoesNotHoldReferenceToTextEditor_CreateTextEditor(textDocument); GarbageCollect(); - Assert.IsFalse(wr.IsAlive); + Assert.That(wr.IsAlive, Is.False); GC.KeepAlive(textDocument); } @@ -119,7 +119,7 @@ public void DocumentDoesNotHoldReferenceToLineMargin() WeakReference wr = DocumentDoesNotHoldReferenceToLineMargin_CreateMargin(textDocument); GarbageCollect(); - Assert.IsFalse(wr.IsAlive); + Assert.That(wr.IsAlive, Is.False); GC.KeepAlive(textDocument); }