Skip to content

Commit a62dcf1

Browse files
i4004i4004
committed
[add] empty files tests
[del] redundant checks [add] exceptions messages [r] to NUnit 4 [r] to new C# features [deps] tests deps bump to latest
1 parent a04b9cd commit a62dcf1

28 files changed

+296
-336
lines changed

‎src/Simplify.Templates.Tests/Model/TemplateModelExtensionsTests.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@ public void Initialize()
2222
public void Set_NullModel_ReplacesWithNothing()
2323
{
2424
// Act
25-
_template.Model<TestModel>(null).Set();
25+
_template.Model<TestModel>(null!).Set();
2626

2727
// Assert
28-
Assert.AreEqual(" ", _template.Get());
28+
Assert.That(_template.Get(), Is.EqualTo(" "));
2929
}
3030

3131
[Test]
3232
public void Set_NullModelWithWith_ReplacesWithNothing()
3333
{
3434
// Act
35-
_template.Model<TestModel>(null).With(x => x.CreationTime, x => x.ToString("dd.MM.yyyy")).Set();
35+
_template.Model<TestModel>(null!).With(x => x.CreationTime, x => x.ToString("dd.MM.yyyy")).Set();
3636

3737
// Assert
38-
Assert.AreEqual(" ", _template.Get());
38+
Assert.That(_template.Get(), Is.EqualTo(" "));
3939
}
4040

4141
[Test]
4242
public void Set_Model_SetCorrectly()
4343
{
4444
// Arrange
45-
var model = new TestModel { CreationTime = new DateTime(2014, 10, 5), Name = "Foo", EMail = "[email protected]", ID = 5 };
45+
var model = new TestModel { CreationTime = new DateTime(2014, 10, 5, 0, 0, 0, DateTimeKind.Local), Name = "Foo", EMail = "[email protected]", ID = 5 };
4646

4747
// Act
4848
_template.Model(model).With(x => x.CreationTime, x => x.ToString("dd.MM.yyyy")).Set();
4949

5050
// Assert
51-
Assert.AreEqual("5 Foo [email protected] 05.10.2014", _template.Get());
51+
Assert.That(_template.Get(), Is.EqualTo("5 Foo [email protected] 05.10.2014"));
5252
}
5353

5454
[Test]
@@ -66,7 +66,7 @@ public void Set_EverythingIsNull_SetCorrectly()
6666
_template.Model(model).Set();
6767

6868
// Assert
69-
Assert.AreEqual(" ", _template.Get());
69+
Assert.That(_template.Get(), Is.EqualTo(" "));
7070
}
7171

7272
[Test]
@@ -87,7 +87,7 @@ public void Add_TwoModels_DataCombined()
8787
_template.Model(model2).Add();
8888

8989
// Assert
90-
Assert.AreEqual("TestFoo [email protected]@test.com", _template.Get());
90+
Assert.That(_template.Get(), Is.EqualTo("TestFoo [email protected]@test.com"));
9191
}
9292

9393
[Test]
@@ -105,7 +105,7 @@ public void Set_ModelWithBaseClass_BaseClassFieldsAlsoSet()
105105
_template.Model(model).Set();
106106

107107
// Assert
108-
Assert.AreEqual("3 Hello!", _template.Get());
108+
Assert.That(_template.Get(), Is.EqualTo("3 Hello!"));
109109
}
110110

111111
[Test]
@@ -123,6 +123,6 @@ public void Set_ModelWithPrefix_PrefixAdded()
123123
_template.Model(model, "Model").Set();
124124

125125
// Assert
126-
Assert.AreEqual("3", _template.Get());
126+
Assert.That(_template.Get(), Is.EqualTo("3"));
127127
}
128128
}

‎src/Simplify.Templates.Tests/Simplify.Templates.Tests.csproj‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFrameworks>net6.0;net48</TargetFrameworks>
4+
<LangVersion>latest</LangVersion>
45

