Skip to content

Commit bd576b9

Browse files
imnasnainaecimnasnainaec
authored
Clean up C# styles (#4177)
1 parent 5ebd071 commit bd576b9

13 files changed

+382
-209
lines changed

‎Backend.Tests/Controllers/EmailVerifyControllerTests.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void Setup()
3030
_permissionService = new PermissionServiceMock();
3131
_emailVerifyController = new EmailVerifyController(userRepo, _emailVerifyService, _permissionService);
3232

33-
userRepo.Create(new() { Email = Email });
33+
userRepo.Create(new() { Email = Email }).Wait();
3434
}
3535

3636
[Test]
@@ -53,16 +53,17 @@ public void TestRequestEmailVerifyNoPermission()
5353
public void TestRequestEmailVerifyFalse()
5454
{
5555
_emailVerifyService.SetNextBoolResponse(false);
56-
var result = _emailVerifyController.RequestEmailVerify(Email).Result;
57-
Assert.That(((StatusCodeResult)result).StatusCode, Is.EqualTo(StatusCodes.Status500InternalServerError));
56+
var result = _emailVerifyController.RequestEmailVerify(Email).Result as StatusCodeResult;
57+
Assert.That(result, Is.Not.Null);
58+
Assert.That(result.StatusCode, Is.EqualTo(StatusCodes.Status500InternalServerError));
5859
}
5960

6061
[Test]
6162
public void TestRequestEmailVerifyTrue()
6263
{
6364
_emailVerifyService.SetNextBoolResponse(true);
6465
var result = _emailVerifyController.RequestEmailVerify(Email).Result;
65-
Assert.That(result, Is.TypeOf<OkResult>());
66+
Assert.That(result, Is.InstanceOf<OkResult>());
6667
}
6768

6869
[Test]
@@ -72,9 +73,9 @@ public void TestValidateResetTokenFalse()
7273
_emailVerifyController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
7374

7475
_emailVerifyService.SetNextBoolResponse(false);
75-
var result = _emailVerifyController.ValidateEmailToken("token").Result;
76-
Assert.That(result, Is.TypeOf<OkObjectResult>());
77-
Assert.That(((OkObjectResult)result).Value, Is.EqualTo(false));
76+
var result = _emailVerifyController.ValidateEmailToken("token").Result as OkObjectResult;
77+
Assert.That(result, Is.Not.Null);
78+
Assert.That(result.Value, Is.EqualTo(false));
7879
}
7980

8081
[Test]
@@ -84,9 +85,9 @@ public void TestValidateResetTokenTrue()
8485
_emailVerifyController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
8586

8687
_emailVerifyService.SetNextBoolResponse(true);
87-
var result = _emailVerifyController.ValidateEmailToken("token").Result;
88-
Assert.That(result, Is.TypeOf<OkObjectResult>());
89-
Assert.That(((OkObjectResult)result).Value, Is.EqualTo(true));
88+
var result = _emailVerifyController.ValidateEmailToken("token").Result as OkObjectResult;
89+
Assert.That(result, Is.Not.Null);
90+
Assert.That(result.Value, Is.EqualTo(true));
9091
}
9192
}
9293
}

‎Backend.Tests/Controllers/PasswordResetControllerTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ public void TestResetPassword()
3333

3434
_passwordResetService.SetNextBoolResponse(false);
3535
var falseResult = _passwordResetController.ResetPassword(new()).Result;
36-
Assert.That(falseResult, Is.TypeOf<ForbidResult>());
36+
Assert.That(falseResult, Is.InstanceOf<ForbidResult>());
3737

3838
_passwordResetService.SetNextBoolResponse(true);
3939
var trueResult = _passwordResetController.ResetPassword(new()).Result;
40-
Assert.That(trueResult, Is.TypeOf<OkResult>());
40+
Assert.That(trueResult, Is.InstanceOf<OkResult>());
4141
}
4242

4343
[Test]
@@ -47,13 +47,13 @@ public void TestResetPasswordRequest()
4747
_passwordResetController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
4848

