Skip to content

Commit dca1770

Browse files
dougbudougbu
committed
Add xUnit analyzers and take xUnit fixer suggestions (5 of 5): System.Web.Razor.Test to end
- part of aspnet#65 Few manual changes: - temporarily remove xUnit analyzers from System.Web.Razor.Test - work around xunit/xunit#1502 - should restore analyzers as part of a aspnet#96 fix - use `Assert.IsAssignableFrom<T>(...)`, `Assert.IsType<T>(...)` and `Assert.Single(...)` return values - avoid xUnit1013, Public method should be marked as test - mark a helper method `internal` - fix xUnit1026, `[Theory]` method doesn't use all parameters - add new data set properties - suppress xUnit2013, Do not use equality check to check for collection size. - calls `Count` because the `Mock<T>` does not set up `GetEnumerable()` - `Assert.Equal<T>(...)` -> `Assert.Equal(...)` - avoid Linq's `.Where` inside `Assert.Contains(...)` and similar
1 parent 125b71a commit dca1770

File tree

52 files changed

+213
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+213
-174
lines changed

‎test/System.Web.Razor.Test/Parser/ParserContextTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ public void StartBlockCreatesNewBlock()
133133
context.StartBlock(BlockType.Expression);
134134

135135
// Assert
136-
Assert.Equal(1, context.BlockStack.Count);
137-
Assert.Equal(BlockType.Expression, context.BlockStack.Peek().Type);
136+
BlockBuilder blockBuilder = Assert.Single(context.BlockStack);
137+
Assert.Equal(BlockType.Expression, blockBuilder.Type);
138138
}
139139

140140
[Fact]
@@ -150,10 +150,10 @@ public void EndBlockAddsCurrentBlockToParentBlock()
150150
context.EndBlock();
151151

152152
// Assert
153-
Assert.Equal(1, context.BlockStack.Count);
154-
Assert.Equal(BlockType.Expression, context.BlockStack.Peek().Type);
155-
Assert.Equal(1, context.BlockStack.Peek().Children.Count);
156-
Assert.Equal(BlockType.Statement, ((Block)context.BlockStack.Peek().Children[0]).Type);
153+
BlockBuilder blockBuilder = Assert.Single(context.BlockStack);
154+
Assert.Equal(BlockType.Expression, blockBuilder.Type);
155+
SyntaxTreeNode node = Assert.Single(blockBuilder.Children);
156+
Assert.Equal(BlockType.Statement, Assert.IsType<Block>(node).Type);
157157
}
158158

159159
[Fact]

‎test/System.Web.Razor.Test/RazorDirectiveAttributeTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void EnsureRazorDirectiveProperties()
2525

2626
// Assert
2727
Assert.True(attribute.AllowMultiple);
28-
Assert.True(attribute.ValidOn == AttributeTargets.Class);
28+
Assert.Equal(AttributeTargets.Class, attribute.ValidOn);
2929
Assert.True(attribute.Inherited);
3030
}
3131

‎test/System.Web.Razor.Test/Utils/MiscAssert.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ namespace System.Web.Razor.Test.Utils
99
public static class MiscAssert
1010
{
1111
public static void AssertBothNullOrPropertyEqual<T>(T expected, T actual, Expression<Func<T, object>> propertyExpr, string objectName)
12+
where T : class
1213
{
1314
// Unpack convert expressions
1415
Expression expr = propertyExpr.Body;

‎test/System.Web.WebPages.Administration.Test/PackageManagerModuleTest.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void InitSourceFileDoesNotAffectSourcesFileWhenFeedIsNotNull()
2222
sourceFile.Setup(c => c.ReadSources()).Callback(() => sourceFileCalled = true);
2323
ISet<WebPackageSource> set = new HashSet<WebPackageSource>();
2424

25-
// Act
25+
// Act
2626
PackageManagerModule.InitPackageSourceFile(sourceFile.Object, ref set);
2727

2828
// Assert
@@ -42,9 +42,9 @@ public void InitSourceFileWritesToDiskIfSourcesFileDoesNotExist()
4242
PackageManagerModule.InitPackageSourceFile(sourceFile.Object, ref set);
4343

4444
Assert.NotNull(set);
45-
Assert.Equal(set.Count(), 2);
46-
Assert.Equal(set.First().Source, "http://go.microsoft.com/fwlink/?LinkID=226946");
47-
Assert.Equal(set.Last().Source, "http://go.microsoft.com/fwlink/?LinkID=226948");
45+
Assert.Equal(2, set.Count());
46+
Assert.Equal("http://go.microsoft.com/fwlink/?LinkID=226946", set.First().Source);
47+
Assert.Equal("http://go.microsoft.com/fwlink/?LinkID=226948", set.Last().Source);
4848
}
4949

5050
[Fact]
@@ -60,7 +60,7 @@ public void InitSourceFileReadsFromDiskWhenFileAlreadyExists()
6060

6161
// Assert
6262
Assert.NotNull(set);
63-
Assert.Equal(set.Count(), 2);
63+
Assert.Equal(2, set.Count());
6464
}
6565

