Skip to content

Commit 5b402cf

Browse files
author
imranazad
committed
Fix Tests
1 parent b18d06d commit 5b402cf

5 files changed

Lines changed: 21 additions & 21 deletions

‎Comments.Test/IntegrationTests/API/Answers/DeleteAnswerUsingOrganisationSessionCookieTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ public async Task Delete_Comment_with_valid_organisation_session_cookie_deletes_
2828
//Arrange
2929
var context = new ConsultationsContext(GetContextOptions(), FakeUserService.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: OrganisationUserId), new FakeEncryption());
3030
context.Database.EnsureDeleted();
31+
var (server, client) = InitialiseServerAndClient(context);
3132

3233
var sourceURI = $"consultations://./consultation/{ConsultationId}/document/1/chapter/introduction";
3334

34-
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, null, "123412341234");
35+
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, "NotAuthorised", "123412341234");
3536
TestBaseDBHelpers.AddOrganisationUser(context, organisationAuthorisationId, SessionId, null, OrganisationUserId);
3637

3738
var locationId = TestBaseDBHelpers.AddLocation(context, sourceURI);
3839
var questionId = TestBaseDBHelpers.AddQuestion(context, locationId);
3940
var existingAnswerId = TestBaseDBHelpers.AddAnswer(context, questionId, statusId: StatusId, organisationUserId: OrganisationUserId);
40-
var (server, client) = InitialiseServerAndClient(context);
4141

4242
var updatedAnswerText = Guid.NewGuid().ToString();
4343
var updatedAnswer = new ViewModels.Answer(existingAnswerId, updatedAnswerText, false, DateTime.UtcNow, "Carl Spackler", questionId, StatusId);
@@ -64,16 +64,16 @@ public async Task Delete_Comment_with_invalid_organisation_session_cookie_return
6464
//Arrange
6565
var context = new ConsultationsContext(GetContextOptions(), FakeUserService.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: OrganisationUserId), new FakeEncryption());
6666
context.Database.EnsureDeleted();
67+
var (server, client) = InitialiseServerAndClient(context);
6768

6869
var sourceURI = $"consultations://./consultation/{ConsultationId}/document/1/chapter/introduction";
6970

70-
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, null, "123412341234");
71+
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, "NotAuthorised", "123412341234");
7172
TestBaseDBHelpers.AddOrganisationUser(context, organisationAuthorisationId, SessionId, null, OrganisationUserId);
7273

7374
var locationId = TestBaseDBHelpers.AddLocation(context, sourceURI);
7475
var questionId = TestBaseDBHelpers.AddQuestion(context, locationId);
7576
var existingAnswerId = TestBaseDBHelpers.AddAnswer(context, questionId, statusId: StatusId, organisationUserId: OrganisationUserId);
76-
var (server, client) = InitialiseServerAndClient(context);
7777

7878
var updatedAnswerText = Guid.NewGuid().ToString();
7979
var updatedAnswer = new ViewModels.Answer(existingAnswerId, updatedAnswerText, false, DateTime.UtcNow, "Carl Spackler", questionId, StatusId);
@@ -98,16 +98,16 @@ public async Task Delete_Comment_with_invalid_consultation_id_in_organisation_se
9898
//Arrange
9999
var context = new ConsultationsContext(GetContextOptions(), FakeUserService.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: OrganisationUserId), new FakeEncryption());
100100
context.Database.EnsureDeleted();
101+
var (server, client) = InitialiseServerAndClient(context);
101102

102103
var sourceURI = $"consultations://./consultation/{ConsultationId}/document/1/chapter/introduction";
103104

104-
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, null, "123412341234");
105+
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, "NotAuthorised", "123412341234");
105106
TestBaseDBHelpers.AddOrganisationUser(context, organisationAuthorisationId, SessionId, null, OrganisationUserId);
106107