4949
_passwordResetService.SetNextBoolResponse(false);
50-
var falseResult = _passwordResetController.ResetPasswordRequest("username").Result;
51-
Assert.That(((StatusCodeResult)falseResult).StatusCode,
52-
Is.EqualTo(StatusCodes.Status500InternalServerError));
50+
var falseResult = _passwordResetController.ResetPasswordRequest("username").Result as StatusCodeResult;
51+
Assert.That(falseResult, Is.Not.Null);
52+
Assert.That(falseResult.StatusCode, Is.EqualTo(StatusCodes.Status500InternalServerError));
5353

5454
_passwordResetService.SetNextBoolResponse(true);
5555
var trueResult = _passwordResetController.ResetPasswordRequest("username").Result;
56-
Assert.That(trueResult, Is.TypeOf<OkResult>());
56+
Assert.That(trueResult, Is.InstanceOf<OkResult>());
5757
}
5858

5959
[Test]
@@ -63,14 +63,14 @@ public void TestValidateResetToken()
6363
_passwordResetController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
6464

6565
_passwordResetService.SetNextBoolResponse(false);
66-
var falseResult = _passwordResetController.ValidateResetToken("token").Result;
67-
Assert.That(falseResult, Is.TypeOf<OkObjectResult>());
68-
Assert.That(((OkObjectResult)falseResult).Value, Is.EqualTo(false));
66+
var falseResult = _passwordResetController.ValidateResetToken("token").Result as OkObjectResult;
67+
Assert.That(falseResult, Is.Not.Null);
68+
Assert.That(falseResult.Value, Is.EqualTo(false));
6969

7070
_passwordResetService.SetNextBoolResponse(true);
71-
var trueResult = _passwordResetController.ValidateResetToken("token").Result;
72-
Assert.That(trueResult, Is.TypeOf<OkObjectResult>());
73-
Assert.That(((OkObjectResult)trueResult).Value, Is.EqualTo(true));
71+
var trueResult = _passwordResetController.ValidateResetToken("token").Result as OkObjectResult;
72+
Assert.That(trueResult, Is.Not.Null);
73+
Assert.That(trueResult.Value, Is.EqualTo(true));
7474
}
7575
}
7676
}

‎Backend.Tests/Controllers/ProjectControllerTests.cs‎