6666
[Fact]
@@ -76,7 +76,7 @@ public void AddFeedWritesSourceIfItDoesNotExist()
7676
bool returnValue = PackageManagerModule.AddPackageSource(sourceFile.Object, set, new WebPackageSource(source: "http://www.microsoft.com/feed3", name: "Feed3"));
7777

7878
// Assert
79-
Assert.Equal(set.Count(), 3);
79+
Assert.Equal(3, set.Count());
8080
Assert.True(writeCalled);
8181
Assert.True(returnValue);
8282
}
@@ -94,7 +94,7 @@ public void AddFeedDoesNotWritesSourceIfExists()
9494
bool returnValue = PackageManagerModule.AddPackageSource(sourceFile.Object, set, new WebPackageSource(source: "http://www.microsoft.com/feed1", name: "Feed1"));
9595

9696
// Assert
97-
Assert.Equal(set.Count(), 2);
97+
Assert.Equal(2, set.Count());
9898
Assert.False(writeCalled);
9999
Assert.False(returnValue);
100100
}
@@ -112,8 +112,8 @@ public void RemoveFeedRemovesSourceFromSet()
112112
PackageManagerModule.RemovePackageSource(sourceFile.Object, set, "feed1");
113113

114114
// Assert
115-
Assert.Equal(set.Count(), 1);
116-
Assert.False(set.Any(s => s.Name == "Feed1"));
115+
Assert.Single(set);
116+
Assert.DoesNotContain(set, s => s.Name == "Feed1");
117117
Assert.True(writeCalled);
118118
}
119119

@@ -130,7 +130,7 @@ public void RemoveFeedDoesNotAffectSourceFileIsFeedDoesNotExist()
130130
PackageManagerModule.RemovePackageSource(sourceFile.Object, set, "feed3");
131131

132132
// Assert
133-
Assert.Equal(set.Count(), 2);
133+
Assert.Equal(2, set.Count());
134134
Assert.False(writeCalled);
135135
}
136136

‎test/System.Web.WebPages.Administration.Test/PackagesSourceFileTest.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,20 @@ public void PackagesSourceFileWritesAllFeedsToStream()
129129

130130
// Assert
131131
var document = XDocument.Parse(result);
132-
Assert.Equal(document.Root.Name, "sources");
133-
Assert.Equal(document.Root.Elements().Count(), 2);
132+
Assert.Equal("sources", document.Root.Name);
133+
Assert.Equal(2, document.Root.Elements().Count());
134134

135135
var firstFeed = document.Root.Elements().First();
136-
Assert.Equal(firstFeed.Name, "source");
137-
Assert.Equal(firstFeed.Attribute("displayname").Value, "Feed1");
138-
Assert.Equal(firstFeed.Attribute("url").Value, "http://www.microsoft.com/Feed1");
139-
Assert.Equal(firstFeed.Attribute("filterpreferred").Value, "false");
136+
Assert.Equal("source", firstFeed.Name);
137+
Assert.Equal("Feed1", firstFeed.Attribute("displayname").Value);
138+
Assert.Equal("http://www.microsoft.com/Feed1", firstFeed.Attribute("url").Value);
139+
Assert.Equal("false", firstFeed.Attribute("filterpreferred").Value);
140140

141141
var secondFeed = document.Root.Elements().Last();
142-
Assert.Equal(secondFeed.Name, "source");
143-
Assert.Equal(secondFeed.Attribute("displayname").Value, "Feed2");
144-
Assert.Equal(secondFeed.Attribute("url").Value, "http://www.microsoft.com/Feed2");
145-
Assert.Equal(secondFeed.Attribute("filterpreferred").Value, "true");
142+
Assert.Equal("source", secondFeed.Name);
143+
Assert.Equal("Feed2", secondFeed.Attribute("displayname").Value);
144+
Assert.Equal("http://www.microsoft.com/Feed2", secondFeed.Attribute("url").Value);
145+
Assert.Equal("true", secondFeed.Attribute("filterpreferred").Value);
146146
}
147147
}
148148
}

