File directory for tvOS should change from NSApplicationSupportDirect…

…or to NSCachesDirectory (#2496)
firebase · Mar 13, 2019 · 8061301 · 8061301
1 parent 37842fa
commit 8061301
Show file tree

Hide file tree

Showing 23 changed files with 147 additions and 127 deletions.
diff --git a/Example/Firebase.xcodeproj/project.pbxproj b/Example/Firebase.xcodeproj/project.pbxproj
@@ -124,9 +124,6 @@
 		511DD27D2225C4D20094D78D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 511DD27C2225C4D20094D78D /* Assets.xcassets */; };
 		511DD2802225C4D20094D78D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 511DD27F2225C4D20094D78D /* main.m */; };
 		511DD2922225C8C40094D78D /* FIRInstanceIDWithFCMTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8DB550221F5B470068BB0E /* FIRInstanceIDWithFCMTest.m */; };
-		511DD2932225C8C40094D78D /* FIRMessagingFakeConnection.h in Sources */ = {isa = PBXBuildFile; fileRef = DE9315C81E8738B70083EDBF /* FIRMessagingFakeConnection.h */; };
-		511DD2942225C8C40094D78D /* FIRMessagingFakeSocket.h in Sources */ = {isa = PBXBuildFile; fileRef = DE9315CA1E8738B70083EDBF /* FIRMessagingFakeSocket.h */; };
-		511DD2952225C8C40094D78D /* FIRMessagingTestNotificationUtilities.h in Sources */ = {isa = PBXBuildFile; fileRef = DE9315D61E8738B70083EDBF /* FIRMessagingTestNotificationUtilities.h */; };
 		511DD2962225C8C40094D78D /* FIRMessagingClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9315C31E8738B70083EDBF /* FIRMessagingClientTest.m */; };
 		511DD2972225C8C40094D78D /* FIRMessagingCodedInputStreamTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9315C41E8738B70083EDBF /* FIRMessagingCodedInputStreamTest.m */; };
 		511DD2982225C8C40094D78D /* FIRMessagingConnectionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9315C51E8738B70083EDBF /* FIRMessagingConnectionTest.m */; };
@@ -147,8 +144,8 @@
 		511DD2A72225C8C40094D78D /* FIRMessagingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9315D51E8738B70083EDBF /* FIRMessagingTest.m */; };
 		511DD2A82225C8C40094D78D /* FIRMessagingTestNotificationUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9315D71E8738B70083EDBF /* FIRMessagingTestNotificationUtilities.m */; };
 		511DD2A92225C8C40094D78D /* FIRMessagingAnalyticsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE37C63A2163D5F30025D03E /* FIRMessagingAnalyticsTest.m */; };
-		511DD2AA2225C8D50094D78D /* FIRMessagingTestUtilities.h in Sources */ = {isa = PBXBuildFile; fileRef = EDF5242A21EA364600BB24C6 /* FIRMessagingTestUtilities.h */; };
 		511DD2AB2225C8D50094D78D /* FIRMessagingTestUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = EDF5242B21EA364600BB24C6 /* FIRMessagingTestUtilities.m */; };
+		51559F8A2238B8DB00CFC32C /* FIRMessagingExtensionHelperTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5188550D2231E02300CA4141 /* FIRMessagingExtensionHelperTest.m */; };
 		518854D92230652900CA4141 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 518854D82230652900CA4141 /* AppDelegate.m */; };
 		518854DC2230652900CA4141 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 518854DB2230652900CA4141 /* ViewController.m */; };
 		518854DF2230652900CA4141 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 518854DD2230652900CA4141 /* Main.storyboard */; };
@@ -177,7 +174,6 @@
 		5188550A223067E900CA4141 /* FIRInstanceIDUtilitiesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE958BE121F7DF0C00E6C1C5 /* FIRInstanceIDUtilitiesTest.m */; };
 		5188550C2230873000CA4141 /* FIRInstanceIDAPNSInfoTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE958BDA21F7DF0B00E6C1C5 /* FIRInstanceIDAPNSInfoTest.m */; };
 		5188550E2231E02400CA4141 /* FIRMessagingExtensionHelperTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5188550D2231E02300CA4141 /* FIRMessagingExtensionHelperTest.m */; };
