diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/OrganizationTestHelpers.cs b/test/Infrastructure.IntegrationTest/AdminConsole/OrganizationTestHelpers.cs index ac918fd453c1..bf53b1d98687 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/OrganizationTestHelpers.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/OrganizationTestHelpers.cs @@ -4,7 +4,7 @@ using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Repositories; - +using Bit.Core.Utilities; namespace Bit.Infrastructure.IntegrationTest.AdminConsole; /// @@ -16,7 +16,7 @@ public static class OrganizationTestHelpers { public static Task CreateTestUserAsync(this IUserRepository userRepository, string identifier = "test") { - var id = Guid.NewGuid(); + var id = CoreHelpers.GenerateComb(); return userRepository.CreateAsync(new User { Id = id, @@ -34,7 +34,7 @@ public static Task CreateTestOrganizationAsync(this IOrganizationR int? seatCount = null, string identifier = "test") { - var id = Guid.NewGuid(); + var id = CoreHelpers.GenerateComb(); return organizationRepository.CreateAsync(new Organization { Name = $"{identifier}-{id}", diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryCreateTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryCreateTests.cs index 8a51f201dc73..958b2614ec52 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryCreateTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryCreateTests.cs @@ -61,13 +61,6 @@ await collectionRepository.CreateAsync(collection, Assert.Equal(2, users.Length); Assert.Single(users, u => u.Id == orgUser1.Id && u.Manage && !u.HidePasswords && u.ReadOnly); Assert.Single(users, u => u.Id == orgUser2.Id && !u.Manage && u.HidePasswords && !u.ReadOnly); - - // Clean up data - await userRepository.DeleteAsync(user1); - await userRepository.DeleteAsync(user2); - await organizationRepository.DeleteAsync(organization); - await groupRepository.DeleteManyAsync([group1.Id, group2.Id]); - await organizationUserRepository.DeleteManyAsync([orgUser1.Id, orgUser2.Id]); } /// @@ -98,8 +91,5 @@ public async Task CreateAsync_WithNoAccess_Works( Assert.Empty(actualAccess.Groups); Assert.Empty(actualAccess.Users); - - // Clean up - await organizationRepository.DeleteAsync(organization); } } diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryReplaceTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryReplaceTests.cs index 2f9931077ffb..6988f6ec6fc8 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryReplaceTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryReplaceTests.cs @@ -87,12 +87,6 @@ await collectionRepository.ReplaceAsync(collection, Assert.Equal(2, users.Length); Assert.Single(users, u => u.Id == orgUser2.Id && !u.Manage && !u.HidePasswords && u.ReadOnly); Assert.Single(users, u => u.Id == orgUser3.Id && u.Manage && !u.HidePasswords && u.ReadOnly); - - // Clean up data - await userRepository.DeleteAsync(user1); - await userRepository.DeleteAsync(user2); - await userRepository.DeleteAsync(user3); - await organizationRepository.DeleteAsync(organization); } /// @@ -141,10 +135,6 @@ await collectionRepository.CreateAsync(collection, Assert.Empty(actualAccess.Groups); Assert.Empty(actualAccess.Users); - - // Clean up - await userRepository.DeleteAsync(user); - await organizationRepository.DeleteAsync(organization); } [Theory, DatabaseData] @@ -205,10 +195,5 @@ await collectionRepository.CreateAsync(collection, Assert.Equal(2, users.Length); Assert.Single(users, u => u.Id == orgUser1.Id && u.Manage && !u.HidePasswords && u.ReadOnly); Assert.Single(users, u => u.Id == orgUser2.Id && !u.Manage && u.HidePasswords && !u.ReadOnly); - - // Clean up data - await userRepository.DeleteAsync(user1); - await userRepository.DeleteAsync(user2); - await organizationRepository.DeleteAsync(organization); } } diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CreateDefaultCollectionsSharedTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CreateDefaultCollectionsSharedTests.cs index 0fb4a5b446e1..5e68bad1efbd 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CreateDefaultCollectionsSharedTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CreateDefaultCollectionsSharedTests.cs @@ -35,8 +35,6 @@ public static async Task CreatesDefaultCollections_Success( // Assert await AssertAllUsersHaveOneDefaultCollectionAsync(collectionRepository, resultOrganizationUsers, organization.Id); - - await CleanupAsync(organizationRepository, userRepository, organization, resultOrganizationUsers); } public static async Task CreatesForNewUsersOnly_AndIgnoresExistingUsers( @@ -72,8 +70,6 @@ await CreateUserForOrgAsync(userRepository, organizationUserRepository, organiza // Assert await AssertAllUsersHaveOneDefaultCollectionAsync(collectionRepository, affectedOrgUsers, organization.Id); - - await CleanupAsync(organizationRepository, userRepository, organization, affectedOrgUsers); } public static async Task IgnoresAllExistingUsers( @@ -101,8 +97,6 @@ public static async Task IgnoresAllExistingUsers( // Assert - Original collections should remain unchanged, still only one per user await AssertAllUsersHaveOneDefaultCollectionAsync(collectionRepository, resultOrganizationUsers, organization.Id); - - await CleanupAsync(organizationRepository, userRepository, organization, resultOrganizationUsers); } private static async Task CreateUsersWithExistingDefaultCollectionsAsync( @@ -141,18 +135,4 @@ private static async Task CreateUserForOrgAsync(IUserRepositor return orgUser; } - - private static async Task CleanupAsync(IOrganizationRepository organizationRepository, - IUserRepository userRepository, - Organization organization, - IEnumerable organizationUsers) - { - await organizationRepository.DeleteAsync(organization); - - await userRepository.DeleteManyAsync( - organizationUsers - .Where(organizationUser => organizationUser.UserId != null) - .Select(organizationUser => new User() { Id = organizationUser.UserId.Value }) - ); - } } diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationRepositoryTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationRepositoryTests.cs index 9734fa440239..f0a9138dde59 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationRepositoryTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationRepositoryTests.cs @@ -36,10 +36,6 @@ public async Task GetManyByIdsAsync_ExistingOrganizations_ReturnsOrganizations(I Assert.Equal(2, result.Count); Assert.Contains(result, org => org.Id == organization1.Id); Assert.Contains(result, org => org.Id == organization2.Id); - - // Clean up - await organizationRepository.DeleteAsync(organization1); - await organizationRepository.DeleteAsync(organization2); } [Theory, DatabaseData] @@ -212,9 +208,6 @@ public async Task IncrementSeatCountAsync_GivenOrganizationHasNotChangedSeatCoun Assert.Equal(organization.Id, updateResult.Id); Assert.True(updateResult.SyncSeats); Assert.Equal(requestDate.ToString("yyyy-MM-dd HH:mm:ss"), updateResult.RevisionDate.ToString("yyyy-MM-dd HH:mm:ss")); - - // Annul - await sutRepository.DeleteAsync(organization); } [DatabaseData, Theory] @@ -237,9 +230,6 @@ public async Task IncrementSeatCountAsync_GivenOrganizationHasChangedSeatCountBe Assert.Equal(organization.Id, updateResult.Id); Assert.True(updateResult.SyncSeats); Assert.Equal(requestDate.ToString("yyyy-MM-dd HH:mm:ss"), updateResult.RevisionDate.ToString("yyyy-MM-dd HH:mm:ss")); - - // Annul - await sutRepository.DeleteAsync(organization); } [DatabaseData, Theory] @@ -260,9 +250,6 @@ public async Task GetOrganizationsForSubscriptionSyncAsync_GivenOrganizationHasC Assert.Equal(organization.Id, updateResult.Id); Assert.True(updateResult.SyncSeats); Assert.Equal(requestDate.ToString("yyyy-MM-dd HH:mm:ss"), updateResult.RevisionDate.ToString("yyyy-MM-dd HH:mm:ss")); - - // Annul - await sutRepository.DeleteAsync(organization); } [DatabaseData, Theory] @@ -281,9 +268,6 @@ public async Task UpdateSuccessfulOrganizationSyncStatusAsync_GivenOrganizationH // Assert var result = (await sutRepository.GetOrganizationsForSubscriptionSyncAsync()).ToArray(); Assert.Null(result.FirstOrDefault(x => x.Id == organization.Id)); - - // Annul - await sutRepository.DeleteAsync(organization); } [DatabaseTheory, DatabaseData] @@ -400,9 +384,6 @@ public async Task GetAbilityAsync_WithExistingOrganization_ReturnsCorrectAbility Assert.Equal(organization.UseDisableSmAdsForUsers, result.UseDisableSmAdsForUsers); Assert.Equal(organization.UsePhishingBlocker, result.UsePhishingBlocker); Assert.Equal(organization.UseMyItems, result.UseMyItems); - - // Clean up - await organizationRepository.DeleteAsync(organization); } [Theory, DatabaseData] diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/GetManyConfirmedAcceptedDetailsByUserAsyncTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/GetManyConfirmedAcceptedDetailsByUserAsyncTests.cs index b41ea081042f..1be872e5f527 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/GetManyConfirmedAcceptedDetailsByUserAsyncTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/GetManyConfirmedAcceptedDetailsByUserAsyncTests.cs @@ -26,10 +26,6 @@ public async Task ReturnsDetails_WhenUserIsConfirmed( Assert.Equal(organization.Id, result.OrganizationId); Assert.Equal(user.Id, result.UserId); Assert.Equal(OrganizationUserStatusType.Confirmed, result.Status); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -52,10 +48,6 @@ public async Task ReturnsDetails_WhenUserIsAccepted( Assert.Equal(organization.Id, result.OrganizationId); Assert.Equal(user.Id, result.UserId); Assert.Equal(OrganizationUserStatusType.Accepted, result.Status); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -80,11 +72,6 @@ public async Task ReturnsDetailsAcrossMultipleOrganizations_WhenUserIsConfirmedO Assert.Equal(2, results.Count); Assert.Contains(results, r => r.OrganizationId == confirmedOrg.Id && r.Status == OrganizationUserStatusType.Confirmed); Assert.Contains(results, r => r.OrganizationId == acceptedOrg.Id && r.Status == OrganizationUserStatusType.Accepted); - - // Annul - await organizationRepository.DeleteAsync(confirmedOrg); - await organizationRepository.DeleteAsync(acceptedOrg); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -103,10 +90,6 @@ public async Task DoesNotReturnDetails_WhenUserIsInvited( // Assert Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -125,10 +108,6 @@ public async Task DoesNotReturnDetails_WhenUserIsRevoked( // Assert Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -149,9 +128,5 @@ public async Task DoesNotReturnDetails_ForOtherUsers( // Assert Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([targetUser, otherUser]); } } diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs index 369451ad7638..3619ae6507e2 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs @@ -1393,10 +1393,6 @@ public async Task ConfirmOrganizationUserAsync_WhenUserIsAccepted_ReturnsTrue(IO Assert.NotNull(updatedUser); Assert.Equal(OrganizationUserStatusType.Confirmed, updatedUser.Status); Assert.Equal(key, updatedUser.Key); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -1426,10 +1422,6 @@ public async Task ConfirmOrganizationUserAsync_WhenUserIsAlreadyConfirmed_Return var unchangedUser = await organizationUserRepository.GetByIdAsync(orgUser.Id); Assert.NotNull(unchangedUser); Assert.Equal(OrganizationUserStatusType.Confirmed, unchangedUser.Status); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -1460,10 +1452,6 @@ public async Task ConfirmOrganizationUserAsync_IsIdempotent_WhenCalledMultipleTi var finalUser = await organizationUserRepository.GetByIdAsync(orgUser.Id); Assert.NotNull(finalUser); Assert.Equal(OrganizationUserStatusType.Confirmed, finalUser.Status); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetManyConfirmedAcceptedByUserIdAsyncTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetManyConfirmedAcceptedByUserIdAsyncTests.cs index 00ed72d2fb2c..83c063e59be7 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetManyConfirmedAcceptedByUserIdAsyncTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetManyConfirmedAcceptedByUserIdAsyncTests.cs @@ -33,10 +33,6 @@ public async Task ReturnsPolicies_WhenUserIsConfirmed( // Assert Assert.Contains(results, p => p.Id == policy.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -62,10 +58,6 @@ public async Task ReturnsPolicies_WhenUserIsAccepted( // Assert Assert.Contains(results, p => p.Id == policy.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -102,11 +94,6 @@ public async Task ReturnsPoliciesAcrossMultipleOrganizations_WhenUserIsConfirmed // Assert Assert.Contains(results, p => p.Id == confirmedPolicy.Id); Assert.Contains(results, p => p.Id == acceptedPolicy.Id); - - // Annul - await organizationRepository.DeleteAsync(confirmedOrg); - await organizationRepository.DeleteAsync(acceptedOrg); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -139,10 +126,6 @@ await organizationUserRepository.CreateAsync(new OrganizationUser // Assert Assert.DoesNotContain(results, p => p.Id == policy.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -168,10 +151,6 @@ public async Task DoesNotReturnPolicies_WhenUserIsRevoked( // Assert Assert.DoesNotContain(results, p => p.Id == policy.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } [Theory, DatabaseData] @@ -199,9 +178,5 @@ public async Task DoesNotReturnPolicies_ForOtherUsers( // Assert Assert.DoesNotContain(results, p => p.Id == policy.Id); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([targetUser, otherUser]); } } diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByOrganizationIdAsyncTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByOrganizationIdAsyncTests.cs index e1352f5c8b34..437c91bde730 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByOrganizationIdAsyncTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByOrganizationIdAsyncTests.cs @@ -40,10 +40,6 @@ public async Task ShouldContainProviderData( Assert.True(results.Single().IsProvider); - // Annul - await organizationRepository.DeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId }); - await userRepository.DeleteAsync(user); - async Task ArrangeProvider() { var provider = await providerRepository.CreateAsync(new Provider @@ -90,11 +86,6 @@ public async Task ShouldNotReturnOtherOrganizations_WhenUserIsNotConnected( Assert.Contains(results, result => result.OrganizationUserId == userOrgConnectedDirectly.Id && result.OrganizationId == userOrgConnectedDirectly.OrganizationId); Assert.DoesNotContain(results, result => result.OrganizationId == notConnectedOrg.Id); - - // Annul - await organizationRepository.DeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId }); - await organizationRepository.DeleteAsync(notConnectedOrg); - await userRepository.DeleteAsync(user); } [DatabaseTheory, DatabaseData] @@ -124,10 +115,6 @@ public async Task ShouldOnlyReturnInputPolicyType( && result.PolicyType == inputPolicyType); Assert.DoesNotContain(results, result => result.PolicyType == notInputPolicyType); - - // Annul - await organizationRepository.DeleteAsync(new Organization { Id = orgUser.OrganizationId }); - await userRepository.DeleteAsync(user); } @@ -156,12 +143,6 @@ public async Task WhenDirectlyConnectedUserHasUserId_ShouldReturnOtherConnectedO Assert.Equal(expectedCount, results.Count); AssertPolicyDetailUserConnections(results, userOrgConnectedDirectly, userOrgConnectedByEmail, userOrgConnectedByUserId); - - // Annul - await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId }); - await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId }); - await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId }); - await userRepository.DeleteAsync(user); } [DatabaseTheory, DatabaseData] @@ -186,12 +167,6 @@ public async Task WhenDirectlyConnectedUserHasEmail_ShouldReturnOtherConnectedOr // Assert AssertPolicyDetailUserConnections(results, userOrgConnectedDirectly, userOrgConnectedByEmail, userOrgConnectedByUserId); - - // Annul - await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId }); - await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId }); - await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId }); - await userRepository.DeleteAsync(user); } [DatabaseTheory, DatabaseData] @@ -225,10 +200,6 @@ public async Task ShouldReturnUserIds( Assert.Contains(results, result => result.OrganizationUserId == orgUser2.Id && result.UserId == orgUser2.UserId && result.OrganizationId == orgUser2.OrganizationId); - - // Annul - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user1, user2]); } diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdAndPolicyTypeTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdAndPolicyTypeTests.cs index f6c6b696ec21..60b8bd83addc 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdAndPolicyTypeTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdAndPolicyTypeTests.cs @@ -58,9 +58,6 @@ public async Task GetPolicyDetailsByUserIdAndPolicyTypeAsync_WithConfirmedUser_R Assert.Equal(customPermissions, result.OrganizationUserPermissionsData); Assert.False(result.IsProvider); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } [Theory] @@ -98,9 +95,6 @@ public async Task GetPolicyDetailsByUserIdAndPolicyTypeAsync_WithAcceptedUser_Re Assert.Equal(OrganizationUserStatusType.Accepted, result.OrganizationUserStatus); Assert.False(result.IsProvider); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } [Theory] @@ -136,9 +130,6 @@ public async Task GetPolicyDetailsByUserIdAndPolicyTypeAsync_WithInvitedUser_Ret Assert.Equal(OrganizationUserStatusType.Invited, result.OrganizationUserStatus); Assert.False(result.IsProvider); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } [Theory] @@ -186,11 +177,6 @@ await policyRepository.CreateAsync(new Policy var result2 = resultsList.First(r => r.OrganizationId == org2.Id); Assert.Equal(orgUser2.Id, result2.OrganizationUserId); Assert.Equal(PolicyType.SingleOrg, result2.PolicyType); - - // Cleanup - await organizationRepository.DeleteAsync(org1); - await organizationRepository.DeleteAsync(org2); - await userRepository.DeleteAsync(user); } [Theory] @@ -237,9 +223,6 @@ await policyRepository.CreateAsync(new Policy var result = Assert.Single(resultsList); Assert.Equal(PolicyType.TwoFactorAuthentication, result.PolicyType); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } [Theory] @@ -271,9 +254,6 @@ await policyRepository.CreateAsync(new Policy // Assert Assert.Empty(results); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } [Theory] @@ -320,9 +300,6 @@ await policyRepository.CreateAsync(new Policy // Assert Assert.Empty(results); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } [Theory] @@ -369,9 +346,6 @@ await policyRepository.CreateAsync(new Policy // Assert Assert.Empty(results); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } [Theory] @@ -435,9 +409,6 @@ await providerOrganizationRepository.CreateAsync(new ProviderOrganization Assert.True(result.IsProvider); Assert.Equal(org.Id, result.OrganizationId); - // Cleanup - await organizationRepository.DeleteAsync(org); - await userRepository.DeleteAsync(user); } private static async Task CreateEnterpriseOrgAsync(IOrganizationRepository orgRepo) diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdsAndPolicyTypeTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdsAndPolicyTypeTests.cs index 9576967a2511..a18c9f46a9f4 100644 --- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdsAndPolicyTypeTests.cs +++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByUserIdsAndPolicyTypeTests.cs @@ -62,9 +62,6 @@ public async Task GetPolicyDetailsByUserIdsAndPolicyType_GivenTwoUsersForAnEnter Assert.Equal(PolicyType.TwoFactorAuthentication, result2.PolicyType); Assert.Equal(policy.Data, result2.PolicyData); Assert.Equal(OrganizationUserStatusType.Confirmed, result2.OrganizationUserStatus); - - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user1, user2]); } [Theory] @@ -114,9 +111,6 @@ public async Task GetPolicyDetailsByUserIdsAndPolicyType_GivenTwoUsersForEnterpr Assert.Equal(organization.Id, result2.OrganizationId); Assert.Equal(PolicyType.MasterPassword, result2.PolicyType); Assert.Equal(OrganizationUserStatusType.Invited, result2.OrganizationUserStatus); - - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user1, user2]); } [Theory] @@ -178,9 +172,6 @@ await providerOrganizationRepository.CreateAsync(new ProviderOrganization Assert.True(result.IsProvider); Assert.Equal(user.Id, result.UserId); Assert.Equal(organization.Id, result.OrganizationId); - - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user]); } [Theory] @@ -212,9 +203,6 @@ public async Task GetPolicyDetailsByUserIdsAndPolicyType_GivenEnterpriseOrgWithT var resultsList = results.ToList(); Assert.Single(resultsList); Assert.All(resultsList, r => Assert.Equal(PolicyType.TwoFactorAuthentication, r.PolicyType)); - - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user]); } [Theory] @@ -246,8 +234,6 @@ public async Task GetPolicyDetailsByUserIdsAndPolicyType_GivenEnterpriseOrg_When // Assert Assert.Empty(results); - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user]); } [Theory] @@ -289,9 +275,6 @@ public async Task GetPolicyDetailsByUserIdsAndPolicyType_GivenEnterpriseOrgWithP // Assert Assert.Empty(results); - - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user]); } [Theory] @@ -333,9 +316,6 @@ public async Task GetPolicyDetailsByUserIdsAndPolicyType_GivenOrganization_WhenN // Assert Assert.Empty(results); - - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteManyAsync([user]); } [Theory] diff --git a/test/Infrastructure.IntegrationTest/Vault/Repositories/CipherRepositoryTests.cs b/test/Infrastructure.IntegrationTest/Vault/Repositories/CipherRepositoryTests.cs index d9eff1cbd47b..a33caa6ea3f1 100644 --- a/test/Infrastructure.IntegrationTest/Vault/Repositories/CipherRepositoryTests.cs +++ b/test/Infrastructure.IntegrationTest/Vault/Repositories/CipherRepositoryTests.cs @@ -626,12 +626,6 @@ await collectionCipherRepository.UpdateCollectionsForAdminAsync(cipher.Id, organ var deletableCipher = ciphers.SingleOrDefault(x => x.Id == cipher.Id); Assert.NotNull(deletableCipher); Assert.True(deletableCipher.Manage); - - // Annul - await cipherRepository.DeleteAsync(cipher); - await organizationUserRepository.DeleteAsync(orgUser); - await organizationRepository.DeleteAsync(organization); - await userRepository.DeleteAsync(user); } private async Task<(User user, Organization org, OrganizationUser orgUser)> CreateTestUserAndOrganization( diff --git a/test/Infrastructure.IntegrationTest/Vault/Repositories/CollectionCipherRepositoryTests.cs b/test/Infrastructure.IntegrationTest/Vault/Repositories/CollectionCipherRepositoryTests.cs index 1579e5c329f6..c1bcde6f02bc 100644 --- a/test/Infrastructure.IntegrationTest/Vault/Repositories/CollectionCipherRepositoryTests.cs +++ b/test/Infrastructure.IntegrationTest/Vault/Repositories/CollectionCipherRepositoryTests.cs @@ -73,12 +73,5 @@ await collectionCipherRepository.AddCollectionsForManyCiphersAsync( Assert.Single(result); Assert.Equal(sharedCollection.Id, result.First().CollectionId); Assert.DoesNotContain(result, cc => cc.CollectionId == defaultUserCollection.Id); - - // Cleanup - await cipherRepository.DeleteAsync(sharedCipher); - await cipherRepository.DeleteAsync(defaultCipher); - await collectionRepository.DeleteAsync(sharedCollection); - await collectionRepository.DeleteAsync(defaultUserCollection); - await organizationRepository.DeleteAsync(organization); } }