Clean everything

Author: ameyapat

IdentityCore/tests/MSIDWorkPlaceJoinUtilTests.m

@@ -70,6 +70,8 @@ - (void)setUp {
     self.useIosStyleKeychain = NO;
 #endif
     self.tenantId = NSUUID.UUID.UUIDString;
+    [self cleanWPJ:[self keychainGroup:YES]];
+    [self cleanWPJ:[self keychainGroup:NO]];
 }
 
 - (void)tearDown
@@ -139,8 +141,9 @@ - (void)testGetWPJKeysWithTenantId_whenWPJInDefaultWithSameTenant_EccBasedRegNoS
 
 - (void)testGetWPJKeysWithTenantId_whenWPJInDefaultWithSameTenant_EccBasedRegUsingSecureEnclave_shouldReturnDefault
 {
-    [self insertDummyEccRegistrationForTenantIdentifier:self.tenantId certIdentifier:kDummyTenant1CertIdentifier useSecureEnclave:YES];
-    MSIDWPJKeyPairWithCert *result = [MSIDWorkPlaceJoinUtil getWPJKeysWithTenantId:self.tenantId context:nil];
+    NSString *tid = self.tenantId;
+    [self insertDummyEccRegistrationForTenantIdentifier:tid certIdentifier:kDummyTenant1CertIdentifier useSecureEnclave:YES];
+    MSIDWPJKeyPairWithCert *result = [MSIDWorkPlaceJoinUtil getWPJKeysWithTenantId:tid context:nil];
     XCTAssertNotNil(result);
     XCTAssertEqual(result.keyChainVersion, MSIDWPJKeychainAccessGroupV2);
     CFStringRef cName = NULL;