Skip to content

Commit 2896152

Browse files
i4004i4004
committed
String table items without name ignore
.NET 5.0 explicit support Context.User.Identity check for null [DEP] Simplify.Xml.Sources bump to 1.3 [FIX] Missing async calls in tests awaits [FIX] assembly.FullName null check added [FIX] Typos [R] To nullable [R] Methods as expressions bodies [R] Unused properies [R] Async suggesstions added [R] Unused usings cleanup [R] To is not null [R] General refactoring Version set
1 parent 30d00b7 commit 2896152

File tree

113 files changed

+561
-815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+561
-815
lines changed

‎src/Simplify.Web.Tests/Core/Controllers/ControllersAgentTests.cs

+41-43
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#nullable disable
2-
3-
using System.Collections.Generic;
1+
using System.Collections.Generic;
42
using System.Linq;
53
using System.Security.Claims;
64
using System.Security.Principal;
@@ -15,9 +13,9 @@ namespace Simplify.Web.Tests.Core.Controllers
1513
[TestFixture]
1614
public class ControllersAgentTests
1715
{
18-
private ControllersAgent _agent;
19-
private Mock<IControllersMetaStore> _metaStore;
20-
private Mock<IRouteMatcher> _routeMatcher;
16+
private ControllersAgent _agent = null!;
17+
private Mock<IControllersMetaStore> _metaStore = null!;
18+
private Mock<IRouteMatcher> _routeMatcher = null!;
2119

2220
[SetUp]
2321
public void Initialize()
@@ -35,10 +33,10 @@ public void GetStandardControllersMetaData_StandardControllerAndAll40xController
3533
_metaStore.SetupGet(x => x.ControllersMetaData)
3634
.Returns(new List<IControllerMetaData>
3735
{
38-
new ControllerMetaData(null),
39-
new ControllerMetaData(null, null, new ControllerRole(true)),
40-
new ControllerMetaData(null, null, new ControllerRole(false, true)),
41-
new ControllerMetaData(null, null, new ControllerRole(false, false, true))
36+
new ControllerMetaData(null!),
37+
new ControllerMetaData(null!, null, new ControllerRole(true)),
38+
new ControllerMetaData(null!, null, new ControllerRole(false, true)),
39+
new ControllerMetaData(null!, null, new ControllerRole(false, false, true))
4240
});
4341

4442
_agent = new ControllersAgent(_metaStore.Object, _routeMatcher.Object);
@@ -55,7 +53,7 @@ public void GetStandardControllersMetaData_StandardControllerAndAll40xController
5553
public void MatchControllerRoute_NoControllerExecParameters_MatchCalled()
5654
{
5755
// Act
58-
_agent.MatchControllerRoute(new ControllerMetaData(null), "/foo", "GET");
56+
_agent.MatchControllerRoute(new ControllerMetaData(null!), "/foo", "GET");
5957

6058
// Assert
6159
_routeMatcher.Verify(x => x.Match(It.Is<string>(s => s == "/foo"), It.Is<string>(s => s == null)));
@@ -65,7 +63,7 @@ public void MatchControllerRoute_NoControllerExecParameters_MatchCalled()
6563
public void MatchControllerRoute_NoControllerRouteData_MatchCalled()
6664
{
6765
// Act
68-
_agent.MatchControllerRoute(new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string>())), "/foo", "GET");
66+
_agent.MatchControllerRoute(new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string>())), "/foo", "GET");
6967

7068
// Assert
7169
_routeMatcher.Verify(x => x.Match(It.Is<string>(s => s == "/foo"), It.Is<string>(s => s == null)));
@@ -76,7 +74,7 @@ public void MatchControllerRoute_GetControllerRouteGetMethod_MatchCalled()
7674
{
7775
// Act
7876
_agent.MatchControllerRoute(
79-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Get, "/foo" } })), "/bar", "GET");
77+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Get, "/foo" } })), "/bar", "GET");
8078