56
<Authors>Alexander Krylkov</Authors>
67
<Product>Simplify</Product>
78
<Description>Simplify.Templates unit tests</Description>
89
<Copyright>Licensed under LGPL</Copyright>
910
</PropertyGroup>
1011
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.*" />
12-
<PackageReference Include="NUnit" Version="3.13.*" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.*" />
14-
<PackageReference Include="Moq" Version="4.18.*" />
15-
<PackageReference Include="coverlet.msbuild" Version="3.2.*" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.*" />
13+
<PackageReference Include="NUnit" Version="4.1.*" />
14+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.*" />
15+
<PackageReference Include="Moq" Version="4.20.*" />
16+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
1620
<ProjectReference Include="..\Simplify.Templates\Simplify.Templates.csproj" />
1721
</ItemGroup>
1822
<ItemGroup>
23+
<None Remove="TestTemplates\Embedded\EmptyFIle.txt" />
1924
<None Remove="TestTemplates\Embedded\LocalizationTest.tpl" />
2025
<None Remove="TestTemplates\Embedded\LocalizationTest.tpl-en.xml" />
2126
<None Remove="TestTemplates\Embedded\LocalizationTest.tpl-ru.xml" />
2227
<None Remove="TestTemplates\Embedded\TestFile.txt" />
2328
</ItemGroup>
2429
<ItemGroup>
30+
<EmbeddedResource Include="TestTemplates\Embedded\EmptyFIle.txt">
31+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
32+
</EmbeddedResource>
2533
<EmbeddedResource Include="TestTemplates\Embedded\LocalizationTest.tpl">
2634
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
2735
</EmbeddedResource>
@@ -45,6 +53,9 @@
4553
<None Update="TestTemplates\Local\LocalizationTest.tpl.ru.xml">
4654
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4755
</None>
56+
<None Update="TestTemplates\Local\EmptyFIle.txt">
57+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
58+
</None>
4859
<None Update="TestTemplates\Local\TestFile.txt">
4960
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5061
</None>

‎src/Simplify.Templates.Tests/TemplateAddExtensionsTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public void Initialize()
2121
public void Set_NullTemplate_Empty()
2222
{
2323
// Act
24-
_tpl.Add(VariableName, (ITemplate)null);
24+
_tpl.Add(VariableName, ((ITemplate)null)!);
2525

2626
// Assert
27-
Assert.AreEqual("", _tpl.Get());
27+
Assert.That(_tpl.Get(), Is.Empty);
2828
}
2929

3030
[Test]
@@ -34,7 +34,7 @@ public void Set_Template_SetCorrectly()
3434
_tpl.Add(VariableName, TemplateBuilder.FromString("a").Build());
3535

3636
// Assert
37-
Assert.AreEqual("a", _tpl.Get());
37+
Assert.That(_tpl.Get(), Is.EqualTo("a"));
3838
}
3939

4040
[Test]
@@ -44,7 +44,7 @@ public void Set_NullObject_Empty()
4444
_tpl.Add(VariableName, (object)null);
4545

4646
// Assert
47-
Assert.AreEqual("", _tpl.Get());
47+
Assert.That(_tpl.Get(), Is.Empty);
4848
}
4949

5050
[Test]
@@ -54,7 +54,7 @@ public void Set_Object_ObjectClassName()
5454
_tpl.Add(VariableName, new object());
5555

5656
// Assert
57-
Assert.AreEqual("System.Object", _tpl.Get());
57+
Assert.That(_tpl.Get(), Is.EqualTo("System.Object"));
5858
}
5959

6060
[Test]
@@ -64,7 +64,7 @@ public void Set_Int_SetCorrectly()
6464
_tpl.Add(VariableName, 17);
6565

6666
// Assert
67-
Assert.AreEqual("17", _tpl.Get());
67+
Assert.That(_tpl.Get(), Is.EqualTo("17"));
6868
}
6969

7070
[Test]
@@ -76,7 +76,7 @@ public void Set_MultipleInt_AllSetCorrectly()
7676
_tpl.Add(VariableName, 63);
7777

7878
// Assert
79-
Assert.AreEqual("1763", _tpl.Get());
79+
Assert.That(_tpl.Get(), Is.EqualTo("1763"));
8080
}
8181

8282
[Test]
@@ -86,7 +86,7 @@ public void Set_Long_SetCorrectly()
8686
_tpl.Add(VariableName, (long)16);
8787

8888
// Assert
89-
Assert.AreEqual("16", _tpl.Get());
89+
Assert.That(_tpl.Get(), Is.EqualTo("16"));
9090
}
9191

9292
[Test]
@@ -96,16 +96,16 @@ public void Set_Decimal_SetCorrectly()
9696
_tpl.Add(VariableName, 15.5m);
9797

9898
// Assert
99-
Assert.AreEqual("15.5", _tpl.Get());
99+
Assert.That(_tpl.Get(), Is.EqualTo("15.5"));
100100
}
101101