107108
var locationId = TestBaseDBHelpers.AddLocation(context, sourceURI);
108109
var questionId = TestBaseDBHelpers.AddQuestion(context, locationId);
109110
var existingAnswerId = TestBaseDBHelpers.AddAnswer(context, questionId, statusId: StatusId, organisationUserId: OrganisationUserId);
110-
var (server, client) = InitialiseServerAndClient(context);
111111

112112
var updatedAnswerText = Guid.NewGuid().ToString();
113113
var updatedAnswer = new ViewModels.Answer(existingAnswerId, updatedAnswerText, false, DateTime.UtcNow, "Carl Spackler", questionId, StatusId);

‎Comments.Test/IntegrationTests/API/Answers/EditAnswerUsingOrganisationSessionCookieTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ public EditAnswerUsingOrganisationSessionCookieTests()
3535

3636
context = new ConsultationsContext(GetContextOptions(), FakeUserService.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: organisationUserId), new FakeEncryption());
3737
context.Database.EnsureDeleted();
38+
(_server, _) = InitialiseServerAndClient(context);
3839

3940
var sourceURI = $"consultations://./consultation/{ConsultationId}/document/1/chapter/introduction";
4041

41-
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, null, "123412341234");
42+
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, "UserName", "123412341234");
4243
TestBaseDBHelpers.AddOrganisationUser(context, organisationAuthorisationId, _sessionId, null, organisationUserId);
4344

4445
var locationId = TestBaseDBHelpers.AddLocation(context, sourceURI);
4546
_questionId = TestBaseDBHelpers.AddQuestion(context, locationId);
4647
_existingAnswerId = TestBaseDBHelpers.AddAnswer(context, _questionId, statusId: StatusId, organisationUserId: organisationUserId);
47-
(_server, _) = InitialiseServerAndClient(context);
48+
4849
}
4950

5051
[Fact]

‎Comments.Test/IntegrationTests/API/Comments/DeleteCommentUsingOrganisationSessionCookieTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,16 @@ public DeleteCommentUsingOrganisationSessionCookieTests()
2828
const int organisationUserId = 1;
2929
var context = new ConsultationsContext(GetContextOptions(), FakeUserService.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: organisationUserId), new FakeEncryption());
3030
context.Database.EnsureDeleted();
31+
(_server, _) = InitialiseServerAndClient(context);
3132

3233
var sourceURI = $"consultations://./consultation/{ConsultationId}/document/1/chapter/introduction";
3334

34-
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, null, "123412341234");
35+
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, ConsultationId, context, "UserName", "123412341234");
3536
TestBaseDBHelpers.AddOrganisationUser(context, organisationAuthorisationId, _sessionId, null, organisationUserId);
3637

3738
var locationId = TestBaseDBHelpers.AddLocation(context, sourceURI);
3839
var commentId = TestBaseDBHelpers.AddComment(context, locationId, "comment text", createdByUserId: null, organisationUserId: organisationUserId);
3940

40-
(_server, _) = InitialiseServerAndClient(context);
41-
4241
_comment = new ViewModels.Comment(locationId, sourceURI, null, null, null, null, null, null, null, 0,
4342
DateTime.Now, Guid.Empty.ToString(), "comment text", 1, show: true, sectionHeader: null, sectionNumber: null)
4443
{ CommentId = commentId };

‎Comments.Test/IntegrationTests/API/Comments/EditCommentUsingOrganisationSessionCookieTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,16 @@ public EditCommentUsingOrganisationSessionCookieTests()
2929
const int organisationUserId = 1;
3030
var context = new ConsultationsContext(GetContextOptions(), FakeUserService.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: organisationUserId), new FakeEncryption());
3131
context.Database.EnsureDeleted();
32+
(_server, _client) = InitialiseServerAndClient(context);
3233

3334
var sourceURI = $"consultations://./consultation/{consultationId}/document/1/chapter/introduction";
3435

35-
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, consultationId, context, null, "123412341234");
36+
var organisationAuthorisationId = TestBaseDBHelpers.AddOrganisationAuthorisationWithLocation(1, consultationId, context, "UserName", "123412341234");
3637
TestBaseDBHelpers.AddOrganisationUser(context, organisationAuthorisationId, _sessionId, null);
3738

