Skip to content

Commit f068d0c

Browse files
ReneSchwarzerReneSchwarzer
committed
feat: general improvements and minor bugs
1 parent 5dd9848 commit f068d0c

9 files changed

Lines changed: 35 additions & 38 deletions

File tree

‎src/WebExpress.WebCore.Test/Fixture/UnitTestFixture.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static ComponentHub CreateAndRegisterComponentHubMock()
9898
/// <param name="content">The content of the request.</param>
9999
/// <param name="uri">The URI of the request.</param>
100100
/// <returns>A fake request for testing.</returns>
101-
public static IRequest CrerateRequestMock(string content = "", string uri = "")
101+
public static IRequest CreateRequestMock(string content = "", string uri = "")
102102
{
103103
var context = CreateHttpContextMock(content);
104104

@@ -117,7 +117,7 @@ public static IRequest CrerateRequestMock(string content = "", string uri = "")
117117
/// </summary>
118118
/// <param name="uri">The URI of the request.</param>
119119
/// <returns>A fake request for testing.</returns>
120-
public static IRequest CrerateRequestMock(IUri uri)
120+
public static IRequest CreateRequestMock(IUri uri)
121121
{
122122
var context = CreateHttpContextMock();
123123

@@ -210,7 +210,7 @@ public static WebMessage.HttpContext CreateHttpContextMock(string content = "")
210210
/// <returns>A mock render context for testing.</returns>
211211
public static RenderContext CrerateRenderContextMock(IApplicationContext applicationContext = null, IEnumerable<Type> scopes = null)
212212
{
213-
var request = CrerateRequestMock();
213+
var request = CreateRequestMock();
214214

215215
return new RenderContext(null, CreratePageContextMock(applicationContext, scopes), request);
216216
}

‎src/WebExpress.WebCore.Test/Manager/UnitTestAssetManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void Request(string uri, string resource)
127127

128128
var response = componentHub
129129
.EndpointManager
130-
.HandleRequest(UnitTestFixture.CrerateRequestMock("", uri), searchResult.EndpointContext);
130+
.HandleRequest(UnitTestFixture.CreateRequestMock("", uri), searchResult.EndpointContext);
131131

132132
Assert.Equal($"webexpress.webcore.test.{resource.Replace('/', '.')}", searchResult?.EndpointContext?.EndpointId.ToString());
133133
Assert.IsNotType<ResponseNotFound>(response);

‎src/WebExpress.WebCore.Test/Manager/UnitTestIdentityManager.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void Login(string identityName, string password, bool expected)
145145
// arrange
146146
var componentHub = UnitTestFixture.CreateAndRegisterComponentHubMock();
147147
var identityManager = componentHub.IdentityManager as IdentityManager;
148-
var request = UnitTestFixture.CrerateRequestMock();
148+
var request = UnitTestFixture.CreateRequestMock();
149149
var identity = MockIdentityFactory.GetIdentity(identityName);
150150
var securePassword = new SecureString();
151151
password.ToList().ForEach(x => securePassword.AppendChar(x));
@@ -169,7 +169,7 @@ public void Logout(string identityName, string password)
169169
// arrange
170170
var componentHub = UnitTestFixture.CreateAndRegisterComponentHubMock();
171171
var identityManager = componentHub.IdentityManager as IdentityManager;
172-
var request = UnitTestFixture.CrerateRequestMock();
172+
var request = UnitTestFixture.CreateRequestMock();
173173
var identity = MockIdentityFactory.GetIdentity(identityName);
174174
var securePassword = new SecureString();
175175
password.ToList().ForEach(x => securePassword.AppendChar(x));
@@ -195,7 +195,7 @@ public void GetCurrentIdentity(string identityName, string password)
195195
// arrange
196196
var componentHub = UnitTestFixture.CreateAndRegisterComponentHubMock();
197197
var identityManager = componentHub.IdentityManager as IdentityManager;
198-
var request = UnitTestFixture.CrerateRequestMock();
198+
var request = UnitTestFixture.CreateRequestMock();
199199
var identity = MockIdentityFactory.GetIdentity(identityName);
200200
var securePassword = new SecureString();
201201
password.ToList().ForEach(x => securePassword.AppendChar(x));

‎src/WebExpress.WebCore.Test/Manager/UnitTestRestApiManager.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void IsIContext()
182182
public void ValidateRequire(string input)
183183
{
184184
// arrange
185-
var request = UnitTestFixture.CrerateRequestMock($"name={input}");
185+
var request = UnitTestFixture.CreateRequestMock($"name={input}");
186186
request.AddParameter(new Parameter("name", input, ParameterScope.Parameter));
187187

188188
// act
@@ -204,7 +204,7 @@ public void ValidateRequire(string input)
204204
public void ValidateMinLength(string input)
205205
{
206206
// arrange
207-
var request = UnitTestFixture.CrerateRequestMock();
207+
var request = UnitTestFixture.CreateRequestMock();
208208
request.AddParameter(new Parameter("code", input, ParameterScope.Parameter));
209209

210210
// act
@@ -225,7 +225,7 @@ public void ValidateMaxLength(int length)
225225
{
226226
// arrange
227227
var input = new string('x', length);
228-
var request = UnitTestFixture.CrerateRequestMock();
228+
var request = UnitTestFixture.CreateRequestMock();
229229
request.AddParameter(new Parameter("bio", input, ParameterScope.Parameter));
230230

231231
// act
@@ -247,7 +247,7 @@ public void ValidateMaxLength(int length)
247247
public void ValidateEmail(string email)
248248
{
249249
// arrange
250-
var request = UnitTestFixture.CrerateRequestMock();
250+
var request = UnitTestFixture.CreateRequestMock();
251251
request.AddParameter(new Parameter("email", email, ParameterScope.Parameter));
252252

253253
// act
@@ -269,7 +269,7 @@ public void ValidateEmail(string email)
269269
public void ValidateIsInt(string input)
270270
{
271271
// arrange
272-
var request = UnitTestFixture.CrerateRequestMock();
272+
var request = UnitTestFixture.CreateRequestMock();
273273
request.AddParameter(new Parameter("age", input, ParameterScope.Parameter));
274274

275275
// act
@@ -290,7 +290,7 @@ public void ValidateIsInt(string input)
290290
public void ValidateEqualTo(string input)
291291
{
292292
// arrange
293-
var request = UnitTestFixture.CrerateRequestMock();
293+
var request = UnitTestFixture.CreateRequestMock();
294294
request.AddParameter(new Parameter("role", input, ParameterScope.Parameter));
295295

296296
// act
@@ -310,7 +310,7 @@ public void ValidateEqualTo(string input)
310310
[InlineData("101")]
311311
public void ValidateRange(string input)
312312
{
313-
var request = UnitTestFixture.CrerateRequestMock();
313+
var request = UnitTestFixture.CreateRequestMock();
314314
request.AddParameter(new Parameter("level", input, ParameterScope.Parameter));
315315

316316
var validator = new RestApiValidator(request)
@@ -328,7 +328,7 @@ public void ValidateRange(string input)
328328
[InlineData("xyz-start")]
329329
public void ValidateStartsWith(string input)
330330
{
331-
var request = UnitTestFixture.CrerateRequestMock();
331+
var request = UnitTestFixture.CreateRequestMock();
332332
request.AddParameter(new Parameter("code", input, ParameterScope.Parameter));
333333

334334
var validator = new RestApiValidator(request)
@@ -346,7 +346,7 @@ public void ValidateStartsWith(string input)
346346
[InlineData("document.pdf")]
347347
public void ValidateEndsWith(string input)
348348
{
349-
var request = UnitTestFixture.CrerateRequestMock();
349+
var request = UnitTestFixture.CreateRequestMock();
350350
request.AddParameter(new Parameter("filename", input, ParameterScope.Parameter));
351351

352352
var validator = new RestApiValidator(request)
@@ -364,7 +364,7 @@ public void ValidateEndsWith(string input)
364364
[InlineData("anonymous")]
365365
public void ValidateIn(string input)
366366
{
367-
var request = UnitTestFixture.CrerateRequestMock();
367+
var request = UnitTestFixture.CreateRequestMock();
368368
request.AddParameter(new Parameter("role", input, ParameterScope.Parameter));
369369

370370
var validator = new RestApiValidator(request)
@@ -382,7 +382,7 @@ public void ValidateIn(string input)
382382
[InlineData("foo bar")]
383383
public void ValidateContains(string input)
384384
{
385-
var request = UnitTestFixture.CrerateRequestMock();
385+
var request = UnitTestFixture.CreateRequestMock();
386386
request.AddParameter(new Parameter("description", input, ParameterScope.Parameter));
387387

388388
var validator = new RestApiValidator(request)
@@ -402,7 +402,7 @@ public enum Difficulty { Easy, Medium, Hard }
402402
[InlineData("easy-peasy")]
403403
public void ValidateMatchesEnum(string value)
404404
{
405-
var request = UnitTestFixture.CrerateRequestMock();
405+
var request = UnitTestFixture.CreateRequestMock();
406406
request.AddParameter(new Parameter("difficulty", value, ParameterScope.Parameter));
407407

408408
var validator = new RestApiValidator(request)
@@ -420,7 +420,7 @@ public void ValidateMatchesEnum(string value)
420420
[InlineData("31/31/2020")]
421421
public void ValidateIsDate(string input)
422422
{
423-
var request = UnitTestFixture.CrerateRequestMock();
423+
var request = UnitTestFixture.CreateRequestMock();
424424
request.AddParameter(new Parameter("date", input, ParameterScope.Parameter));
425425

426426
var validator = new RestApiValidator(request)
@@ -439,7 +439,7 @@ public void ValidateIsDate(string input)
439439
[InlineData("nonpirate")]
440440
public void ValidateCustom(string input)
441441
{
442-
var request = UnitTestFixture.CrerateRequestMock();
442+
var request = UnitTestFixture.CreateRequestMock();
443443
request.AddParameter(new Parameter("nickname", input, ParameterScope.Parameter));
444444

445445
var validator = new RestApiValidator(request)
@@ -462,7 +462,7 @@ public void ValidateCustom(string input)
462462
[InlineData("true", "")]
463463
public void ValidateWhen_ConditionalRequire(string subscribe, string email)
464464
{
465-
var request = UnitTestFixture.CrerateRequestMock();
465+
var request = UnitTestFixture.CreateRequestMock();
466466
request.AddParameter(new Parameter("subscribe", subscribe, ParameterScope.Parameter));
467467
request.AddParameter(new Parameter("email", email, ParameterScope.Parameter));
468468

@@ -482,7 +482,7 @@ public void ValidateWhen_ConditionalRequire(string subscribe, string email)
482482
[InlineData(null, "")]
483483
public void ValidateWhen_ConditionFalse(string subscribe, string email)
484484
{
485-
var request = UnitTestFixture.CrerateRequestMock();
485+
var request = UnitTestFixture.CreateRequestMock();
486486
request.AddParameter(new Parameter("subscribe", subscribe, ParameterScope.Parameter));
487487
request.AddParameter(new Parameter("email", email, ParameterScope.Parameter));
488488

‎src/WebExpress.WebCore.Test/Manager/UnitTestSessionManager.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void GetSession()
4545
{
4646
// arrange
4747
var componentHub = UnitTestFixture.CreateAndRegisterComponentHubMock();
48-
var request = UnitTestFixture.CrerateRequestMock();
48+
var request = UnitTestFixture.CreateRequestMock();
4949

5050
// act
5151
var session = componentHub.SessionManager.GetSession(request);
@@ -61,7 +61,7 @@ public void AddPropertyToSession()
6161
{
6262
// arrange
6363
var componentHub = UnitTestFixture.CreateAndRegisterComponentHubMock();
64-
var request = UnitTestFixture.CrerateRequestMock();
64+
var request = UnitTestFixture.CreateRequestMock();
6565
var session = componentHub.SessionManager.GetSession(request);
6666

6767
// act
@@ -83,7 +83,7 @@ public void RemovePropertyFromSession()
8383
{
8484
// arrange
8585
var componentHub = UnitTestFixture.CreateAndRegisterComponentHubMock();
86-
var request = UnitTestFixture.CrerateRequestMock();
86+
var request = UnitTestFixture.CreateRequestMock();
8787
var session = componentHub.SessionManager.GetSession(request);
8888

8989
// act

‎src/WebExpress.WebCore.Test/Manager/UnitTestSitemapManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void SearchResource(string uri, string id)
8080
HttpContext = context
8181
});
8282

83-
componentHub.EndpointManager.HandleRequest(UnitTestFixture.CrerateRequestMock(), searchResult?.EndpointContext);
83+
componentHub.EndpointManager.HandleRequest(UnitTestFixture.CreateRequestMock(), searchResult?.EndpointContext);
8484

8585
// validation
8686
Assert.Equal(id, searchResult?.EndpointContext?.EndpointId.ToString());

‎src/WebExpress.WebCore.Test/Message/UnitTestGetRequest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class UnitTestGetRequest
1515
public void General()
1616
{
1717
var content = UnitTestFixture.GetEmbeddedResource("general.get");
18-
var request = UnitTestFixture.CrerateRequestMock(content);
18+
var request = UnitTestFixture.CreateRequestMock(content);
1919

2020
Assert.Equal("http://localhost:8080/abc/xyz/A7BCCCA9-4C7E-4117-9EE2-ECC3381B605A", request.Uri?.ToString());
2121
}
@@ -27,7 +27,7 @@ public void General()
2727
public void Less()
2828
{
2929
var content = UnitTestFixture.GetEmbeddedResource("less.get");
30-
var request = UnitTestFixture.CrerateRequestMock(content);
30+
var request = UnitTestFixture.CreateRequestMock(content);
3131

3232
Assert.Equal("http://localhost:8080/abc/xyz/A7BCCCA9-4C7E-4117-9EE2-ECC3381B605A", request.Uri?.ToString());
3333
}
@@ -39,7 +39,7 @@ public void Less()
3939
public void Massive()
4040
{
4141
var content = UnitTestFixture.GetEmbeddedResource("massive.get");
42-
var request = UnitTestFixture.CrerateRequestMock(content);
42+
var request = UnitTestFixture.CreateRequestMock(content);
4343

4444
Assert.Equal("http://localhost:8080/abc/xyz/A7BCCCA9-4C7E-4117-9EE2-ECC3381B605A", request.Uri?.ToString());
4545
}
@@ -51,7 +51,7 @@ public void Massive()
5151
public void GetParameter()
5252
{
5353
var content = UnitTestFixture.GetEmbeddedResource("param.get");
54-
var request = UnitTestFixture.CrerateRequestMock(content);
54+
var request = UnitTestFixture.CreateRequestMock(content);
5555
var param = request?.GetParameter("a")?.Value;
5656

5757
Assert.Equal("http://localhost:8080/abc/xyz/A7BCCCA9-4C7E-4117-9EE2-ECC3381B605A", request.Uri?.ToString());
@@ -65,7 +65,7 @@ public void GetParameter()
6565
public void GetParameterWithUmlaut()
6666
{
6767
var content = UnitTestFixture.GetEmbeddedResource("param_umlaut.get");
68-
var request = UnitTestFixture.CrerateRequestMock(content);
68+
var request = UnitTestFixture.CreateRequestMock(content);
6969
var a = request?.GetParameter("a")?.Value;
7070
var b = request?.GetParameter("b")?.Value;
7171

‎src/WebExpress.WebCore/WebAsset/Asset.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using System.Reflection;
43
using WebExpress.WebCore.Internationalization;
54
using WebExpress.WebCore.WebComponent;
@@ -46,7 +45,7 @@ public Asset(IComponentHub componentHub, IAssetContext assetContext, IHttpServer
4645
/// </summary>
4746
/// <param name="request">The request.</param>
4847
/// <returns>The response.</returns>
49-
public Response Process(IRequest request)
48+
public IResponse Process(IRequest request)
5049
{
5150
if (_data is null)
5251
{
@@ -157,8 +156,6 @@ private byte[] GetData(Assembly assembly)
157156
public void Dispose()
158157
{
159158
_data = null;
160-
161-
GC.SuppressFinalize(this);
162159
}
163160
}
164161
}

‎src/WebExpress.WebCore/WebAsset/IAsset.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public interface IAsset : IEndpoint
1313
/// </summary>
1414
/// <param name="request">The request.</param>
1515
/// <returns>The response.</returns>
16-
Response Process(IRequest request);
16+
IResponse Process(IRequest request);
1717
}
1818
}

0 commit comments

Comments
 (0)