Skip to content

Commit 35f57e8

Browse files
bounavbounav
committed
Updated NUnit 4
- Upgrade remainder of old assert syntax to new one
1 parent 1c83ab8 commit 35f57e8

File tree

16 files changed

+50
-50
lines changed

16 files changed

+50
-50
lines changed

‎src/Castle.MonoRail.Views.Spark.Tests/Castle.MonoRail.Views.Spark.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
</ItemGroup>
3030
<ItemGroup>
3131
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
32-
<PackageReference Include="NUnit" Version="3.14.0" />
33-
<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
32+
<PackageReference Include="NUnit" Version="4.2.2" />
33+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="NUnit.Console" Version="3.16.3" />
37+
<PackageReference Include="NUnit.Console" Version="3.18.3" />
3838
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
3939
<PackageReference Include="RhinoMocks" Version="3.6.1" />
4040
</ItemGroup>

‎src/Castle.Monorail.Pdf.Tests/Castle.Monorail.Pdf.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
</Reference>
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Include="NUnit" Version="3.14.0" />
24-
<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
23+
<PackageReference Include="NUnit" Version="4.2.2" />
24+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

‎src/Castle.Monorail.Pdf.Tests/FormatReturnBinderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void RequestsForPdfAreHandled()
5353
Assert.That(controller.Context.Response.StatusDescription, Is.EqualTo("OK"));
5454
Assert.That(viewEngineManager.TemplateRendered, Is.EqualTo(string.Format("ReturnBinderTest{0}Index.pdf.spark", Path.DirectorySeparatorChar)));
5555
Assert.That(controller.Context.Response.ContentType, Is.EqualTo("application/pdf"));
56-
Assert.Greater(controller.Context.Response.OutputStream.Length, 0);
56+
Assert.That(controller.Context.Response.OutputStream.Length, Is.GreaterThan(0));
5757
}
5858

5959
[SetUp]

‎src/Spark.Python.Tests/ScriptingLanguageFactoryTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void CreatePythonViewCompiler()
4747
var descriptor = new SparkViewDescriptor().SetLanguage(LanguageType.Python);
4848
var viewCompiler = _engine.LanguageFactory.CreateViewCompiler(_engine, descriptor);
4949

50-
Assert.IsAssignableFrom(typeof(PythonViewCompiler), viewCompiler);
50+
Assert.That(viewCompiler, Is.AssignableFrom(typeof(PythonViewCompiler)));
5151
}
5252

5353
[Test]

‎src/Spark.Python.Tests/Spark.Python.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</ItemGroup>
2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
24-
<PackageReference Include="NUnit" Version="3.14.0" />
25-
<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
24+
<PackageReference Include="NUnit" Version="4.2.2" />
25+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>

‎src/Spark.Ruby.Tests/Spark.Ruby.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
28-
<PackageReference Include="NUnit" Version="3.14.0" />
29-
<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
28+
<PackageReference Include="NUnit" Version="4.2.2" />
29+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>

‎src/Spark.Tests/Parser/MarkupGrammarTester.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ public void EntityTextSeries()
103103
var result = grammar.Nodes(Source("hello&nbsp;world"));
104104
Assert.That(result, Is.Not.Null);
105105
Assert.That(result.Value, Has.Count.EqualTo(3));
106-
Assert.IsAssignableFrom(typeof(TextNode), result.Value[0]);
107-
Assert.IsAssignableFrom(typeof(EntityNode), result.Value[1]);
108-
Assert.IsAssignableFrom(typeof(TextNode), result.Value[2]);
106+
Assert.That(result.Value[0], Is.AssignableFrom(typeof(TextNode)));
107+
Assert.That(result.Value[1], Is.AssignableFrom(typeof(EntityNode)));
108+
Assert.That(result.Value[2], Is.AssignableFrom(typeof(TextNode)));
109109
}
110110

111111
[Test]
@@ -230,7 +230,7 @@ public void ParsingEndElement()
230230
{
231231
var result = grammar.EndElement(Source("</blah>"));
232232
Assert.That(result, Is.Not.Null);
233-
Assert.IsAssignableFrom(typeof(EndElementNode), result.Value);
233+
Assert.That(result.Value, Is.AssignableFrom(typeof(EndElementNode)));
234234
Assert.That(result.Value.Name, Is.EqualTo("blah"));
235235
}
236236