‎test/System.Web.WebPages.Administration.Test/PageUtilsTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void PersistFilterUsesExistingCookie()
9999
PageUtils.PersistFilter(response.Object, "my-cookie", new Dictionary<string, string>());
100100

101101
// Assert
102-
Assert.Equal(1, cookies.Count);
102+
Assert.Single(cookies);
103103
}
104104

105105
[Fact]
@@ -115,8 +115,8 @@ public void PersistFilterAddsDictionaryEntriesToCookie()
115115

116116
// Assert
117117
var cookie = cookies["my-cookie"];
118-
Assert.Equal(cookie["a"], "b");
119-
Assert.Equal(cookie["x"], "y");
118+
Assert.Equal("b", cookie["a"]);
119+
Assert.Equal("y", cookie["x"]);
120120
}
121121

122122
[Fact]

‎test/System.Web.WebPages.Administration.Test/PreApplicationStartCodeTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public void StartTest()
2222

2323
// TODO: Need a way to see if the module was actually registered
2424
var registeredAssemblies = ApplicationPart.GetRegisteredParts().ToList();
25-
Assert.Equal(1, registeredAssemblies.Count);
26-
registeredAssemblies.First().Assembly.Equals(adminPackageAssembly);
25+
ApplicationPart part = Assert.Single(registeredAssemblies);
26+
part.Assembly.Equals(adminPackageAssembly);
2727
});
2828
}
2929

‎test/System.Web.WebPages.Administration.Test/System.Web.WebPages.Administration.Test.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@
9191
<ItemGroup>
9292
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
9393
</ItemGroup>
94+
<ItemGroup>
95+
<Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
96+
</ItemGroup>
9497
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
9598
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9699
<PropertyGroup>

‎test/System.Web.WebPages.Administration.Test/WebProjectManagerTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void GetLocalRepositoryReturnsPackagesFolderUnderAppData()
6767
// Act
6868
var repositoryFolder = WebProjectManager.GetWebRepositoryDirectory(siteRoot);
6969

70-
Assert.Equal(repositoryFolder, @"my-site\App_Data\packages");
70+
Assert.Equal(@"my-site\App_Data\packages", repositoryFolder);
7171
}
7272

7373
[Fact]
@@ -95,7 +95,7 @@ public void GetPackagesReturnsItemsContainingSomeSearchToken()
9595

9696
// Assert
9797
Assert.NotNull(package);
98-
Assert.Equal(package.Id, "A");
98+
Assert.Equal("A", package.Id);
9999
}
100100

101101
[Fact]
@@ -111,8 +111,8 @@ public void GetPackagesWithLicenseReturnsAllDependenciesWithRequiresAcceptance()
111111

112112
// Assert
113113
Assert.Equal(2, result.Count());
114-
Assert.True(result.Any(c => c.Id == "C"));
115-
Assert.True(result.Any(c => c.Id == "B"));
114+
Assert.Contains(result, c => c.Id == "C");
115+
Assert.Contains(result, c => c.Id == "B");
116116
}
117117

118118
[Fact]

‎test/System.Web.WebPages.Administration.Test/WebProjectSystemTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void AddPackageWithFrameworkReferenceCreatesWebConfigIfItDoesNotExist()
8080
XDocument document = XDocument.Load(memoryStream);
8181

8282
var element = document.Root;
83-
Assert.Equal(element.Name, "configuration");
83+
Assert.Equal("configuration", element.Name);
8484

8585
// Use SingleOrDefault to ensure there's exactly one element with that name
8686
var assemblies = document.Root
@@ -126,7 +126,7 @@ public void AddPackageWithFrameworkReferenceCreatesWebConfigIfItExistsWithoutAss
126126
XDocument document = XDocument.Load(memoryStream);
127127

128128
var element = document.Root;
129-
Assert.Equal(element.Name, "configuration");
129+
Assert.Equal("configuration", element.Name);
130130

131131
// Use SingleOrDefault to ensure there's exactly one element with that name
132132
var assemblies = document.Root
@@ -187,7 +187,7 @@ public void AddPackageWithFrameworkReferenceDoesNotAffectWebConfigIfReferencesAl
187187
XDocument document = XDocument.Load(memoryStream);
188188

189189
var element = document.Root;
190-
Assert.Equal(element.Name, "configuration");
190+
Assert.Equal("configuration", element.Name);
191191

192192
// Use SingleOrDefault to ensure there's exactly one element with that name
193193
var assemblies = document.Root

0 commit comments

Comments
 (0)