Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 254e5725 编写于 作者: A Andrew Casey
浏览文件
操作

Merge pull request #5102 from amcasey/RemoveStep 

Eliminate history test helpers
上级 6d155f1e ef155a6d
展开全部 隐藏空白更改
内联 并排
Showing with 240 addition and 320 deletion
src/InteractiveWindow/EditorTest/HistoryTests.cs
浏览文件 @ 254e5725
......@@ -114,12 +114,11 @@ public void TestPrevious()
{
AddEntries("1", "2", "3");
Test(
new Step(() => _history.GetPrevious(null), "3"),
new Step(() => _history.GetPrevious(null), "2"),
new Step(() => _history.GetPrevious(null), "1"),
new Step(() => _history.GetPrevious(null), null),
new Step(() => _history.GetPrevious(null), null));
CheckHistoryText(_history.GetPrevious(null), "3");
CheckHistoryText(_history.GetPrevious(null), "2");
CheckHistoryText(_history.GetPrevious(null), "1");
CheckHistoryText(_history.GetPrevious(null), null);
CheckHistoryText(_history.GetPrevious(null), null);
}
[Fact]
......@@ -127,17 +126,16 @@ public void TestNext()
{
AddEntries("1", "2", "3");
Test(
new Step(() => _history.GetNext(null), null),
new Step(() => _history.GetNext(null), null),
new Step(() => _history.GetPrevious(null), "3"),
new Step(() => _history.GetPrevious(null), "2"),
new Step(() => _history.GetPrevious(null), "1"),
new Step(() => _history.GetPrevious(null), null),
new Step(() => _history.GetNext(null), "2"),
new Step(() => _history.GetNext(null), "3"),
new Step(() => _history.GetNext(null), null),
new Step(() => _history.GetNext(null), null));
CheckHistoryText(_history.GetNext(null), null);
CheckHistoryText(_history.GetNext(null), null);
CheckHistoryText(_history.GetPrevious(null), "3");
CheckHistoryText(_history.GetPrevious(null), "2");
CheckHistoryText(_history.GetPrevious(null), "1");
CheckHistoryText(_history.GetPrevious(null), null);
CheckHistoryText(_history.GetNext(null), "2");
CheckHistoryText(_history.GetNext(null), "3");
CheckHistoryText(_history.GetNext(null), null);
CheckHistoryText(_history.GetNext(null), null);
}
[Fact]
......@@ -145,9 +143,8 @@ public void TestPreviousWithPattern_NoMatch()
{
AddEntries("123", "12", "1");
Test(
new Step(() => _history.GetPrevious("4"), null),
new Step(() => _history.GetPrevious("4"), null));
CheckHistoryText(_history.GetPrevious("4"), null);
CheckHistoryText(_history.GetPrevious("4"), null);
}
[Fact]
......@@ -155,10 +152,9 @@ public void TestPreviousWithPattern_PatternMaintained()
{
AddEntries("123", "12", "1");
Test(
new Step(() => _history.GetPrevious("12"), "12"), // Skip over non-matching entry.
new Step(() => _history.GetPrevious("12"), "123"),
new Step(() => _history.GetPrevious("12"), null));
CheckHistoryText(_history.GetPrevious("12"), "12"); // Skip over non-matching entry.
CheckHistoryText(_history.GetPrevious("12"), "123");
CheckHistoryText(_history.GetPrevious("12"), null);
}
[Fact]
......@@ -166,10 +162,9 @@ public void TestPreviousWithPattern_PatternDropped()
{
AddEntries("1", "2", "3");
Test(
new Step(() => _history.GetPrevious("2"), "2"), // Skip over non-matching entry.
new Step(() => _history.GetPrevious(null), "1"), // Pattern isn't passed, so return to normal iteration.
new Step(() => _history.GetPrevious(null), null));
CheckHistoryText(_history.GetPrevious("2"), "2"); // Skip over non-matching entry.
CheckHistoryText(_history.GetPrevious(null), "1"); // Pattern isn't passed, so return to normal iteration.
CheckHistoryText(_history.GetPrevious(null), null);
}
[Fact]
......@@ -177,10 +172,9 @@ public void TestPreviousWithPattern_PatternChanged()
{
AddEntries("1a", "2a", "1b", "2b");
Test(
new Step(() => _history.GetPrevious("1"), "1b"), // Skip over non-matching entry.
new Step(() => _history.GetPrevious("2"), "2a"), // Skip over non-matching entry.
new Step(() => _history.GetPrevious("2"), null));
CheckHistoryText(_history.GetPrevious("1"), "1b"); // Skip over non-matching entry.
CheckHistoryText(_history.GetPrevious("2"), "2a"); // Skip over non-matching entry.
CheckHistoryText(_history.GetPrevious("2"), null);
}
[Fact]
......@@ -188,14 +182,13 @@ public void TestNextWithPattern_NoMatch()
{
AddEntries("start", "1", "12", "123");
Test(
new Step(() => _history.GetPrevious(null), "123"),
new Step(() => _history.GetPrevious(null), "12"),
new Step(() => _history.GetPrevious(null), "1"),
new Step(() => _history.GetPrevious(null), "start"),
CheckHistoryText(_history.GetPrevious(null), "123");
CheckHistoryText(_history.GetPrevious(null), "12");
CheckHistoryText(_history.GetPrevious(null), "1");
CheckHistoryText(_history.GetPrevious(null), "start");
new Step(() => _history.GetNext("4"), null),
new Step(() => _history.GetNext("4"), null));
CheckHistoryText(_history.GetNext("4"), null);
CheckHistoryText(_history.GetNext("4"), null);
}
[Fact]
......@@ -203,15 +196,14 @@ public void TestNextWithPattern_PatternMaintained()
{
AddEntries("start", "1", "12", "123");
Test(
new Step(() => _history.GetPrevious(null), "123"),
new Step(() => _history.GetPrevious(null), "12"),
new Step(() => _history.GetPrevious(null), "1"),
new Step(() => _history.GetPrevious(null), "start"),
CheckHistoryText(_history.GetPrevious(null), "123");
CheckHistoryText(_history.GetPrevious(null), "12");
CheckHistoryText(_history.GetPrevious(null), "1");
CheckHistoryText(_history.GetPrevious(null), "start");
new Step(() => _history.GetNext("12"), "12"), // Skip over non-matching entry.
new Step(() => _history.GetNext("12"), "123"),
new Step(() => _history.GetNext("12"), null));
CheckHistoryText(_history.GetNext("12"), "12"); // Skip over non-matching entry.
CheckHistoryText(_history.GetNext("12"), "123");
CheckHistoryText(_history.GetNext("12"), null);
}
[Fact]
......@@ -219,15 +211,14 @@ public void TestNextWithPattern_PatternDropped()
{
AddEntries("start", "3", "2", "1");
Test(
new Step(() => _history.GetPrevious(null), "1"),
new Step(() => _history.GetPrevious(null), "2"),
new Step(() => _history.GetPrevious(null), "3"),
new Step(() => _history.GetPrevious(null), "start"),
CheckHistoryText(_history.GetPrevious(null), "1");
CheckHistoryText(_history.GetPrevious(null), "2");
CheckHistoryText(_history.GetPrevious(null), "3");
CheckHistoryText(_history.GetPrevious(null), "start");
new Step(() => _history.GetNext("2"), "2"), // Skip over non-matching entry.
new Step(() => _history.GetNext(null), "1"), // Pattern isn't passed, so return to normal iteration.
new Step(() => _history.GetNext(null), null));
CheckHistoryText(_history.GetNext("2"), "2"); // Skip over non-matching entry.
CheckHistoryText(_history.GetNext(null), "1"); // Pattern isn't passed, so return to normal iteration.
CheckHistoryText(_history.GetNext(null), null);
}
[Fact]
......@@ -235,16 +226,15 @@ public void TestNextWithPattern_PatternChanged()
{
AddEntries("start", "2b", "1b", "2a", "1a");
Test(
new Step(() => _history.GetPrevious(null), "1a"),
new Step(() => _history.GetPrevious(null), "2a"),
new Step(() => _history.GetPrevious(null), "1b"),
new Step(() => _history.GetPrevious(null), "2b"),
new Step(() => _history.GetPrevious(null), "start"),
CheckHistoryText(_history.GetPrevious(null), "1a");
CheckHistoryText(_history.GetPrevious(null), "2a");
CheckHistoryText(_history.GetPrevious(null), "1b");
CheckHistoryText(_history.GetPrevious(null), "2b");
CheckHistoryText(_history.GetPrevious(null), "start");
new Step(() => _history.GetNext("1"), "1b"), // Skip over non-matching entry.
new Step(() => _history.GetNext("2"), "2a"), // Skip over non-matching entry.
new Step(() => _history.GetNext("2"), null));
CheckHistoryText(_history.GetNext("1"), "1b"); // Skip over non-matching entry.
CheckHistoryText(_history.GetNext("2"), "2a"); // Skip over non-matching entry.
CheckHistoryText(_history.GetNext("2"), null);
}
private void AddEntries(params string[] entries)
......@@ -277,32 +267,9 @@ private static IEnumerable<string> GetHistoryEntries(History history)
return history.Items.Select(e => e.Text);
}
private void Test(params Step[] steps)
private void CheckHistoryText(History.Entry actualEntry, string expectedText)
{
int i = 0;
foreach (var step in steps)
{
var actualEntry = step.Func();
var expected = step.ExpectedText;
var actual = actualEntry?.Text;
if (expected != actual)
{
Assert.False(true, $"Step {i}: expected '{expected ?? "null"}', but found '{actual ?? "null"}'");
}
i++;
}
}
private struct Step
{
public readonly Func<History.Entry> Func;
public readonly string ExpectedText;
public Step(Func<History.Entry> func, string expectedText)
{
Func = func;
ExpectedText = expectedText;
}
Assert.Equal(expectedText, actualEntry?.Text);
}
}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或