Skip to content

Commit e18f9ef

Browse files
committed
Update version
refactor tests
1 parent 6498ecb commit e18f9ef

12 files changed

Lines changed: 617 additions & 537 deletions

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<Deterministic>true</Deterministic>
4-
<Version>5.0.1</Version>
4+
<Version>5.0.2</Version>
55
<Authors>Jean-Pierre Bachmann</Authors>
66
<Company>Jean-Pierre Bachmann</Company>
77
<PackageProjectUrl>https://github.com/JPVenson/morestachio</PackageProjectUrl>

Morestachio.Tests/FormatterTests.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -457,11 +457,13 @@ public async Task ParserCanChainFormatSubExpressionFromEach()
457457
[Test]
458458
public async Task ParserCanChainFormatWithLineBreak()
459459
{
460-
var template = @"{{#SCOPE data}}{{this
461-
. ToString ( 'd' )
462-
. Self
463-
()
464-
}}{{/SCOPE}}";
460+
var template = """
461+
{{#SCOPE data}}{{this
462+
. ToString ( 'd' )
463+
. Self
464+
()
465+
}}{{/SCOPE}}
466+
""";
465467
var data = new Dictionary<string, object> { { "data", DateTime.UtcNow } };
466468
var result = await ParserFixture.CreateAndParseWithOptions(template, data,
467469
_opts | ParserOptionTypes.NoRerenderingTest,

Morestachio.Tests/Json/JsonNetValueResolverTests.cs

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ public JsonNetValueResolverTests(Type jsonSerializerStrategyType)
2525
[Test]
2626
public void TestValueResolverCanGetProperty()
2727
{
28-
var data = @"{
29-
""Data"": {
30-
""PropA"": ""Te"",
31-
},
32-
""PropB"": ""st""
33-
}
34-
";
28+
var data = """
29+
{
30+
"Data": {
31+
"PropA": "Te",
32+
},
33+
"PropB": "st"
34+
}
35+
36+
""";
3537
var template = "{{Data.PropA}}{{PropB}}";
3638

3739
var document = _jsonSerializerStrategy.Register(ParserFixture.TestBuilder().WithTemplate(template))
@@ -43,13 +45,15 @@ public void TestValueResolverCanGetProperty()
4345
[Test]
4446
public void TestValueResolverCanGetPropertyList()
4547
{
46-
var data = @"{
47-
""Data"": {
48-
""PropA"": [""T"",""e""],
49-
},
50-
""PropB"": ""st""
51-
}
52-
";
48+
var data = """
49+
{
50+
"Data": {
51+
"PropA": ["T","e"],
52+
},
53+
"PropB": "st"
54+
}
55+
56+
""";
5357
var template = "{{#each Data.PropA}}{{this}}{{/each}}{{PropB}}";
5458
var document = _jsonSerializerStrategy.Register(ParserFixture.TestBuilder().WithTemplate(template))
5559
.BuildAndParse();
@@ -60,13 +64,15 @@ public void TestValueResolverCanGetPropertyList()
6064
[Test]
6165
public void TestValueResolverCanGetPropertyListAndFormat()
6266
{
63-
var data = @"{
64-
""Data"": {
65-
""PropA"": [""E"", ""T"",""e""],
66-
},
67-
""PropB"": ""st""
68-
}
69-
";
67+
var data = """
68+
{
69+
"Data": {
70+
"PropA": ["E", "T","e"],
71+
},
72+
"PropB": "st"
73+
}
74+
75+
""";
7076
var template = "{{#each Data.PropA.Skip(1)}}{{this}}{{/each}}{{PropB}}";
7177
var document = _jsonSerializerStrategy.Register(ParserFixture.TestBuilder().WithTemplate(template))
7278
.BuildAndParse();

Morestachio.Tests/ParserCollectionFixture.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ public async Task TestEveryKeywordOnObject()
4040

4141
Assert.That(result, Is.EqualTo($"{nameof(EveryObjectTest.TestA)}:\"Du\"," +
4242
$"{nameof(EveryObjectTest.TestB)}:\"Hast\"," +
43-
$"{nameof(EveryObjectTest.ObjectTest)}:\"\""));
43+
$"""
44+
{nameof(EveryObjectTest.ObjectTest)}:""
45+
"""));
4446
}
4547

4648
[Test]
@@ -58,7 +60,9 @@ public async Task TestEveryKeywordOnDictionary()
5860

5961
Assert.That(result, Is.EqualTo($"{nameof(EveryObjectTest.TestA)}:\"Du\"," +
6062
$"{nameof(EveryObjectTest.TestB)}:\"Hast\"," +
61-
$"{nameof(EveryObjectTest.ObjectTest)}:\"\""));
63+
$"""
64+
{nameof(EveryObjectTest.ObjectTest)}:""
65+
"""));
6266
}
6367

6468
[Test]
@@ -81,7 +85,9 @@ public async Task TestEveryKeywordOnComplexPathDictionary()
8185

8286
Assert.That(result, Is.EqualTo($"{nameof(EveryObjectTest.TestA)}:\"Du\"," +
8387
$"{nameof(EveryObjectTest.TestB)}:\"Hast\"," +
84-
$"{nameof(EveryObjectTest.ObjectTest)}:\"\""));
88+
$"""
89+
{nameof(EveryObjectTest.ObjectTest)}:""
90+
"""));
8591
}
8692

8793
[Test]

0 commit comments

Comments
 (0)