Skip to content

Commit c283fa7

Browse files
i4004i4004
committed
[up] Simplify.Templates to 2.0
1 parent 8907811 commit c283fa7

File tree

14 files changed

+104
-92
lines changed

14 files changed

+104
-92
lines changed

‎src/Examples/Simplify.Web.Examples.SelfHosted/Views/Accounts/LoginView.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Simplify.Templates;
2+
using Simplify.Templates.Model;
23
using Simplify.Web.Examples.SelfHosted.Models.Accounts;
34

45
namespace Simplify.Web.Examples.SelfHosted.Views.Accounts;

‎src/Simplify.Web.Tests/Core/PageAssembly/PageBuilderTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace Simplify.Web.Tests.Core.PageAssembly;
1313
[TestFixture]
1414
public class PageBuilderTests
1515
{
16-
private PageBuilder _pageBuilder;
17-
private Mock<IDataCollector> _dataCollector;
18-
private Mock<ITemplateFactory> _templatesFactory;
16+
private PageBuilder _pageBuilder = null!;
17+
private Mock<IDataCollector> _dataCollector = null!;
18+
private Mock<ITemplateFactory> _templatesFactory = null!;
1919

20-
private Mock<IDIContainerProvider> _containerProvider;
21-
private Mock<IContextVariablesSetter> _variablesSetter;
22-
private Mock<IStringTableItemsSetter> _stringTableItemsSetter;
23-
private Mock<IEnvironment> _environment;
20+
private Mock<IDIContainerProvider> _containerProvider = null!;
21+
private Mock<IContextVariablesSetter> _variablesSetter = null!;
22+
private Mock<IStringTableItemsSetter> _stringTableItemsSetter = null!;
23+
private Mock<IEnvironment> _environment = null!;
2424

2525
[SetUp]
2626
public void Initialize()
@@ -40,7 +40,7 @@ public void Initialize()
4040
_containerProvider.Setup(x => x.Resolve(It.Is<Type>(d => d == typeof(IStringTableItemsSetter)))).Returns(_stringTableItemsSetter.Object);
4141
_containerProvider.Setup(x => x.Resolve(It.Is<Type>(d => d == typeof(IEnvironment)))).Returns(_environment.Object);
4242

43-
_templatesFactory.Setup(x => x.Load(It.IsAny<string>())).Returns(Template.FromString("{Foo}"));
43+
_templatesFactory.Setup(x => x.Load(It.IsAny<string>())).Returns(TemplateBuilder.FromString("{Foo}").Build);
4444
_dataCollector.SetupGet(x => x.Items).Returns(new Dictionary<string, string> { { "Foo", "Bar" } });
4545
}
4646

‎src/Simplify.Web.Tests/Modules/Data/DataCollectorTests.cs‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ namespace Simplify.Web.Tests.Modules.Data;
88
[TestFixture]
99
public class DataCollectorTests
1010
{
11-
private Mock<IStringTable> _stringTable;
12-
private DataCollector _dataCollector;
11+
private Mock<IStringTable> _stringTable = null!;
12+
private DataCollector _dataCollector = null!;
1313

1414
[SetUp]
1515
public void Initialize()
@@ -18,17 +18,6 @@ public void Initialize()
1818
_dataCollector = new DataCollector("MainContent", "Title", _stringTable.Object);
1919
}
2020

