提交 437fbaa0 编写于 作者: D Daniel Rosenwasser

Renamed expectFailure to expectSuccess.

上级 1c425d5e
......@@ -918,7 +918,7 @@ void Foo(int a)
Foo(/*,$$*/);
}
}";
Test(markup, usePreviousCharAsTrigger: true, expectFailure: true);
Test(markup, usePreviousCharAsTrigger: true, expectSuccess: false);
}
[Fact, Trait(Traits.Feature, Traits.Features.SignatureHelp)]
......@@ -933,7 +933,7 @@ void Foo(int a)
);
}
}";
Test(markup, usePreviousCharAsTrigger: true, expectFailure: true);
Test(markup, usePreviousCharAsTrigger: true, expectSuccess: false);
}
[Fact, Trait(Traits.Feature, Traits.Features.SignatureHelp)]
......@@ -947,7 +947,7 @@ void Foo(int a)
Foo("",$$"");
}
}";
Test(markup, usePreviousCharAsTrigger: true, expectFailure: true);
Test(markup, usePreviousCharAsTrigger: true, expectSuccess: false);
}
[Fact, Trait(Traits.Feature, Traits.Features.SignatureHelp)]
......
......@@ -47,16 +47,16 @@ public void SetFixture(TWorkspaceFixture workspaceFixture)
bool usePreviousCharAsTrigger = false,
SourceCodeKind? sourceCodeKind = null,
bool experimental = false,
bool expectFailure = false)
bool expectSuccess = true)
{
if (sourceCodeKind.HasValue)
{
TestSignatureHelpWorker(markup, sourceCodeKind.Value, experimental, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectFailure);
TestSignatureHelpWorker(markup, sourceCodeKind.Value, experimental, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectSuccess);
}
else
{
TestSignatureHelpWorker(markup, SourceCodeKind.Regular, experimental, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectFailure);
TestSignatureHelpWorker(markup, SourceCodeKind.Script, experimental, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectFailure);
TestSignatureHelpWorker(markup, SourceCodeKind.Regular, experimental, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectSuccess);
TestSignatureHelpWorker(markup, SourceCodeKind.Script, experimental, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectSuccess);
}
}
......@@ -66,7 +66,7 @@ public void SetFixture(TWorkspaceFixture workspaceFixture)
bool experimental,
IEnumerable<SignatureHelpTestItem> expectedOrderedItemsOrNull = null,
bool usePreviousCharAsTrigger = false,
bool expectFailure = false)
bool expectSuccess = true)
{
markupWithPositionAndOptSpan = markupWithPositionAndOptSpan.NormalizeLineEndings();
......@@ -94,7 +94,7 @@ public void SetFixture(TWorkspaceFixture workspaceFixture)
document1 = document1.Project.WithParseOptions(parseOptions).GetDocument(document1.Id);
}
TestSignatureHelpWorkerShared(code, cursorPosition, sourceCodeKind, document1, textSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectFailure);
TestSignatureHelpWorkerShared(code, cursorPosition, sourceCodeKind, document1, textSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectSuccess);
// speculative semantic model
if (CanUseSpeculativeSemanticModel(document1, cursorPosition))
......@@ -105,7 +105,7 @@ public void SetFixture(TWorkspaceFixture workspaceFixture)
document2 = document2.Project.WithParseOptions(parseOptions).GetDocument(document2.Id);
}
TestSignatureHelpWorkerShared(code, cursorPosition, sourceCodeKind, document2, textSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectFailure);
TestSignatureHelpWorkerShared(code, cursorPosition, sourceCodeKind, document2, textSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, expectSuccess);
}
}
......@@ -382,7 +382,7 @@ protected void VerifyItemWithReferenceWorker(string xmlString, IEnumerable<Signa
TextSpan? textSpan,
IEnumerable<SignatureHelpTestItem> expectedOrderedItemsOrNull = null,
bool usePreviousCharAsTrigger = false,
bool expectFailure = false)
bool expectSuccess = true)
{
var signatureHelpProvider = CreateSignatureHelpProvider();
var triggerInfo = new SignatureHelpTriggerInfo(SignatureHelpTriggerReason.InvokeSignatureHelpCommand);
......@@ -401,7 +401,7 @@ protected void VerifyItemWithReferenceWorker(string xmlString, IEnumerable<Signa
var items = signatureHelpProvider.GetItemsAsync(document, cursorPosition, triggerInfo, CancellationToken.None).Result;
if (expectFailure)
if (!expectSuccess)
{
AssertEx.Null(items);
return;
......
......@@ -11,11 +11,11 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
' We want to skip script testing in all VB stuff for now.
Protected Overrides Sub Test(markupWithPositionAndOptSpan As String, Optional expectedOrderedItemsOrNull As IEnumerable(Of SignatureHelpTestItem) = Nothing, Optional usePreviousCharAsTrigger As Boolean = False, Optional sourceCodeKind As Microsoft.CodeAnalysis.SourceCodeKind? = Nothing, Optional experimental As Boolean = False, Optional expectFailure As Boolean = False)
Protected Overrides Sub Test(markupWithPositionAndOptSpan As String, Optional expectedOrderedItemsOrNull As IEnumerable(Of SignatureHelpTestItem) = Nothing, Optional usePreviousCharAsTrigger As Boolean = False, Optional sourceCodeKind As Microsoft.CodeAnalysis.SourceCodeKind? = Nothing, Optional experimental As Boolean = False, Optional expectSuccess As Boolean = True)
If (sourceCodeKind.HasValue) Then
MyBase.Test(markupWithPositionAndOptSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, sourceCodeKind, experimental, expectFailure)
MyBase.Test(markupWithPositionAndOptSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, sourceCodeKind, experimental, expectSuccess)
Else
MyBase.Test(markupWithPositionAndOptSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, Microsoft.CodeAnalysis.SourceCodeKind.Regular, experimental, expectFailure)
MyBase.Test(markupWithPositionAndOptSpan, expectedOrderedItemsOrNull, usePreviousCharAsTrigger, Microsoft.CodeAnalysis.SourceCodeKind.Regular, experimental, expectSuccess)
End If
End Sub
......
......@@ -983,7 +983,7 @@ Class C
End Sub
End Class
"
Test(markup, usePreviousCharAsTrigger:=True, expectFailure:=True)
Test(markup, usePreviousCharAsTrigger:=True, expectSuccess:=False)
End Sub
<Fact, Trait(Traits.Feature, Traits.Features.SignatureHelp)>
......@@ -995,7 +995,7 @@ Class C
End Sub
End Class
"
Test(markup, usePreviousCharAsTrigger:=True, expectFailure:=True)
Test(markup, usePreviousCharAsTrigger:=True, expectSuccess:=False)
End Sub
<Fact, Trait(Traits.Feature, Traits.Features.SignatureHelp)>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册