Skip to content

Commit 2ede064

Browse files
committed
fix/add tests
1 parent d27dc05 commit 2ede064

File tree

1 file changed

+26
-8
lines changed

1 file changed

+26
-8
lines changed

src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Umbraco.Cms.Core;
1515
using Umbraco.Cms.Core.Configuration.Models;
1616
using Umbraco.Cms.Core.Events;
17+
using Umbraco.Cms.Core.Models.PublishedContent;
1718
using Umbraco.Cms.Core.PublishedCache;
1819
using Umbraco.Cms.Core.Routing;
1920
using Umbraco.Cms.Core.Services;
@@ -92,36 +93,36 @@ private IPublishedRouter GetRouter(IPublishedRequest request)
9293
=> Mock.Of<IPublishedRouter>(x => x.RouteRequestAsync(It.IsAny<IPublishedRequestBuilder>(), It.IsAny<RouteRequestOptions>()) == Task.FromResult(request));
9394

9495
[Test]
95-
public async Task Noop_When_Runtime_Level_Not_Run()
96+
public async Task Null_When_Runtime_Level_Not_Run()
9697
{
9798
UmbracoRouteValueTransformer transformer = GetTransformer(
9899
Mock.Of<IUmbracoContextAccessor>(),
99100
Mock.Of<IRuntimeState>());
100101

101102
RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
102-
Assert.AreEqual(0, result.Count);
103+
Assert.IsNull(result);
103104
}
104105

105106
[Test]
106-
public async Task Noop_When_No_Umbraco_Context()
107+
public async Task Null_When_No_Umbraco_Context()
107108
{
108109
UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
109110
Mock.Of<IUmbracoContextAccessor>());
110111

111112
RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
112-
Assert.AreEqual(0, result.Count);
113+
Assert.IsNull(result);
113114
}
114115

115116
[Test]
116-
public async Task Noop_When_Not_Document_Request()
117+
public async Task Null_When_Not_Document_Request()
117118
{
118119
var umbracoContext = Mock.Of<IUmbracoContext>();
119120
UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
120121
Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
121122
Mock.Of<IRoutableDocumentFilter>(x => x.IsDocumentRequest(It.IsAny<string>()) == false));
122123

123124
RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
124-
Assert.AreEqual(0, result.Count);
125+
Assert.IsNull(result);
125126
}
126127

127128
[Test]
@@ -173,10 +174,10 @@ public async Task Assigns_UmbracoRouteValues_To_HttpContext_Feature()
173174
}
174175

175176
[Test]
176-
public async Task Assigns_Values_To_RouteValueDictionary()
177+
public async Task Assigns_Values_To_RouteValueDictionary_When_Content()
177178
{
178179
IUmbracoContext umbracoContext = GetUmbracoContext(true);
179-
IPublishedRequest request = Mock.Of<IPublishedRequest>();
180+
IPublishedRequest request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == Mock.Of<IPublishedContent>());
180181
UmbracoRouteValues routeValues = GetRouteValues(request);
181182

182183
UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
@@ -190,6 +191,23 @@ public async Task Assigns_Values_To_RouteValueDictionary()
190191
Assert.AreEqual(routeValues.ActionName, result[ActionToken]);
191192
}
192193

194+
[Test]
195+
public async Task Returns_Null_RouteValueDictionary_When_No_Content()
196+
{
197+
IUmbracoContext umbracoContext = GetUmbracoContext(true);
198+
IPublishedRequest request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == null);
199+
UmbracoRouteValues routeValues = GetRouteValues(request);
200+
201+
UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
202+
Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
203+
router: GetRouter(request),
204+
routeValuesFactory: GetRouteValuesFactory(request));
205+
206+
RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
207+
208+
Assert.IsNull(result);
209+
}
210+
193211
private class TestController : RenderController
194212
{
195213
public TestController(ILogger<TestController> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)

0 commit comments

Comments
 (0)