huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to xunit 2.3.0-beta4 (#1640) 

Includes a few changes required by xunit.analyzers, such as removing unused theory parameters.
This commit is contained in:
Nate McMaster 2017-08-23 12:56:31 -07:00 committed by GitHub
parent 4cadee2762
commit 0c3fff3137
7 changed files with 30 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/dependencies.props
View File

@ -11,20 +11,21 @@
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion> <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion> <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
<!-- <!--
Re-enable package downgrade warnings when RoslynDevVersion >= RoslynVersion Re-enable package downgrade warnings when RoslynDevVersion >= RoslynVersion
- https://github.com/aspnet/Razor/issues/1577 - https://github.com/aspnet/Razor/issues/1577
--> -->
<RoslynVersion>2.3.1</RoslynVersion> <RoslynVersion>2.3.1</RoslynVersion>
<RoslynDevVersion>2.3.0-beta4-*</RoslynDevVersion> <RoslynDevVersion>2.3.0-beta4-*</RoslynDevVersion>
<StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion> <StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion>
<TestSdkVersion>15.3.0-*</TestSdkVersion> <TestSdkVersion>15.3.0</TestSdkVersion>
<!-- Must keep in sync with tooling\Microsoft.VisualStudio.RazorExtension\project.json --> <!-- Must keep in sync with tooling\Microsoft.VisualStudio.RazorExtension\project.json -->
<VsShellVersion>15.0.26606</VsShellVersion> <VsShellVersion>15.0.26606</VsShellVersion>
<XunitVersion>2.3.0-beta2-*</XunitVersion> <XunitAnalyzersVersion>0.6.1</XunitAnalyzersVersion>
<XunitVersion>2.3.0-beta4-build3742</XunitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTagsTest.cs
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{ {
public class HtmlTagsTest : CsHtmlMarkupParserTestBase public class HtmlTagsTest : CsHtmlMarkupParserTestBase
{ {
public static IEnumerable<string[]> VoidElementNames public static IEnumerable<object[]> VoidElementNames
{ {
get get
{ {

9
test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs
View File

@ -137,13 +137,8 @@ namespace Microsoft.AspNetCore.Razor.Language
Assert.Equal(2, result); Assert.Equal(2, result);
} }
[Theory] [Fact]
[InlineData(12, 2)] public void GetOffSet_SpanIsNotOwnerOfChange_ThrowsException()
[InlineData(12, 14)]
[InlineData(13, 13)]
[InlineData(20, 1)]
[InlineData(21, 0)]
public void GetOffSet_SpanIsNotOwnerOfChange_ThrowsException(int absoluteIndex, int length)
{ {
// Arrange // Arrange
var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); var builder = new SpanBuilder(new SourceLocation(13, 0, 0));

1
test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
View File

@ -13,6 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DependencyModelVersion)" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DependencyModelVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

152
test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/RazorSyntaxTreePartialParserTest.cs
View File

@ -17,69 +17,20 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
{ {
get get
{ {
// change, (Block)expectedDocument return new TheoryData<TestEdit>
return new TheoryData<TestEdit, MarkupBlock>
{ {
{ CreateInsertionChange("<p></p>", 2, " "),
CreateInsertionChange("<p></p>", 2, " "), CreateInsertionChange("<p></p>", 6, " "),
new MarkupBlock( CreateInsertionChange("<p some-attr></p>", 12, " "),
new MarkupTagHelperBlock("p")) CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
}, CreateInsertionChange("<p some-attr></p>", 2, " before"),
{
CreateInsertionChange("<p></p>", 6, " "),
new MarkupBlock(
new MarkupTagHelperBlock("p"))
},
{
CreateInsertionChange("<p some-attr></p>", 12, " "),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"some-attr",
value: null,
attributeStructure: AttributeStructure.Minimized)
}))
},
{
CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"some-attribute",
value: null,
attributeStructure: AttributeStructure.Minimized)
}))
},
{
CreateInsertionChange("<p some-attr></p>", 2, " before"),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"before",
value: null,
attributeStructure: AttributeStructure.Minimized),
new TagHelperAttributeNode(
"some-attr",
value: null,
attributeStructure: AttributeStructure.Minimized)
}))
},
}; };
} }
} }
[Theory] [Theory]
[MemberData(nameof(TagHelperPartialParseRejectData))] [MemberData(nameof(TagHelperPartialParseRejectData))]
public void TagHelperTagBodiesRejectPartialChanges(object objectEdit, object expectedDocument) public void TagHelperTagBodiesRejectPartialChanges(object objectEdit)
{ {
// Arrange // Arrange
var edit = (TestEdit)objectEdit; var edit = (TestEdit)objectEdit;
@ -112,108 +63,26 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
var factory = new SpanFactory(); var factory = new SpanFactory();
// change, (Block)expectedDocument, partialParseResult // change, (Block)expectedDocument, partialParseResult
return new TheoryData<TestEdit, MarkupBlock, PartialParseResultInternal> return new TheoryData<TestEdit, PartialParseResultInternal>
{ {
{ {
CreateInsertionChange("<p str-attr='@DateTime'></p>", 22, "."), CreateInsertionChange("<p str-attr='@DateTime'></p>", 22, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"str-attr",
new MarkupBlock(
new MarkupBlock(
new ExpressionBlock(
factory.CodeTransition(),
factory
.Code("DateTime.")
.AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
.Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
AttributeStructure.SingleQuotes)
})),
PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
}, },
{ {
CreateInsertionChange("<p obj-attr='DateTime'></p>", 21, "."), CreateInsertionChange("<p obj-attr='DateTime'></p>", 21, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"obj-attr",
factory.CodeMarkup("DateTime."),
AttributeStructure.SingleQuotes)
})),
PartialParseResultInternal.Accepted PartialParseResultInternal.Accepted
}, },
{ {
CreateInsertionChange("<p obj-attr='1 + DateTime'></p>", 25, "."), CreateInsertionChange("<p obj-attr='1 + DateTime'></p>", 25, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"obj-attr",
factory.CodeMarkup("1 + DateTime."),
AttributeStructure.SingleQuotes)
})),
PartialParseResultInternal.Accepted PartialParseResultInternal.Accepted
}, },
{ {
CreateInsertionChange("<p before-attr str-attr='@DateTime' after-attr></p>", 34, "."), CreateInsertionChange("<p before-attr str-attr='@DateTime' after-attr></p>", 34, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"before-attr",
value: null,
attributeStructure: AttributeStructure.Minimized),
new TagHelperAttributeNode(
"str-attr",
new MarkupBlock(
new MarkupBlock(
new ExpressionBlock(
factory.CodeTransition(),
factory
.Code("DateTime.")
.AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
.Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
AttributeStructure.SingleQuotes),
new TagHelperAttributeNode(
"after-attr",
value: null,
attributeStructure: AttributeStructure.Minimized),
})),
PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
}, },
{ {
CreateInsertionChange("<p str-attr='before @DateTime after'></p>", 29, "."), CreateInsertionChange("<p str-attr='before @DateTime after'></p>", 29, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"str-attr",
new MarkupBlock(
factory.Markup("before"),
new MarkupBlock(
factory.Markup(" "),
new ExpressionBlock(
factory.CodeTransition(),
factory
.Code("DateTime.")
.AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
.Accepts(AcceptedCharactersInternal.NonWhiteSpace))),
factory.Markup(" after")),
AttributeStructure.SingleQuotes)
})),
PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
}, },
}; };
@ -222,10 +91,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
[Theory] [Theory]
[MemberData(nameof(TagHelperAttributeAcceptData))] [MemberData(nameof(TagHelperAttributeAcceptData))]
public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly( public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly(object editObject, object partialParseResultObject)
object editObject,
object expectedDocument,
object partialParseResultObject)
{ {
// Arrange // Arrange
var edit = (TestEdit)editObject; var edit = (TestEdit)editObject;

152
test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Legacy/RazorEditorParserTest.cs
View File

@ -23,69 +23,20 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
{ {
get get
{ {
// change, (Block)expectedDocument return new TheoryData<TestEdit>
return new TheoryData<TestEdit, MarkupBlock>
{ {
{ CreateInsertionChange("<p></p>", 2, " "),
CreateInsertionChange("<p></p>", 2, " "), CreateInsertionChange("<p></p>", 6, " "),
new MarkupBlock( CreateInsertionChange("<p some-attr></p>", 12, " "),
new MarkupTagHelperBlock("p")) CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
}, CreateInsertionChange("<p some-attr></p>", 2, " before"),
{
CreateInsertionChange("<p></p>", 6, " "),
new MarkupBlock(
new MarkupTagHelperBlock("p"))
},
{
CreateInsertionChange("<p some-attr></p>", 12, " "),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"some-attr",
value: null,
attributeStructure: AttributeStructure.Minimized)
}))
},
{
CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"some-attribute",
value: null,
attributeStructure: AttributeStructure.Minimized)
}))
},
{
CreateInsertionChange("<p some-attr></p>", 2, " before"),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"before",
value: null,
attributeStructure: AttributeStructure.Minimized),
new TagHelperAttributeNode(
"some-attr",
value: null,
attributeStructure: AttributeStructure.Minimized)
}))
},
}; };
} }
} }
[Theory] [Theory]
[MemberData(nameof(TagHelperPartialParseRejectData))] [MemberData(nameof(TagHelperPartialParseRejectData))]
public void TagHelperTagBodiesRejectPartialChanges(object editObject, object expectedDocument) public void TagHelperTagBodiesRejectPartialChanges(object editObject)
{ {
// Arrange // Arrange
var edit = (TestEdit)editObject; var edit = (TestEdit)editObject;
@ -119,108 +70,26 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
var factory = new SpanFactory(); var factory = new SpanFactory();
// change, (Block)expectedDocument, partialParseResult // change, (Block)expectedDocument, partialParseResult
return new TheoryData<TestEdit, MarkupBlock, PartialParseResult> return new TheoryData<TestEdit, PartialParseResult>
{ {
{ {
CreateInsertionChange("<p str-attr='@DateTime'></p>", 22, "."), CreateInsertionChange("<p str-attr='@DateTime'></p>", 22, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"str-attr",
new MarkupBlock(
new MarkupBlock(
new ExpressionBlock(
factory.CodeTransition(),
factory
.Code("DateTime.")
.AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
.Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
AttributeStructure.SingleQuotes)
})),
PartialParseResult.Accepted | PartialParseResult.Provisional PartialParseResult.Accepted | PartialParseResult.Provisional
}, },
{ {
CreateInsertionChange("<p obj-attr='DateTime'></p>", 21, "."), CreateInsertionChange("<p obj-attr='DateTime'></p>", 21, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"obj-attr",
factory.CodeMarkup("DateTime."),
AttributeStructure.SingleQuotes)
})),
PartialParseResult.Accepted PartialParseResult.Accepted
}, },
{ {
CreateInsertionChange("<p obj-attr='1 + DateTime'></p>", 25, "."), CreateInsertionChange("<p obj-attr='1 + DateTime'></p>", 25, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"obj-attr",
factory.CodeMarkup("1 + DateTime."),
AttributeStructure.SingleQuotes)
})),
PartialParseResult.Accepted PartialParseResult.Accepted
}, },
{ {
CreateInsertionChange("<p before-attr str-attr='@DateTime' after-attr></p>", 34, "."), CreateInsertionChange("<p before-attr str-attr='@DateTime' after-attr></p>", 34, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"before-attr",
value: null,
attributeStructure: AttributeStructure.Minimized),
new TagHelperAttributeNode(
"str-attr",
new MarkupBlock(
new MarkupBlock(
new ExpressionBlock(
factory.CodeTransition(),
factory
.Code("DateTime.")
.AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
.Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
AttributeStructure.SingleQuotes),
new TagHelperAttributeNode(
"after-attr",
value: null,
attributeStructure: AttributeStructure.Minimized),
})),
PartialParseResult.Accepted | PartialParseResult.Provisional PartialParseResult.Accepted | PartialParseResult.Provisional
}, },
{ {
CreateInsertionChange("<p str-attr='before @DateTime after'></p>", 29, "."), CreateInsertionChange("<p str-attr='before @DateTime after'></p>", 29, "."),
new MarkupBlock(
new MarkupTagHelperBlock(
"p",
attributes: new List<TagHelperAttributeNode>
{
new TagHelperAttributeNode(
"str-attr",
new MarkupBlock(
factory.Markup("before"),
new MarkupBlock(
factory.Markup(" "),
new ExpressionBlock(
factory.CodeTransition(),
factory
.Code("DateTime.")
.AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
.Accepts(AcceptedCharactersInternal.NonWhiteSpace))),
factory.Markup(" after")),
AttributeStructure.SingleQuotes)
})),
PartialParseResult.Accepted | PartialParseResult.Provisional PartialParseResult.Accepted | PartialParseResult.Provisional
}, },
}; };
@ -229,10 +98,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
[Theory] [Theory]
[MemberData(nameof(TagHelperAttributeAcceptData))] [MemberData(nameof(TagHelperAttributeAcceptData))]
public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly( public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly(object editObject, PartialParseResult partialParseResult)
object editObject,
object expectedDocument,
PartialParseResult partialParseResult)
{ {
// Arrange // Arrange
var edit = (TestEdit)editObject; var edit = (TestEdit)editObject;

2
test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
View File

@ -22,7 +22,9 @@
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevVersion)" NoWarn="NU1605" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevVersion)" NoWarn="NU1605" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynDevVersion)" NoWarn="NU1605" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynDevVersion)" NoWarn="NU1605" />
<PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" /> <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>