There is a chance that old test attributes are still present

Author: mbruin-NR

Tests/Unit-Tests/NewRelicAgentTests/Analytics-Tests/NRMASAMTest.mm

@@ -28,6 +28,14 @@ - (void)setUp {
 
     manager = [self samTest];
     [manager removeAllSessionAttributes];
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if([fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file]]) {
+        [fileManager removeItemAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file] error:nil];
+    }
+    if([fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file_private]]) {
+        [fileManager removeItemAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file_private] error:nil];
+    }
 }
 
 - (NRMASAM*) samTest {
@@ -294,14 +302,6 @@ - (void)waitForAttributesToPersist:(NSArray<NSString *> *)expectedAttributes tim
 
 - (void)testPersistedSessionAnalytics {
 
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    if([fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file]]) {
-        [fileManager removeItemAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file] error:nil];
-    }
-    if([fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file_private]]) {
-        [fileManager removeItemAtPath:[NSString stringWithFormat:@"%@/%@",[NewRelicInternalUtils getStorePath],kNRMA_Attrib_file_private] error:nil];
-    }
-    
     NSString *attribute = @"blarg";
     NSString *attribute2 = @"blarg2";
     NSString *attribute3 = @"privateBlarg3";