8179
// Assert
8280
_routeMatcher.Verify(x => x.Match(It.Is<string>(s => s == "/bar"), It.Is<string>(s => s == "/foo")));
@@ -87,7 +85,7 @@ public void MatchControllerRoute_PostControllerRoutePostMethod_MatchCalled()
8785
{
8886
// Act
8987
_agent.MatchControllerRoute(
90-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Post, "/foo" } })), "/bar", "POST");
88+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Post, "/foo" } })), "/bar", "POST");
9189

9290
// Assert
9391
_routeMatcher.Verify(x => x.Match(It.Is<string>(s => s == "/bar"), It.Is<string>(s => s == "/foo")));
@@ -98,7 +96,7 @@ public void MatchControllerRoute_PutControllerRoutePutMethod_MatchCalled()
9896
{
9997
// Act
10098
_agent.MatchControllerRoute(
101-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Put, "/foo" } })), "/bar",
99+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Put, "/foo" } })), "/bar",
102100
"PUT");
103101

104102
// Assert
@@ -110,7 +108,7 @@ public void MatchControllerRoute_PatchControllerRoutePatchMethod_MatchCalled()
110108
{
111109
// Act
112110
_agent.MatchControllerRoute(
113-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Patch, "/foo" } })), "/bar",
111+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Patch, "/foo" } })), "/bar",
114112
"PATCH");
115113

116114
// Assert
@@ -122,7 +120,7 @@ public void MatchControllerRoute_DeleteControllerRouteDeleteMethod_MatchCalled()
122120
{
123121
// Act
124122
_agent.MatchControllerRoute(
125-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Delete, "/foo" } })),
123+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Delete, "/foo" } })),
126124
"/bar", "DELETE");
127125

128126
// Assert
@@ -134,7 +132,7 @@ public void MatchControllerRoute_OptionsControllerRouteOptionsMethod_MatchCalled
134132
{
135133
// Act
136134
_agent.MatchControllerRoute(
137-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Options, "/foo" } })),
135+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Options, "/foo" } })),
138136
"/bar", "OPTIONS");
139137

140138
// Assert
@@ -146,7 +144,7 @@ public void MatchControllerRoute_PostControllerRouteGetMethod_MatchNotCalled()
146144
{
147145
// Act
148146
var result = _agent.MatchControllerRoute(
149-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Post, "/foo" } })), "/bar", "GET");
147+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Post, "/foo" } })), "/bar", "GET");
150148

151149
// Assert
152150

@@ -159,7 +157,7 @@ public void MatchControllerRoute_UndefinedMethod_MatchNotCalled()
159157
{
160158
// Act
161159
var result = _agent.MatchControllerRoute(
162-
new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Get, "/foo" } })), "/bar", "FOO");
160+
new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Get, "/foo" } })), "/bar", "FOO");
163161

164162
// Assert
165163

@@ -186,24 +184,24 @@ public void GetHandlerController_HaveController_ControllerMetaDataReturned()
186184

187185
_metaStore.SetupGet(x => x.ControllersMetaData).Returns(new List<IControllerMetaData>
188186
{
189-
new ControllerMetaData(null, null, new ControllerRole(false, false, true))
187+
new ControllerMetaData(null!, null, new ControllerRole(false, false, true))
190188
});
191189

192190
_agent = new ControllersAgent(_metaStore.Object, _routeMatcher.Object);
193191

194192
// Act
195-
var metaData = _agent.GetHandlerController(HandlerControllerType.Http404Handler);
193+
var metaData = _agent.GetHandlerController(HandlerControllerType.Http404Handler)!;
196194

197195
// Assert
198196

199-
Assert.IsTrue(metaData.Role.Is404Handler);
197+
Assert.IsTrue(metaData.Role!.Is404Handler);
200198
}
201199