-		518855112231E09300CA4141 /* FIRMessagingExtensionHelperTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 518855102231E09300CA4141 /* FIRMessagingExtensionHelperTest.m */; };
 		7E21E0731F857DFC00D0AC1C /* FIROAuthProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E21E0721F857DFC00D0AC1C /* FIROAuthProviderTests.m */; };
 		7E9485421F578AC4005A3939 /* FIRAuthURLPresenterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E94853F1F578A9D005A3939 /* FIRAuthURLPresenterTests.m */; };
 		7EE21F7A1FE89193009B1370 /* FIREmailLinkRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE21F791FE89193009B1370 /* FIREmailLinkRequestTests.m */; };
@@ -1080,9 +1076,7 @@
 		518854E22230652B00CA4141 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		518854E32230652B00CA4141 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		518854EC223066BE00CA4141 /* InstanceID_Tests_tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InstanceID_Tests_tvOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		5188550D2231E02300CA4141 /* FIRMessagingExtensionHelperTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = FIRMessagingExtensionHelperTest.m; path = Messaging/Tests/FIRMessagingExtensionHelperTest.m; sourceTree = "<group>"; };
-		5188550F2231E04C00CA4141 /* FIRMessagingClientTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = FIRMessagingClientTest.m; path = Messaging/Tests/FIRMessagingClientTest.m; sourceTree = "<group>"; };
-		518855102231E09300CA4141 /* FIRMessagingExtensionHelperTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = FIRMessagingExtensionHelperTest.m; path = Messaging/Tests/FIRMessagingExtensionHelperTest.m; sourceTree = "<group>"; };
+		5188550D2231E02300CA4141 /* FIRMessagingExtensionHelperTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FIRMessagingExtensionHelperTest.m; sourceTree = "<group>"; };
 		6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		6003F591195388D20070C39A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -1919,9 +1913,6 @@
 		6003F581195388D10070C39A = {
 			isa = PBXGroup;
 			children = (
-				518855102231E09300CA4141 /* FIRMessagingExtensionHelperTest.m */,
-				5188550F2231E04C00CA4141 /* FIRMessagingClientTest.m */,
-				5188550D2231E02300CA4141 /* FIRMessagingExtensionHelperTest.m */,
 				60FF7A9C1954A5C5007DD14C /* Podspec Metadata */,
 				DE9314EB1E86C6FF0083EDBF /* Auth */,
 				DEE14D661E844677006FA992 /* Core */,
@@ -2547,6 +2538,7 @@
 		DE9315C21E8738B70083EDBF /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				5188550D2231E02300CA4141 /* FIRMessagingExtensionHelperTest.m */,
 				DE8DB550221F5B470068BB0E /* FIRInstanceIDWithFCMTest.m */,
 				DE9315C81E8738B70083EDBF /* FIRMessagingFakeConnection.h */,
 				DE9315CA1E8738B70083EDBF /* FIRMessagingFakeSocket.h */,
@@ -3798,6 +3790,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				"es-MX",
@@ -4305,14 +4298,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				518855112231E09300CA4141 /* FIRMessagingExtensionHelperTest.m in Sources */,
-				511DD2AA2225C8D50094D78D /* FIRMessagingTestUtilities.h in Sources */,
+				511DD2962225C8C40094D78D /* FIRMessagingClientTest.m in Sources */,
+				51559F8A2238B8DB00CFC32C /* FIRMessagingExtensionHelperTest.m in Sources */,
 				511DD2AB2225C8D50094D78D /* FIRMessagingTestUtilities.m in Sources */,
 				511DD2922225C8C40094D78D /* FIRInstanceIDWithFCMTest.m in Sources */,
-				511DD2932225C8C40094D78D /* FIRMessagingFakeConnection.h in Sources */,
-				511DD2942225C8C40094D78D /* FIRMessagingFakeSocket.h in Sources */,
-				511DD2952225C8C40094D78D /* FIRMessagingTestNotificationUtilities.h in Sources */,
-				511DD2962225C8C40094D78D /* FIRMessagingClientTest.m in Sources */,
 				511DD2972225C8C40094D78D /* FIRMessagingCodedInputStreamTest.m in Sources */,
 				511DD2982225C8C40094D78D /* FIRMessagingConnectionTest.m in Sources */,
 				511DD2992225C8C40094D78D /* FIRMessagingContextManagerServiceTest.m in Sources */,