@@ -244,7 +244,7 @@ public void PassingSimpleMarkup()
244244
Assert.That(result.Rest.PotentialLength(), Is.EqualTo(0));
245245
Assert.That(result.Value, Has.Count.EqualTo(8));
246246
});
247-
Assert.IsAssignableFrom(typeof(ElementNode), result.Value[4]);
247+
Assert.That(result.Value[4], Is.AssignableFrom(typeof(ElementNode)));
248248
var elt = result.Value[4] as ElementNode;
249249
Assert.Multiple(() =>
250250
{
@@ -258,9 +258,9 @@ public void PassingSimpleMarkup()
258258
public void SelfEnding()
259259
{
260260
var result = grammar.Nodes(Source("<div><br/></div>"));
261-
Assert.IsAssignableFrom(typeof(ElementNode), result.Value[0]);
262-
Assert.IsAssignableFrom(typeof(ElementNode), result.Value[1]);
263-
Assert.IsAssignableFrom(typeof(EndElementNode), result.Value[2]);
261+
Assert.That(result.Value[0], Is.AssignableFrom(typeof(ElementNode)));
262+
Assert.That(result.Value[1], Is.AssignableFrom(typeof(ElementNode)));
263+
Assert.That(result.Value[2], Is.AssignableFrom(typeof(EndElementNode)));
264264

265265
var div = result.Value[0] as ElementNode;
266266
Assert.Multiple(() =>
@@ -333,21 +333,21 @@ public void CodeInText()
333333
var result = grammar.Nodes(Source("<hello>foo${bar}ex</hello>"));
334334
Assert.That(result, Is.Not.Null);
335335
Assert.That(result.Value, Has.Count.EqualTo(5));
336-
Assert.IsAssignableFrom(typeof(ExpressionNode), result.Value[2]);
336+
Assert.That(result.Value[2], Is.AssignableFrom(typeof(ExpressionNode)));
337337
var code = (ExpressionNode)result.Value[2];
338338
Assert.That((string)code.Code, Is.EqualTo("bar"));
339339

340340
result = grammar.Nodes(Source("<hello>foo<%=baaz%>ex</hello>"));
341341
Assert.That(result, Is.Not.Null);
342342
Assert.That(result.Value, Has.Count.EqualTo(5));
343-
Assert.IsAssignableFrom(typeof(ExpressionNode), result.Value[2]);
343+
Assert.That(result.Value[2], Is.AssignableFrom(typeof(ExpressionNode)));
344344
var code2 = (ExpressionNode)result.Value[2];
345345
Assert.That((string)code2.Code, Is.EqualTo("baaz"));
346346

347347
result = grammar.Nodes(Source("<hello href='${one}' class=\"<%=two%>\"/>"));
348348
Assert.That(result, Is.Not.Null);
349349
Assert.That(result.Value, Has.Count.EqualTo(1));
350-
Assert.IsAssignableFrom(typeof(ElementNode), result.Value[0]);
350+
Assert.That(result.Value[0], Is.AssignableFrom(typeof(ElementNode)));
351351
var elt = (ElementNode)result.Value[0];
352352
Assert.Multiple(() =>
353353
{
@@ -363,7 +363,7 @@ public void AspxStyleOutputInText()
363363
var result = grammar.Nodes(Source("<hello>foo<%=bar%>ex</hello>"));
364364
Assert.That(result, Is.Not.Null);
365365
Assert.That(result.Value, Has.Count.EqualTo(5));
366-
Assert.IsAssignableFrom(typeof(ExpressionNode), result.Value[2]);
366+
Assert.That(result.Value[2], Is.AssignableFrom(typeof(ExpressionNode)));
367367
var code = result.Value[2] as ExpressionNode;
368368
Assert.Multiple(() =>
369369
{

‎src/Spark.Tests/Spark.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
19-
<PackageReference Include="NUnit" Version="3.14.0" />
20-
<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
19+
<PackageReference Include="NUnit" Version="4.2.2" />
20+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>

‎src/Spark.Tests/Visitors/ConditionalAttributeVisitorTester.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void DetectIfAttribute()
3232
visitor.Accept(nodes);
3333

3434
Assert.That(visitor.Nodes, Has.Count.EqualTo(1));
35-
Assert.IsAssignableFrom(typeof(SpecialNode), visitor.Nodes[0]);
35+
Assert.That(visitor.Nodes[0], Is.AssignableFrom(typeof(SpecialNode)));
3636

3737
var ifNode = visitor.Nodes[0] as SpecialNode;
3838
Assert.That(ifNode, Is.Not.Null);
@@ -49,7 +49,7 @@ public void DetectUnlessAttribute()
4949
visitor.Accept(nodes);
5050

5151
Assert.That(visitor.Nodes, Has.Count.EqualTo(1));
52-
Assert.IsAssignableFrom(typeof(SpecialNode), visitor.Nodes[0]);
52+
Assert.That(visitor.Nodes[0], Is.AssignableFrom(typeof(SpecialNode)));
5353

5454
var unlessNode = visitor.Nodes[0] as SpecialNode;
5555
Assert.That(unlessNode, Is.Not.Null);
@@ -69,9 +69,9 @@ public void ChainConditionalAttribute()
6969
visitor.Accept(visitor0.Nodes);
7070

7171
Assert.That(visitor.Nodes, Has.Count.EqualTo(3));
72-
Assert.IsAssignableFrom(typeof(SpecialNode), visitor.Nodes[0]);
73-
Assert.IsAssignableFrom(typeof(SpecialNode), visitor.Nodes[1]);
74-
Assert.IsAssignableFrom(typeof(SpecialNode), visitor.Nodes[2]);
72+
Assert.That(visitor.Nodes[0], Is.AssignableFrom(typeof(SpecialNode)));
73+
Assert.That(visitor.Nodes[1], Is.AssignableFrom(typeof(SpecialNode)));
74+
Assert.That(visitor.Nodes[2], Is.AssignableFrom(typeof(SpecialNode)));
7575

7676
var ifNode = (SpecialNode)visitor.Nodes[0];
7777
Assert.That(ifNode.Element.Name, Is.EqualTo("if"));

‎src/Spark.Tests/Visitors/SpecialNodeVisitorTester.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void WellMatchedNodesWrapContent()
3636
visitor.Accept(nodes);
3737

3838
Assert.That(visitor.Nodes, Has.Count.EqualTo(3));
39-
Assert.IsAssignableFrom(typeof(SpecialNode), visitor.Nodes[1]);
39+
Assert.That(visitor.Nodes[1], Is.AssignableFrom(typeof(SpecialNode)));
4040

4141
var specialNode = (SpecialNode)visitor.Nodes[1];
4242
Assert.Multiple(() =>

0 commit comments

Comments
 (0)