202200
[Test]
203201
public void IsAnyPageController_AnyPageController_True()
204202
{
205203
// Assign
206-
var metaData = new ControllerMetaData(null);
204+
var metaData = new ControllerMetaData(null!);
207205

208206
// Act & Assert
209207
Assert.IsTrue(_agent.IsAnyPageController(metaData));
@@ -213,7 +211,7 @@ public void IsAnyPageController_AnyPageController_True()
213211
public void IsAnyPageController_AnyPageControllerWithEmptyRoutes_True()
214212
{
215213
// Assign
216-
var metaData = new ControllerMetaData(null, new ControllerExecParameters(null));
214+
var metaData = new ControllerMetaData(null!, new ControllerExecParameters(null));
217215

218216
// Act & Assert
219217
Assert.IsTrue(_agent.IsAnyPageController(metaData));
@@ -223,7 +221,7 @@ public void IsAnyPageController_AnyPageControllerWithEmptyRoutes_True()
223221
public void IsAnyPageController_404Handler_False()
224222
{
225223
// Assign
226-
var metaData = new ControllerMetaData(null, null, new ControllerRole(false, false, true));
224+
var metaData = new ControllerMetaData(null!, null, new ControllerRole(false, false, true));
227225

228226
// Act & Assert
229227
Assert.IsFalse(_agent.IsAnyPageController(metaData));
@@ -233,7 +231,7 @@ public void IsAnyPageController_404Handler_False()
233231
public void IsAnyPageController_GetRoute_False()
234232
{
235233
// Assign
236-
var metaData = new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Get, "/" } }));
234+
var metaData = new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Get, "/" } }));
237235

238236
// Act & Assert
239237
Assert.IsFalse(_agent.IsAnyPageController(metaData));
@@ -243,7 +241,7 @@ public void IsAnyPageController_GetRoute_False()
243241
public void IsAnyPageController_PostRoute_False()
244242
{
245243
// Assign
246-
var metaData = new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Post, "/" } }));
244+
var metaData = new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Post, "/" } }));
247245

248246
// Act & Assert
249247
Assert.IsFalse(_agent.IsAnyPageController(metaData));
@@ -253,7 +251,7 @@ public void IsAnyPageController_PostRoute_False()
253251
public void IsAnyPageController_PutRoute_False()
254252
{
255253
// Assign
256-
var metaData = new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Put, "/" } }));
254+
var metaData = new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Put, "/" } }));
257255

258256
// Act & Assert
259257
Assert.IsFalse(_agent.IsAnyPageController(metaData));
@@ -263,7 +261,7 @@ public void IsAnyPageController_PutRoute_False()
263261
public void IsAnyPageController_PatchRoute_False()
264262
{
265263
// Assign
266-
var metaData = new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Patch, "/" } }));
264+
var metaData = new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Patch, "/" } }));
267265

268266
// Act & Assert
269267
Assert.IsFalse(_agent.IsAnyPageController(metaData));
@@ -273,7 +271,7 @@ public void IsAnyPageController_PatchRoute_False()
273271
public void IsAnyPageController_DeleteRoute_False()
274272
{
275273
// Assign
276-
var metaData = new ControllerMetaData(null, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Delete, "/" } }));
274+
var metaData = new ControllerMetaData(null!, new ControllerExecParameters(new Dictionary<HttpMethod, string> { { HttpMethod.Delete, "/" } }));
277275

278276
// Act & Assert
279277
Assert.IsFalse(_agent.IsAnyPageController(metaData));
@@ -283,28 +281,28 @@ public void IsAnyPageController_DeleteRoute_False()
283281
public void IsSecurityRulesViolated_NoSecurityRules_Ok()
284282
{
285283
// Assign
286-
var metaData = new ControllerMetaData(null);
284+
var metaData = new ControllerMetaData(null!);
287285

288286
// Act & Assert
289-
Assert.AreEqual(SecurityRuleCheckResult.Ok, _agent.IsSecurityRulesViolated(metaData, null));
287+
Assert.AreEqual(SecurityRuleCheckResult.Ok, _agent.IsSecurityRulesViolated(metaData, null!));
290288
}
291289

292290
[Test]
293291
public void IsSecurityRulesViolated_AuthorizationRequiredNotAuthorized_NotAuthenticated()
294292
{
295293
// Assign
296-
var metaData = new ControllerMetaData(null, null, null, new ControllerSecurity(true));
294+
var metaData = new ControllerMetaData(null!, null, null, new ControllerSecurity(true));
297295

298296
// Act & Assert
299-
Assert.AreEqual(SecurityRuleCheckResult.NotAuthenticated, _agent.IsSecurityRulesViolated(metaData, null));
297+
Assert.AreEqual(SecurityRuleCheckResult.NotAuthenticated, _agent.IsSecurityRulesViolated(metaData, null!));
300298
}
301299