102102
[Test]
103103
public void Set_Double_SetCorrectly()
104104
{
105105
// Act
106-
_tpl.Add(VariableName, 1123456789123.123);
106+
_tpl.Add(VariableName, 1123456789123.12);
107107

108108
// Assert
109-
Assert.AreEqual("1123456789123.123", _tpl.Get());
109+
Assert.That(_tpl.Get(), Is.EqualTo("1123456789123.12"));
110110
}
111111
}

‎src/Simplify.Templates.Tests/TemplateBuilderFileNotFoundTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ public class TemplateBuilderFileNotFoundTests
99
{
1010
private const string FilePath = "NotFoundFile.txt";
1111

12-
private static readonly object[] _testCases =
13-
{
12+
private static readonly object[] TestCases =
13+
[
1414
(TestDelegate) (() => TemplateBuilder.FromFile(FilePath)),
1515
(TestDelegate) (() => TemplateBuilder.FromLocalFile(FilePath)),
1616
(TestDelegate) (() => TemplateBuilder.FromAssembly(FilePath, Assembly.GetExecutingAssembly())),
1717
(TestDelegate) (() => TemplateBuilder.FromCurrentAssembly(FilePath))
18-
};
18+
];
1919

20-
[TestCaseSource(nameof(_testCases))]
20+
[TestCaseSource(nameof(TestCases))]
2121
public void FileNotExist_FileNotFoundException(TestDelegate templateBuilder)
2222
{
2323
// Act

‎src/Simplify.Templates.Tests/TemplateBuilderFromStringTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ public class TemplateBuilderFromStringTests
1111
public void FromString_NullString_TemplateGetEqual()
1212
{
1313
// Act
14-
var ex = Assert.Throws<ArgumentNullException>(() => TemplateBuilder.FromString(null));
14+
var ex = Assert.Throws<ArgumentNullException>(() => TemplateBuilder.FromString(null!));
1515

1616
// Assert
17-
Assert.AreEqual("Value cannot be null. (Parameter 'text')", ex.Message);
17+
Assert.That(ex!.Message, Does.Contain("Value cannot be null"));
1818
}
1919

2020
[Test]
@@ -26,7 +26,7 @@ public void Build_FromString_TemplateContentIsCorrect()
2626
.Build();
2727

2828
// Assert
29-
Assert.AreEqual("test", tpl.Get());
29+
Assert.That(tpl.Get(), Is.EqualTo("test"));
3030
}
3131

3232
[Test]
@@ -38,7 +38,7 @@ public async Task BuildAsync_FromString_TemplateContentIsCorrect()
3838
.BuildAsync();
3939

4040
// Assert
41-
Assert.AreEqual("test", tpl.Get());
41+
Assert.That(tpl.Get(), Is.EqualTo("test"));
4242
}
4343

4444
[Test]
@@ -51,6 +51,6 @@ public void FromStringFixLineEndingsHtml_WithLineBreak_LineEndingReplacedWithBrs
5151
.Build();
5252

5353
// Assert
54-
Assert.AreEqual("test<br />test2", tpl.Get());
54+
Assert.That(tpl.Get(), Is.EqualTo("test<br />test2"));
5555
}
5656
}

‎src/Simplify.Templates.Tests/TemplateBuilderLocalizationTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ public class TemplateBuilderLocalizationTests
1212
private const string LocalTestFilePath = "TestTemplates/Local/LocalizationTest.tpl";
1313
private const string EmbeddedTestFilePath = "TestTemplates/Embedded/LocalizationTest.tpl";
1414

15-
private static readonly object[] _testCases =
16-
{
15+
private static readonly object[] TestCases =
16+
[
1717
(TemplateBuilderDelegate) (() => TemplateBuilder.FromFile(FileUtil.ConstructFullFilePath(LocalTestFilePath))),
1818
(TemplateBuilderDelegate) (() => TemplateBuilder.FromLocalFile(LocalTestFilePath)),
1919
(TemplateBuilderDelegate) (() => TemplateBuilder.FromAssembly(EmbeddedTestFilePath, Assembly.GetExecutingAssembly())),
2020
(TemplateBuilderDelegate) (() => TemplateBuilder.FromCurrentAssembly(EmbeddedTestFilePath))
21-
};
21+
];
2222