3839
var locationId = TestBaseDBHelpers.AddLocation(context, sourceURI);
3940
var commentId = TestBaseDBHelpers.AddComment(context, locationId, "comment text", createdByUserId: null, organisationUserId: organisationUserId);
4041

41-
(_server, _client) = InitialiseServerAndClient(context);
42-
4342
comment = new ViewModels.Comment(1, sourceURI, null, null, null, null, null, null, null, 0,
4443
DateTime.Now, Guid.Empty.ToString(), "comment text", 1, show: true, sectionHeader: null, sectionNumber: null)
4544
{ CommentId = commentId };

‎Comments.Test/IntegrationTests/API/Submit/SubmitTests.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ public async Task Submit_Comments_To_Organisation_Lead()
7474
var context = new ConsultationsContext(GetContextOptions(),
7575
FakeUserService.Get(isAuthenticated: false, displayName: "Carl Spackler", userId: "Carl", testUserType: TestUserType.NotAuthenticated, organisationIdUserIsLeadOf: organisationId, organisationUserId: organisationUserId), fakeEncryption);
7676
context.Database.EnsureDeleted();
77+
var fakeHttpContextAccessor = FakeHttpContextAccessor.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: organisationUserId);
78+
var fakeConsultationService = new FakeConsultationService();
79+
var userService = FakeUserService.Get(true, "Benjamin Button", null, TestUserType.NotAuthenticated, false, organisationUserId);
80+
var commentService = new CommentService(context, userService, fakeConsultationService, fakeHttpContextAccessor);
81+
82+
var (_server, _client) = InitialiseServerAndClient(context, userService, fakeConsultationService);
7783

7884
var sourceURI = "consultations://./consultation/1/document/1/chapter/introduction";
7985
var consultationId = 1;
@@ -86,23 +92,18 @@ public async Task Submit_Comments_To_Organisation_Lead()
8692
TestBaseDBHelpers.AddOrganisationUser(context, organisationAuthorisationId, authorisationSession, null, organisationUserId: organisationUserId);
8793
TestBaseDBHelpers.AddStatus(context, nameof(StatusName.SubmittedToLead), (int)StatusName.SubmittedToLead);
8894

89-
var userService = FakeUserService.Get(true, "Benjamin Button", userId:"BB", TestUserType.NotAuthenticated, false, organisationUserId);
90-
91-
var fakeHttpContextAccessor = FakeHttpContextAccessor.Get(isAuthenticated: false, testUserType: TestUserType.NotAuthenticated, organisationUserId: organisationUserId);
92-
var fakeConsultationService = new FakeConsultationService();
93-
var commentService = new CommentService(context, userService, fakeConsultationService, fakeHttpContextAccessor);
95+
9496

9597
var locationId = TestBaseDBHelpers.AddLocation(context, sourceURI);
9698
var questionId = TestBaseDBHelpers.AddQuestion(context, locationId);
97-
TestBaseDBHelpers.AddComment(context, locationId, commentText, "null", (int)StatusName.Draft, organisationUserId, null, organisationId);
99+
TestBaseDBHelpers.AddComment(context, locationId, commentText, null, (int)StatusName.Draft, organisationUserId, null, organisationId);
98100
TestBaseDBHelpers.AddAnswer(context, questionId, organisationUserId: organisationUserId);
99101

100102
var commentsAndQuestions = await commentService.GetCommentsAndQuestions(sourceURI, new FakeUrlHelper());
101103

102104
var submissionToLead = new SubmissionToLead(commentsAndQuestions.Comments, commentsAndQuestions.Questions.First().Answers, emailAddress, true, "Organisation");
103105
var content = new StringContent(JsonConvert.SerializeObject(submissionToLead), Encoding.UTF8, "application/json");
104106

105-
var (_server, _client) = InitialiseServerAndClient(context, userService, fakeConsultationService);
106107

107108
//Act
108109
var response = await _client.PostAsync($"consultations/api/SubmitToLead", content);

0 commit comments

Comments
 (0)