diff --git a/Example/InstanceID/Tests/FIRInstanceIDBackupExcludedPlistTest.m b/Example/InstanceID/Tests/FIRInstanceIDBackupExcludedPlistTest.m
@@ -38,16 +38,15 @@ @implementation FIRInstanceIDBackupExcludedPlistTest
 
 - (void)setUp {
   [super setUp];
-  [FIRInstanceIDStore createApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+  [FIRInstanceIDStore createSubDirectory:kApplicationSupportSubDirectoryName];
   self.plist = [[FIRInstanceIDBackupExcludedPlist alloc]
-                    initWithFileName:kTestPlistFileName
-      applicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+      initWithFileName:kTestPlistFileName
+          subDirectory:kApplicationSupportSubDirectoryName];
 }
 
 - (void)tearDown {
   [self.plist deleteFile:nil];
-  [FIRInstanceIDStore removeApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName
-                                                     error:nil];
+  [FIRInstanceIDStore removeSubDirectory:kApplicationSupportSubDirectoryName error:nil];
   [super tearDown];
 }
 
@@ -84,7 +83,7 @@ - (void)testWriteToPlistInApplicationSupportFolder {
 - (void)testMovePlistToApplicationSupportDirectorySuccess {
   NSDictionary *plistContents = @{@"hello" : @"world", @"id" : @123};
   [self.plist writeDictionary:plistContents error:nil];
-  [self.plist moveToApplicationSupportSubDirectory];
+  [self.plist moveToApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
   XCTAssertTrue([self isPlistInApplicationSupportDirectory]);
   XCTAssertFalse([self isPlistInDocumentsDirectory]);
 
@@ -94,16 +93,18 @@ - (void)testMovePlistToApplicationSupportDirectorySuccess {
 }
 
 - (void)testMovePlistToApplicationSupportDirectoryFailure {
+  // This is to test moving data from deprecated document folder to application folder
+  // which should only apply to iOS.
+#if TARGET_OS_IOS
   // Delete the subdirectory
-  [FIRInstanceIDStore removeApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName
-                                                     error:nil];
+  [FIRInstanceIDStore removeSubDirectory:kApplicationSupportSubDirectoryName error:nil];
 
   // Create a new plistl This would try to move or write to the ApplicationSupport directory
   // but since the subdirectory is not there anymore it will fail and rather write to the
   // Documents folder.
   self.plist = [[FIRInstanceIDBackupExcludedPlist alloc]
-                    initWithFileName:kTestPlistFileName
-      applicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+      initWithFileName:kTestPlistFileName
+          subDirectory:kApplicationSupportSubDirectoryName];
 
   NSDictionary *plistContents = @{@"hello" : @"world", @"id" : @123};
   [self.plist writeDictionary:plistContents error:nil];
@@ -113,18 +114,25 @@ - (void)testMovePlistToApplicationSupportDirectoryFailure {
 
   NSDictionary *newPlistContents = @{@"world" : @"hello"};
   [self.plist writeDictionary:newPlistContents error:nil];
+
   XCTAssertEqualObjects(newPlistContents, [self.plist contentAsDictionary]);
 
   // The new file should still be written to the Documents folder.
   XCTAssertFalse([self isPlistInApplicationSupportDirectory]);
   XCTAssertTrue([self isPlistInDocumentsDirectory]);
+#endif
 }
 
 #pragma mark - Private Helpers
 
 - (BOOL)isPlistInApplicationSupportDirectory {
+#if TARGET_OS_TV
+  NSArray *directoryPaths =
+      NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+#else
   NSArray *directoryPaths =
       NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+#endif
   NSString *applicationSupportDirPath = directoryPaths.lastObject;
   NSArray *components = @[
     applicationSupportDirPath, kApplicationSupportSubDirectoryName,

diff --git a/Example/InstanceID/Tests/FIRInstanceIDCheckinStoreTest.m b/Example/InstanceID/Tests/FIRInstanceIDCheckinStoreTest.m
@@ -56,7 +56,7 @@ @implementation FIRInstanceIDCheckinStoreTest
 
 - (void)setUp {
   [super setUp];
-  [FIRInstanceIDStore createApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+  [FIRInstanceIDStore createSubDirectory:kApplicationSupportSubDirectoryName];
 }
 
 - (void)tearDown {
@@ -65,8 +65,7 @@ - (void)tearDown {
     NSError *error;
     [[NSFileManager defaultManager] removeItemAtPath:path error:&error];
   }
-  [FIRInstanceIDStore removeApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName
-                                                     error:nil];
+  [FIRInstanceIDStore removeSubDirectory:kApplicationSupportSubDirectoryName error:nil];
   [super tearDown];
 }
 
@@ -77,8 +76,8 @@ - (void)testInvalidCheckinPreferencesOnKeychainFail {
   XCTestExpectation *checkinInvalidExpectation = [self
       expectationWithDescription:@"Checkin preference should be invalid after keychain failure"];
   FIRInstanceIDBackupExcludedPlist *checkinPlist = [[FIRInstanceIDBackupExcludedPlist alloc]
-                    initWithFileName:kFakeCheckinPlistName
-      applicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+      initWithFileName:kFakeCheckinPlistName
+          subDirectory:kApplicationSupportSubDirectoryName];
 
   FIRInstanceIDFakeKeychain *fakeKeychain = [[FIRInstanceIDFakeKeychain alloc] init];
 
@@ -110,8 +109,8 @@ - (void)testCheckinSaveFailsOnKeychainWriteFailure {
   XCTestExpectation *checkinSaveFailsExpectation =
       [self expectationWithDescription:@"Checkin save should fail after keychain write failure"];
   FIRInstanceIDBackupExcludedPlist *checkinPlist = [[FIRInstanceIDBackupExcludedPlist alloc]
-                    initWithFileName:kFakeCheckinPlistName
-      applicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+      initWithFileName:kFakeCheckinPlistName
+          subDirectory:kApplicationSupportSubDirectoryName];
 
   FIRInstanceIDFakeKeychain *fakeKeychain = [[FIRInstanceIDFakeKeychain alloc] init];
   fakeKeychain.cannotWriteToKeychain = YES;
@@ -141,8 +140,8 @@ - (void)testCheckinMigrationMovesToNewLocationInKeychain {
       [self expectationWithDescription:@"checkin migration should move to the new location"];
   // Create checkin store class.
   FIRInstanceIDBackupExcludedPlist *checkinPlist = [[FIRInstanceIDBackupExcludedPlist alloc]
-                    initWithFileName:kFakeCheckinPlistName
-      applicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+      initWithFileName:kFakeCheckinPlistName
+          subDirectory:kApplicationSupportSubDirectoryName];
 
   FIRInstanceIDFakeKeychain *fakeKeychain = [[FIRInstanceIDFakeKeychain alloc] init];
   FIRInstanceIDFakeKeychain *weakKeychain = fakeKeychain;

diff --git a/Example/InstanceID/Tests/FIRInstanceIDKeyPairStoreTest.m b/Example/InstanceID/Tests/FIRInstanceIDKeyPairStoreTest.m
@@ -20,6 +20,7 @@
 #import "Firebase/InstanceID/FIRInstanceIDConstants.h"
 #import "Firebase/InstanceID/FIRInstanceIDKeyPair.h"
 #import "Firebase/InstanceID/FIRInstanceIDKeychain.h"
+#import "Firebase/InstanceID/FIRInstanceIDStore.h"
 
 #import <OCMock/OCMock.h>
 #import "Firebase/InstanceID/FIRInstanceIDKeyPair.h"
@@ -53,6 +54,10 @@ - (void)setUp {
   [super setUp];
   id mockStoreClass = OCMClassMock([FIRInstanceIDKeyPairStore class]);
   [[[mockStoreClass stub] andReturn:@"com.google.iid-keypairmanager-test"] keyStoreFileName];
+  // Should make sure the standard directory is created.
+  if (![FIRInstanceIDStore hasSubDirectory:kFIRInstanceIDSubDirectoryName]) {
+    [FIRInstanceIDStore createSubDirectory:kFIRInstanceIDSubDirectoryName];
+  }
   _keyPairStore = [[FIRInstanceIDKeyPairStore alloc] init];
 }
 

diff --git a/Example/InstanceID/Tests/FIRInstanceIDStoreTest.m b/Example/InstanceID/Tests/FIRInstanceIDStoreTest.m
@@ -74,12 +74,12 @@ @implementation FIRInstanceIDStoreTest
 
 - (void)setUp {
   [super setUp];
-  [FIRInstanceIDStore createApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+  [FIRInstanceIDStore createSubDirectory:kApplicationSupportSubDirectoryName];
 
   NSString *checkinPlistName = @"com.google.test.IIDStoreTestCheckin";
   self.checkinPlist = [[FIRInstanceIDBackupExcludedPlist alloc]
-                    initWithFileName:checkinPlistName
-      applicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+      initWithFileName:checkinPlistName
+          subDirectory:kApplicationSupportSubDirectoryName];
 
   // checkin store
   FIRInstanceIDFakeKeychain *fakeKeychain = [[FIRInstanceIDFakeKeychain alloc] init];
@@ -103,8 +103,7 @@ - (void)setUp {
 - (void)tearDown {
   [self.instanceIDStore removeAllCachedTokensWithHandler:nil];
   [self.instanceIDStore removeCheckinPreferencesWithHandler:nil];
-  [FIRInstanceIDStore removeApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName
-                                                     error:nil];
+  [FIRInstanceIDStore removeSubDirectory:kApplicationSupportSubDirectoryName error:nil];
   [_mockCheckinStore stopMocking];
   [_mockTokenStore stopMocking];
   [_mockInstanceIDStore stopMocking];

diff --git a/Example/InstanceID/Tests/FIRInstanceIDTokenManagerTest.m b/Example/InstanceID/Tests/FIRInstanceIDTokenManagerTest.m
@@ -91,12 +91,12 @@ @implementation FIRInstanceIDTokenManagerTest
 
 - (void)setUp {
   [super setUp];
-  [FIRInstanceIDStore createApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+  [FIRInstanceIDStore createSubDirectory:kApplicationSupportSubDirectoryName];
 
   NSString *checkinPlistFilename = @"com.google.test.IIDCheckinTest";
   self.checkinPlist = [[FIRInstanceIDBackupExcludedPlist alloc]
-                    initWithFileName:checkinPlistFilename
-      applicationSupportSubDirectory:kApplicationSupportSubDirectoryName];
+      initWithFileName:checkinPlistFilename
+          subDirectory:kApplicationSupportSubDirectoryName];
 
   // checkin store
   FIRInstanceIDFakeKeychain *fakeCheckinKeychain = [[FIRInstanceIDFakeKeychain alloc] init];
@@ -123,8 +123,7 @@ - (void)tearDown {
   }
 
   self.tokenManager = nil;
-  [FIRInstanceIDStore removeApplicationSupportSubDirectory:kApplicationSupportSubDirectoryName
-                                                     error:nil];
+  [FIRInstanceIDStore removeSubDirectory:kApplicationSupportSubDirectoryName error:nil];
   [super tearDown];
 }
 

diff --git a/Example/Messaging/Tests/FIRMessagingExtensionHelperTest.m b/Example/Messaging/Tests/FIRMessagingExtensionHelperTest.m
@@ -47,16 +47,16 @@ @implementation FIRMessagingExtensionHelperTest
 
 - (void)setUp {
   [super setUp];
-  FIRMessagingExtensionHelper *extensionHelper = [FIRMessaging extensionHelper];
+  FIRMessagingExtensionHelper *extensionHelper = [[FIRMessagingExtensionHelper alloc] init];
   _mockExtensionHelper = OCMPartialMock(extensionHelper);
 }
 
 - (void)tearDown {
   [_mockExtensionHelper stopMocking];
 }
 
-#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 - (void)testModifyNotificationWithValidPayloadData {
+#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
   XCTestExpectation *validPayloadExpectation =
       [self expectationWithDescription:@"Test payload is valid."];
 
@@ -70,9 +70,11 @@ - (void)testModifyNotificationWithValidPayloadData {
   OCMVerify([_mockExtensionHelper loadAttachmentForURL:[OCMArg any]
                                      completionHandler:[OCMArg any]]);
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
+#endif
 }
 
 - (void)testModifyNotificationWithInvalidPayloadData {
+#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
   XCTestExpectation *validPayloadExpectation =
       [self expectationWithDescription:@"Test payload is valid."];
 
@@ -87,9 +89,11 @@ - (void)testModifyNotificationWithInvalidPayloadData {
   OCMReject([_mockExtensionHelper loadAttachmentForURL:[OCMArg any]
                                      completionHandler:[OCMArg any]]);
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
+#endif
 }
 
 - (void)testModifyNotificationWithEmptyPayloadData {
+#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
   XCTestExpectation *validPayloadExpectation =
       [self expectationWithDescription:@"Test payload is valid."];
 
@@ -104,7 +108,7 @@ - (void)testModifyNotificationWithEmptyPayloadData {
   OCMReject([_mockExtensionHelper loadAttachmentForURL:[OCMArg any]
                                      completionHandler:[OCMArg any]]);
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
-}
 #endif
+}
 
 @end