23-
[TestCaseSource(nameof(_testCases))]
23+
[TestCaseSource(nameof(TestCases))]
2424
public void Build_LocalizableDifferentFromBase_LocalizableLoadedWithBaseReplacements(TemplateBuilderDelegate templateBuilder)
2525
{
2626
// Arrange
@@ -32,10 +32,10 @@ public void Build_LocalizableDifferentFromBase_LocalizableLoadedWithBaseReplacem
3232
.Build();
3333

3434
// Assert
35-
Assert.AreEqual("текст1 text2", tpl.Get());
35+
Assert.That(tpl.Get(), Is.EqualTo("текст1 text2"));
3636
}
3737

38-
[TestCaseSource(nameof(_testCases))]
38+
[TestCaseSource(nameof(TestCases))]
3939
public async Task BuildAsync_LocalizableDifferentFromBase_LocalizableLoadedWithBaseReplacements(TemplateBuilderDelegate templateBuilder)
4040
{
4141
// Arrange
@@ -47,10 +47,10 @@ public async Task BuildAsync_LocalizableDifferentFromBase_LocalizableLoadedWithB
4747
.BuildAsync();
4848

4949
// Assert
50-
Assert.AreEqual("текст1 text2", tpl.Get());
50+
Assert.That(tpl.Get(), Is.EqualTo("текст1 text2"));
5151
}
5252

53-
[TestCaseSource(nameof(_testCases))]
53+
[TestCaseSource(nameof(TestCases))]
5454
public void Build_LocalizableFromCurrentThreadLanguageDifferentFromBase_LocalizableLoadedWithBaseReplacements(
5555
TemplateBuilderDelegate templateBuilder)
5656
{
@@ -65,10 +65,10 @@ public void Build_LocalizableFromCurrentThreadLanguageDifferentFromBase_Localiza
6565
.Build();
6666

6767
// Assert
68-
Assert.AreEqual("текст1 text2", tpl.Get());
68+
Assert.That(tpl.Get(), Is.EqualTo("текст1 text2"));
6969
}
7070

71-
[TestCaseSource(nameof(_testCases))]
71+
[TestCaseSource(nameof(TestCases))]
7272
public async Task BuildAsync_LocalizableFromCurrentThreadLanguageDifferentFromBase_LocalizableLoadedWithBaseReplacements(
7373
TemplateBuilderDelegate templateBuilder)
7474
{
@@ -83,6 +83,6 @@ public async Task BuildAsync_LocalizableFromCurrentThreadLanguageDifferentFromBa
8383
.BuildAsync();
8484

8585
// Assert
86-
Assert.AreEqual("текст1 text2", tpl.Get());
86+
Assert.That(tpl.Get(), Is.EqualTo("текст1 text2"));
8787
}
8888
}

‎src/Simplify.Templates.Tests/TemplateBuilderNullTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ namespace Simplify.Templates.Tests;
77
[TestFixture]
88
public class TemplateBuilderNullTests
99
{
10-
private static readonly object[] _testCases =
11-
{
12-
(TestDelegate) (() => TemplateBuilder.FromFile(null)),
13-
(TestDelegate) (() => TemplateBuilder.FromLocalFile(null)),
14-
(TestDelegate) (() => TemplateBuilder.FromAssembly(null, Assembly.GetExecutingAssembly())),
15-
(TestDelegate) (() => TemplateBuilder.FromCurrentAssembly(null))
16-
};
10+
private static readonly object[] TestCases =
11+
[
12+
(TestDelegate) (() => TemplateBuilder.FromFile(null!)),
13+
(TestDelegate) (() => TemplateBuilder.FromLocalFile(null!)),
14+
(TestDelegate) (() => TemplateBuilder.FromAssembly(null!, Assembly.GetExecutingAssembly())),
15+
(TestDelegate) (() => TemplateBuilder.FromCurrentAssembly(null!))
16+
];
1717

18-
[TestCaseSource(nameof(_testCases))]
18+
[TestCaseSource(nameof(TestCases))]
1919
public void NullPath_ArgumentNullException(TestDelegate templateBuilder)
2020
{
2121
// Act
2222
var ex = Assert.Throws<ArgumentException>(templateBuilder);
2323

2424
// Assert
25-
Assert.AreEqual("Value cannot be null or empty. (Parameter 'filePath')", ex.Message);
25+
Assert.That(ex!.Message, Does.Contain("Value cannot be null or empty."));
2626
}
2727
}

0 commit comments

Comments
 (0)