Lines changed: 52 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public void TestGetAllProjectsUnauthorized()
4444
[Test]
4545
public void TestGetAllProjects()
4646
{
47-
_projRepo.Create(Util.RandomProject());
48-
_projRepo.Create(Util.RandomProject());
49-
_projRepo.Create(Util.RandomProject());
47+
_projRepo.Create(Util.RandomProject()).Wait();
48+
_projRepo.Create(Util.RandomProject()).Wait();
49+
_projRepo.Create(Util.RandomProject()).Wait();
5050

5151
var projects = ((ObjectResult)_projController.GetAllProjects().Result).Value as List<Project>;
5252
Assert.That(projects, Has.Count.EqualTo(3));
@@ -79,7 +79,9 @@ public void TestGetProjectUnauthorized()
7979
{
8080
_projController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
8181
var project = _projRepo.Create(Util.RandomProject()).Result;
82-
var result = _projController.GetProject(project!.Id).Result;
82+
Assert.That(project, Is.Not.Null);
83+
84+
var result = _projController.GetProject(project.Id).Result;
8385
Assert.That(result, Is.InstanceOf<ForbidResult>());
8486
}
8587

@@ -94,11 +96,11 @@ public void TestGetProjectNoProject()
9496
public void TestGetProject()
9597
{
9698
var project = _projRepo.Create(Util.RandomProject()).Result;
99+
Assert.That(project, Is.Not.Null);
100+
_projRepo.Create(Util.RandomProject()).Wait();
101+
_projRepo.Create(Util.RandomProject()).Wait();
97102

98-
_projRepo.Create(Util.RandomProject());
99-
_projRepo.Create(Util.RandomProject());
100-
101-
var result = _projController.GetProject(project!.Id).Result;
103+
var result = _projController.GetProject(project.Id).Result;
102104
Assert.That(result, Is.InstanceOf<ObjectResult>());
103105
Assert.That(((ObjectResult)result).Value, Is.EqualTo(project).UsingPropertiesComparer());
104106
}
@@ -107,6 +109,7 @@ public void TestGetProject()
107109
public void TestCreateProjectUnauthorized()
108110
{
109111
_projController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
112+
110113
var result = _projController.CreateProject(new()).Result;
111114
Assert.That(result, Is.InstanceOf<ForbidResult>());
112115
}
@@ -115,7 +118,11 @@ public void TestCreateProjectUnauthorized()
115118
public void TestCreateProject()
116119
{
117120
var project = Util.RandomProject();
118-
var userProject = (UserCreatedProject)((ObjectResult)_projController.CreateProject(project).Result).Value!;
121+
122+
var result = _projController.CreateProject(project).Result as OkObjectResult;
123+
Assert.That(result, Is.Not.Null);
124+
var userProject = result.Value as UserCreatedProject;
125+
Assert.That(userProject, Is.Not.Null);
119126
project.Id = userProject.Project.Id;
120127
Assert.That(_projRepo.GetAllProjects().Result, Does.Contain(project).UsingPropertiesComparer());
121128
}
@@ -124,6 +131,7 @@ public void TestCreateProject()
124131
public void TestUpdateProjectUnauthorized()
125132
{
126133
_projController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
134+
127135
var result = _projController.UpdateProject("any-project", new()).Result;
128136
Assert.That(result, Is.InstanceOf<ForbidResult>());
129137
}
@@ -132,10 +140,11 @@ public void TestUpdateProjectUnauthorized()
132140
public void TestUpdateProject()
133141
{
134142
var origProject = _projRepo.Create(Util.RandomProject()).Result;
135-
var modProject = origProject!.Clone();
143+
Assert.That(origProject, Is.Not.Null);
144+
var modProject = origProject.Clone();
136145
modProject.Name = "Mark";
137146

138-
_ = _projController.UpdateProject(modProject.Id, modProject);
147+
_projController.UpdateProject(modProject.Id, modProject).Wait();
139148
Assert.That(_projRepo.GetAllProjects().Result, Has.Count.EqualTo(1));
140149
Assert.That(_projRepo.GetAllProjects().Result, Does.Contain(modProject).UsingPropertiesComparer());
141150
}
@@ -144,6 +153,7 @@ public void TestUpdateProject()
144153
public void TestPutCharsUnauthorized()
145154
{
146155
_projController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
156+
147157
var result = _projController.PutChars("any-project", new()).Result;
148158
Assert.That(result, Is.InstanceOf<ForbidResult>());
149159
}
@@ -158,7 +168,9 @@ public void TestPutCharsNoProject()
158168
[Test]
159169
public void TestPutCharsNoChange()
160170
{
161-
var proj = _projRepo.Create(Util.RandomProject()).Result!;
171+
var proj = _projRepo.Create(Util.RandomProject()).Result;
172+
Assert.That(proj, Is.Not.Null);
173+
162174
var result = _projController.PutChars(proj.Id, proj).Result;
163175
Assert.That(result, Is.InstanceOf<OkObjectResult>());
164176
}
@@ -167,35 +179,39 @@ public void TestPutCharsNoChange()
167179
public void TestPutCharsOnlyChangesChars()
168180
{
169181
// Setup
170-
var oldProj = _projRepo.Create(Util.RandomProject()).Result!;
182+
var oldProj = _projRepo.Create(Util.RandomProject()).Result;
183+
Assert.That(oldProj, Is.Not.Null);
171184
var newProj = Util.RandomProject();
172-
Assert.That(newProj.Id, Is.Not.EqualTo((oldProj.Id)));
173-
Assert.That(newProj.Name, Is.Not.EqualTo((oldProj.Name)));
185+
Assert.That(newProj.Id, Is.Not.EqualTo(oldProj.Id));
186+
Assert.That(newProj.Name, Is.Not.EqualTo(oldProj.Name));
174187
newProj.RejectedCharacters = ["!", "?"];
175188
newProj.ValidCharacters = ["a", "b", "c"];
176189

177190
// Verify returned project
178-
var result = _projController.PutChars(oldProj.Id, newProj).Result;
179-
Assert.That(result, Is.InstanceOf<OkObjectResult>());
180-
var resultProj = (Project)((OkObjectResult)result).Value!;
191+
var result = _projController.PutChars(oldProj.Id, newProj).Result as OkObjectResult;
192+
Assert.That(result, Is.Not.Null);
193+
var resultProj = result.Value as Project;
194+
Assert.That(resultProj, Is.Not.Null);
181195
Assert.That(resultProj.Id, Is.EqualTo(oldProj.Id));
182196
Assert.That(resultProj.Name, Is.EqualTo(oldProj.Name));
183-
Assert.That(resultProj.RejectedCharacters, Has.Count.EqualTo((2)));
184-
Assert.That(resultProj.ValidCharacters, Has.Count.EqualTo((3)));
197+
Assert.That(resultProj.RejectedCharacters, Has.Count.EqualTo(2));
198+
Assert.That(resultProj.ValidCharacters, Has.Count.EqualTo(3));
185199

186200
// Verify project in repo
187201
Assert.That(_projRepo.GetProject(newProj.Id).Result, Is.Null);
188-
var updatedProj = _projRepo.GetProject(oldProj.Id).Result!;
202+
var updatedProj = _projRepo.GetProject(oldProj.Id).Result;
203+
Assert.That(updatedProj, Is.Not.Null);
189204
Assert.That(updatedProj.Id, Is.EqualTo(oldProj.Id));
190205
Assert.That(updatedProj.Name, Is.EqualTo(oldProj.Name));
191-
Assert.That(updatedProj.RejectedCharacters, Has.Count.EqualTo((2)));
192-
Assert.That(updatedProj.ValidCharacters, Has.Count.EqualTo((3)));
206+
Assert.That(updatedProj.RejectedCharacters, Has.Count.EqualTo(2));
207+
Assert.That(updatedProj.ValidCharacters, Has.Count.EqualTo(3));
193208
}
194209

195210
[Test]
196211
public void TestDeleteProjectUnauthorized()
197212
{
198213
_projController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
214+
199215
var result = _projController.DeleteProject("any-project").Result;
200216
Assert.That(result, Is.InstanceOf<ForbidResult>());
201217
}
@@ -218,16 +234,18 @@ public void TestDeleteProjectNoProject()
218234
public void TestDeleteProject()
219235
{
220236
var origProject = _projRepo.Create(Util.RandomProject()).Result;
237+
Assert.That(origProject, Is.Not.Null);
221238
Assert.That(_projRepo.GetAllProjects().Result, Has.Count.EqualTo(1));
222239

223-
_ = _projController.DeleteProject(origProject!.Id).Result;
240+
_projController.DeleteProject(origProject.Id).Wait();
224241
Assert.That(_projRepo.GetAllProjects().Result, Has.Count.EqualTo(0));
225242
}
226243

227244
[Test]
228245
public void TestProjectDuplicateCheckUnauthorized()
229246
{
230247
_projController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
248+
231249
var result = _projController.ProjectDuplicateCheck("any-project").Result;
232250
Assert.That(result, Is.InstanceOf<ForbidResult>());
233251
}
@@ -236,14 +254,18 @@ public void TestProjectDuplicateCheckUnauthorized()
236254
public void TestProjectDuplicateCheck()
237255
{
238256
var project1 = _projRepo.Create(Util.RandomProject()).Result;
239-
_ = _projRepo.Create(Util.RandomProject()).Result;
240-
_ = _projRepo.Create(Util.RandomProject()).Result;
241-
var modProject = project1!.Clone();
257+
Assert.That(project1, Is.Not.Null);
258+
_projRepo.Create(Util.RandomProject()).Wait();
259+
_projRepo.Create(Util.RandomProject()).Wait();
260+
var modProject = project1.Clone();
242261
modProject.Name = "Proj";
243-
_ = _projController.UpdateProject(modProject.Id, modProject);
244-
var isOldProjDupResult = (ObjectResult)_projController.ProjectDuplicateCheck("Proj").Result;
262+
_projController.UpdateProject(modProject.Id, modProject).Wait();
263+
264+
var isOldProjDupResult = _projController.ProjectDuplicateCheck("Proj").Result as OkObjectResult;
265+
Assert.That(isOldProjDupResult, Is.Not.Null);
245266
Assert.That(isOldProjDupResult.Value, Is.True);
246-
var isNewProjDupResult = (ObjectResult)_projController.ProjectDuplicateCheck("NewProj").Result;
267+
var isNewProjDupResult = _projController.ProjectDuplicateCheck("NewProj").Result as OkObjectResult;
268+
Assert.That(isNewProjDupResult, Is.Not.Null);
247269
Assert.That(isNewProjDupResult.Value, Is.False);
248270
}
249271
}

0 commit comments

Comments
 (0)