302300
[Test]
303301
public void IsSecurityRulesViolated_AuthorizationRequiredAuthorized_Ok()
304302
{
305303
// Assign
306304

307-
var metaData = new ControllerMetaData(null, null, null, new ControllerSecurity(true));
305+
var metaData = new ControllerMetaData(null!, null, null, new ControllerSecurity(true));
308306
var claims = new List<Claim>
309307
{
310308
new Claim(ClaimTypes.Name, "Foo")
@@ -322,7 +320,7 @@ public void IsSecurityRulesViolated_AuthorizationRequiredWithGroupAuthorizedNoGr
322320
{
323321
// Assign
324322

325-
var metaData = new ControllerMetaData(null, null, null,
323+
var metaData = new ControllerMetaData(null!, null, null,
326324
new ControllerSecurity(true, new List<string> { "Admin", "User" }));
327325

328326
var claims = new List<Claim>
@@ -342,7 +340,7 @@ public void IsSecurityRulesViolated_AuthorizationRequiredWithGroupAuthorizedNotI
342340
{
343341
// Assign
344342

345-
var metaData = new ControllerMetaData(null, null, null, new ControllerSecurity(true, new List<string> { "Admin" }));
343+
var metaData = new ControllerMetaData(null!, null, null, new ControllerSecurity(true, new List<string> { "Admin" }));
346344
var claims = new List<Claim>
347345
{
348346
new Claim(ClaimTypes.Name, "Foo"),
@@ -361,18 +359,18 @@ public void IsSecurityRulesViolated_AuthorizationRequiredWithGroupNotAuthorized_
361359
{
362360
// Assign
363361

364-
var metaData = new ControllerMetaData(null, null, null, new ControllerSecurity(true, new List<string> { "Admin, User" }));
362+
var metaData = new ControllerMetaData(null!, null, null, new ControllerSecurity(true, new List<string> { "Admin, User" }));
365363

366364
// Act & Assert
367-
Assert.AreEqual(SecurityRuleCheckResult.NotAuthenticated, _agent.IsSecurityRulesViolated(metaData, null));
365+
Assert.AreEqual(SecurityRuleCheckResult.NotAuthenticated, _agent.IsSecurityRulesViolated(metaData, null!));
368366
}
369367

370368
[Test]
371369
public void IsSecurityRulesViolated_AuthorizationRequiredWithGroupAuthorizedInGroup_Ok()
372370
{
373371
// Assign
374372

375-
var metaData = new ControllerMetaData(null, null, null, new ControllerSecurity(true, new List<string> { "Admin", "User" }));
373+
var metaData = new ControllerMetaData(null!, null, null, new ControllerSecurity(true, new List<string> { "Admin", "User" }));
376374
var claims = new List<Claim>
377375
{
378376
new Claim(ClaimTypes.Name, "Foo"),
@@ -391,7 +389,7 @@ public void IsSecurityRulesViolated_UserExistNotAuthenticatedUser_NotAuthenticat
391389
{
392390
// Assign
393391

394-
var metaData = new ControllerMetaData(null, null, null, new ControllerSecurity(true));
392+
var metaData = new ControllerMetaData(null!, null, null, new ControllerSecurity(true));
395393

396394
var id = new Mock<IIdentity>();
397395
id.Setup(x => x.IsAuthenticated).Returns(false);
@@ -406,7 +404,7 @@ public void IsSecurityRulesViolated_UserExistNotAuthenticatedUserWithAllowedUser
406404
{
407405
// Assign
408406

409-
var metaData = new ControllerMetaData(null, null, null, new ControllerSecurity(true, new List<string> { "User" }));
407+
var metaData = new ControllerMetaData(null!, null, null, new ControllerSecurity(true, new List<string> { "User" }));
410408

411409
var id = new Mock<IIdentity>();
412410
id.Setup(x => x.IsAuthenticated).Returns(false);

0 commit comments

Comments
 (0)