21-
[Test]
22-
public void AddVariableWithTest_Nulls_NotInserted()
23-
{
24-
// Act
25-
_dataCollector.Add(null, (string)null);
26-
27-
// Assert
28-
Assert.AreEqual(0, _dataCollector.Items.Count);
29-
Assert.IsFalse(_dataCollector.IsDataExist("Foo"));
30-
}
31-
3221
[Test]
3322
public void AddVariableWithTest_NotExist_Created()
3423
{
@@ -80,7 +69,7 @@ public void AddVariableWithTemplate_Null_NotAdded()
8069
public void AddVariableWithTemplate_NormalData_Added()
8170
{
8271
// Act
83-
_dataCollector.Add("Foo", Template.FromString("Bar"));
72+
_dataCollector.Add("Foo", TemplateBuilder.FromString("Bar").Build());
8473

8574
// Assert
8675
Assert.AreEqual("Bar", _dataCollector["Foo"]);
@@ -100,7 +89,7 @@ public void AddMainContentVariableWithText_NormalData_AddedToMainContentVariable
10089
public void AddMainContentVariableWithTemplate_NormalData_Added()
10190
{
10291
// Act
103-
_dataCollector.Add("Foo", Template.FromString("Bar"));
92+
_dataCollector.Add("Foo", TemplateBuilder.FromString("Bar").Build());
10493

10594
// Assert
10695
Assert.AreEqual("Bar", _dataCollector["Foo"]);

‎src/Simplify.Web.Tests/Modules/Data/TemplateFactoryTests.cs‎

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,38 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.IO;
4-
using System.IO.Abstractions;
5-
using System.IO.Abstractions.TestingHelpers;
6-
using Moq;
73
using NUnit.Framework;
8-
using Simplify.Templates;
9-
using Simplify.Web.Modules;
104
using Simplify.Web.Modules.Data;
115

126
namespace Simplify.Web.Tests.Modules.Data;
137

148
[TestFixture]
15-
public class TemplateFactoryTests
9+
public class TemplateFactoryTests : TemplateFactoryTestsBase
1610
{
17-
private Mock<IEnvironment> _environment;
18-
private Mock<ILanguageManagerProvider> _languageManagerProvider;
19-
private Mock<ILanguageManager> _languageManager;
20-
21-
[OneTimeSetUp]
22-
public void Initialize()
23-
{
24-
var dir = Path.Combine("WebSites", "FooSite", "Templates");
25-
var file = Path.Combine("WebSites", "FooSite", "Templates", "Foo.tpl");
26-
27-
var files = new Dictionary<string, MockFileData> { { file, "Dummy data" } };
28-
29-
Template.FileSystem = new MockFileSystem(files);
30-
31-
_environment = new Mock<IEnvironment>();
32-
_languageManagerProvider = new Mock<ILanguageManagerProvider>();
33-
_languageManager = new Mock<ILanguageManager>();
34-
35-
_environment.SetupGet(x => x.TemplatesPhysicalPath).Returns(dir);
36-
_languageManagerProvider.Setup(x => x.Get()).Returns(_languageManager.Object);
37-
_languageManager.SetupGet(x => x.Language).Returns("en");
38-
}
11+
private const string FileName = "Foo.tpl";
3912

4013
[Test]
4114
public void Load_NullFileName_ArgumentNullExceptionThrown()
4215
{
4316
// Assign
44-
var tf = new TemplateFactory(_environment.Object, _languageManagerProvider.Object, "en");
17+
var tf = new TemplateFactory(Environment.Object, LanguageManagerProvider.Object, "en");
4518

4619
// Act
4720
tf.Setup();
4821

4922
// Act & Assert
50-
Assert.Throws<ArgumentNullException>(() => tf.Load(null));
23+
Assert.Throws<ArgumentNullException>(() => tf.Load(null!));
5124
}
5225

5326
[Test]
5427
public void Load_NoCache_TemplateLoadedCorrectly()
5528
{
5629
// Assign
57-
var tf = new TemplateFactory(_environment.Object, _languageManagerProvider.Object, "en");
30+
var tf = new TemplateFactory(Environment.Object, LanguageManagerProvider.Object, "en");
5831

5932
// Act
6033

6134
tf.Setup();
62-
var data = tf.Load("Foo.tpl");
35+
var data = tf.Load(FileName);
6336

6437
// Assert
6538
Assert.AreEqual("Dummy data", data.Get());
@@ -69,7 +42,7 @@ public void Load_NoCache_TemplateLoadedCorrectly()
6942
public void Load_NameWithoutTpl_TemplateLoadedCorrectly()
7043
{
7144
// Assign
72-
var tf = new TemplateFactory(_environment.Object, _languageManagerProvider.Object, "en");
45+
var tf = new TemplateFactory(Environment.Object, LanguageManagerProvider.Object, "en");
7346

7447
// Act
7548

@@ -84,36 +57,36 @@ public void Load_NameWithoutTpl_TemplateLoadedCorrectly()
8457
public void Load_WithCache_TemplateLoadedCorrectly()
8558
{
8659
// Assign
87-
var tf = new TemplateFactory(_environment.Object, _languageManagerProvider.Object, "en", true);
60+
var tf = new TemplateFactory(Environment.Object, LanguageManagerProvider.Object, "en", true);
8861

8962
// Act
9063

9164
tf.Setup();
92-
var data = tf.Load("Foo.tpl");
65+
var data = tf.Load(FileName);
9366

9467
// Asset
9568
Assert.AreEqual("Dummy data", data.Get());
9669

9770
// Assign
9871

99-
tf = new TemplateFactory(_environment.Object, _languageManagerProvider.Object, "en", true);
72+
tf = new TemplateFactory(Environment.Object, LanguageManagerProvider.Object, "en", true);
10073
tf.Setup();
101-
Template.FileSystem = new Mock<IFileSystem>().Object;
74+
75+
File.Delete(Environment.Object.TemplatesPhysicalPath + "\\" + FileName);
10276

10377
// Act
104-
data = tf.Load("Foo.tpl");
78+
data = tf.Load(FileName);
10579

10680
// Assert
10781

10882
Assert.AreEqual("Dummy data", data.Get());
109-
Assert.AreEqual("en", data.Language);
11083
}
11184

11285
[Test]
11386
public void Load_FromManifestEnabled_CalledCorrectlyPathFixedWithDots()
11487
{
11588
// Assign
116-
var tf = new TemplateFactory(_environment.Object, _languageManagerProvider.Object, "en", true, true);
89+
var tf = new TemplateFactory(Environment.Object, LanguageManagerProvider.Object, "en", true, true);
11790

11891
// Act
11992

‎src/Simplify.Web.Tests/Modules/Data/TemplateFactoryTestsBase.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using Moq;
2+
using NUnit.Framework;
3+
using Simplify.Web.Modules;
4+
5+
namespace Simplify.Web.Tests.Modules.Data;
6+
7+
[TestFixture]
8+
public class TemplateFactoryTestsBase
9+
{
10+
protected Mock<IEnvironment> Environment = null!;
11+
protected Mock<ILanguageManagerProvider> LanguageManagerProvider = null!;
12+
protected Mock<ILanguageManager> LanguageManager = null!;
13+
14+
[OneTimeSetUp]
15+
public void Initialize()
16+
{
17+
Environment = new Mock<IEnvironment>();
18+
LanguageManagerProvider = new Mock<ILanguageManagerProvider>();
19+
LanguageManager = new Mock<ILanguageManager>();
20+
21+
Environment.SetupGet(x => x.TemplatesPhysicalPath).Returns("Templates");
22+
LanguageManagerProvider.Setup(x => x.Get()).Returns(LanguageManager.Object);
23+
LanguageManager.SetupGet(x => x.Language).Returns("en");
24+
}
25+
}

‎src/Simplify.Web.Tests/Responses/InlineTplTests.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,22 @@ namespace Simplify.Web.Tests.Responses;
1010
[TestFixture]
1111
public class InlineTplTests
1212
{
13-
private Mock<IDataCollector> _dataCollector;
13+
private Mock<IDataCollector> _dataCollector = null!;
1414

1515
[SetUp]
16-
public void Initialize()
17-
{
18-
_dataCollector = new Mock<IDataCollector>();
19-
}
16+
public void Initialize() => _dataCollector = new Mock<IDataCollector>();
2017

2118
[Test]
2219
public void Process_DataCollectorVariableNameIsNullOrEmpty_ArgumentNullException()
2320
{
21+
// ReSharper disable ObjectCreationAsStatement
2422
Assert.Throws<ArgumentNullException>(() => new InlineTpl(null, "foo"));
25-
Assert.Throws<ArgumentNullException>(() => new InlineTpl(null, Template.FromString("")));
23+
Assert.Throws<ArgumentNullException>(() => new InlineTpl(null, TemplateBuilder.FromString("").Build()));
24+
// ReSharper restore ObjectCreationAsStatement
2625
}
2726

2827
[Test]
29-
public void Process_NormalData_DataAddedtoDataCollector()
28+
public void InlineTplProcess_NormalData_DataAddedToDataCollector()
3029
{
3130
// Assign
3231

@@ -43,11 +42,11 @@ public void Process_NormalData_DataAddedtoDataCollector()
4342
}
4443

4544
[Test]
46-
public void Process_NormalTemplate_DataAddedtoDataCollector()
45+
public void InlineTplProcess_NormalTemplate_DataAddedToDataCollector()
4746
{
4847
// Assign
4948

50-
var tplData = new Mock<InlineTpl>("foo", Template.FromString("test")) { CallBase = true };
49+
var tplData = new Mock<InlineTpl>("foo", TemplateBuilder.FromString("test").Build()) { CallBase = true };
5150
tplData.SetupGet(x => x.DataCollector).Returns(_dataCollector.Object);
5251

5352
// Act

‎src/Simplify.Web.Tests/Responses/TplTests.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ namespace Simplify.Web.Tests.Responses;
1111
[TestFixture]
1212
public class TplTests
1313
{
14-
private Mock<IDataCollector> _dataCollector;
15-
private Mock<IWebContext> _context;
16-
private Mock<IOwinResponse> _response;
14+
private Mock<IDataCollector> _dataCollector = null!;
15+
private Mock<IWebContext> _context = null!;
16+
private Mock<IOwinResponse> _response = null!;
1717

1818
[SetUp]
1919
public void Initialize()
@@ -26,7 +26,7 @@ public void Initialize()
2626
}
2727

2828
[Test]
29-
public void Process_NormalData_DataAddedtoDataCollector()
29+
public void Process_NormalData_DataAddedToDataCollector()
3030
{
3131
// Assign
3232

@@ -44,11 +44,11 @@ public void Process_NormalData_DataAddedtoDataCollector()
4444
}
4545

4646
[Test]
47-
public void Process_NormalTemplate_DataAddedtoDataCollector()
47+
public void Process_NormalTemplate_DataAddedToDataCollector()
4848
{
4949
// Assign
5050

51-
var tplData = new Mock<Tpl>(Template.FromString("test"), null, 200) { CallBase = true };
51+
var tplData = new Mock<Tpl>(TemplateBuilder.FromString("test").Build(), null, 200) { CallBase = true };
5252
tplData.SetupGet(x => x.DataCollector).Returns(_dataCollector.Object);
5353
tplData.SetupGet(x => x.Context).Returns(_context.Object);
5454

@@ -60,11 +60,11 @@ public void Process_NormalTemplate_DataAddedtoDataCollector()
6060
}
6161

6262
[Test]
63-
public void Process_NormalTemplateAndTitle_DataAndTitleAddedtoDataCollector()
63+
public void Process_NormalTemplateAndTitle_DataAndTitleAddedToDataCollector()
6464
{
6565
// Assign
6666

67-
var tplData = new Mock<Tpl>(Template.FromString("test"), "foo title", 200) { CallBase = true };
67+
var tplData = new Mock<Tpl>(TemplateBuilder.FromString("test").Build(), "foo title", 200) { CallBase = true };
6868
tplData.SetupGet(x => x.DataCollector).Returns(_dataCollector.Object);
6969
tplData.SetupGet(x => x.Context).Returns(_context.Object);
7070

@@ -78,7 +78,7 @@ public void Process_NormalTemplateAndTitle_DataAndTitleAddedtoDataCollector()
7878
}
7979

8080
[Test]
81-
public void Process_NormalDataAndTitle_DataAndTitleAddedtoDataCollector()
81+
public void Process_NormalDataAndTitle_DataAndTitleAddedToDataCollector()
8282
{
8383
// Assign
8484

@@ -96,7 +96,7 @@ public void Process_NormalDataAndTitle_DataAndTitleAddedtoDataCollector()
9696
}
9797

9898
[Test]
99-
public void Process_NormalDataAndNullTitle_DataAddedTitleNotAddedtoDataCollector()
99+
public void Process_NormalDataAndNullTitle_DataAddedTitleNotAddedToDataCollector()
100100
{
101101
// Assign
102102

‎src/Simplify.Web.Tests/Simplify.Web.Tests.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,9 @@
2727
<ItemGroup>
2828
<EmbeddedResource Include="Templates\Test.tpl" />
2929
</ItemGroup>
30+
<ItemGroup>
31+
<None Update="Templates\Foo.tpl">
32+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33+
</None>
34+
</ItemGroup>
3035
</Project>

‎src/Simplify.Web.Tests/Templates/Foo.tpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dummy data

‎src/Simplify.Web/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Changelog
22

3+
## [1.7.0] - 2023-04-30
4+
5+
### Dependencies
6+
7+
- Simplify.Templates to 2.0
8+
- Microsoft.Owin to 4.2.2
9+
- Simplify.DI bump to 4.2.8
10+
- Internal Simplify.Xml.Sources to 1.3.0
11+
- Internal Simplify.System.Sources to 1.6.1
12+
- Microsoft.Extensions.Configuration to 6.0.0
13+
314
## [1.6.1] - 2022-04-15
415

516
### Dependencies

0 commit comments

Comments
 (0)