fix tests by ignoring test activityNames

Author: robertherber

apps/example/ios/Tests/FamilySelectionIdTests.swift

@@ -91,6 +91,7 @@ class FamilySelectionIdTests: XCTestCase {
     let activitySelectionPrefixedConfigKey = tryGetActivitySelectionIdConfigKey(
       keyPrefix: SHIELD_CONFIGURATION_FOR_SELECTION_PREFIX,
       categoryToken: token.categoryTokens.first,
+      onlyFamilySelectionIdsContainingMonitoredActivityNames: false
     )
 
     XCTAssertEqual(
@@ -143,7 +144,8 @@ class FamilySelectionIdTests: XCTestCase {
       ))
 
     let matches = getPossibleFamilyActivitySelectionIds(
-      categoryToken: tokenWithSocial.categoryTokens.first
+      categoryToken: tokenWithSocial.categoryTokens.first,
+      onlyFamilySelectionIdsContainingMonitoredActivityNames: false
     )
 
     XCTAssertEqual(
@@ -169,7 +171,8 @@ class FamilySelectionIdTests: XCTestCase {
     setFamilyActivitySelectionById(id: "games", activitySelection: tokenWithGames)
 
     let matches = getPossibleFamilyActivitySelectionIds(
-      categoryToken: tokenWithGames.categoryTokens.first
+      categoryToken: tokenWithGames.categoryTokens.first,
+      onlyFamilySelectionIdsContainingMonitoredActivityNames: false
     )
 
     XCTAssertEqual(
@@ -204,7 +207,8 @@ class FamilySelectionIdTests: XCTestCase {
     )
 
     let matches = getPossibleFamilyActivitySelectionIds(
-      categoryToken: tokenWithGames.categoryTokens.first
+      categoryToken: tokenWithGames.categoryTokens.first,
+      onlyFamilySelectionIdsContainingMonitoredActivityNames: false
     )
 
     XCTAssertEqual(

packages/react-native-device-activity/ios/Shared.swift

@@ -37,7 +37,8 @@ func updateShield(shieldId: String?, triggeredBy: String?, activitySelectionId:
   let shieldId = shieldId ?? "default"
 
   if var shieldConfiguration = userDefaults?.dictionary(
-    forKey: "shieldConfiguration_\(shieldId)") {
+    forKey: "shieldConfiguration_\(shieldId)")
+  {
 
     shieldConfiguration["shieldId"] = shieldId
     shieldConfiguration["triggeredBy"] = triggeredBy
@@ -53,7 +54,8 @@ func updateShield(shieldId: String?, triggeredBy: String?, activitySelectionId:
   }
 
   if var shieldActions = userDefaults?.dictionary(
-    forKey: "shieldActions_\(shieldId)") {
+    forKey: "shieldActions_\(shieldId)")
+  {
 
     shieldActions["shieldId"] = shieldId
     shieldActions["triggeredBy"] = triggeredBy
@@ -175,7 +177,8 @@ func sendNotification(contents: [String: Any], placeholders: [String: String?])
 
 // dataRequest which sends request to given URL and convert to Decodable Object
 func sendHttpRequest(with url: String, config: [String: Any], placeholders: [String: String?])
-  -> URLSessionDataTask {
+  -> URLSessionDataTask
+{
   // create the URL
   let url = URL(string: url)!  // change the URL
 
@@ -218,7 +221,8 @@ func sendHttpRequest(with url: String, config: [String: Any], placeholders: [Str
       do {
         // create json object from data
         if let json = try JSONSerialization.jsonObject(with: data, options: .mutableContainers)
-          as? [String: Any] {
+          as? [String: Any]
+        {
           print(json)
         }
       } catch let error {
@@ -280,9 +284,11 @@ struct TextToReplaceWithOptionalSpecialTreatment {
 }
 
 func getTextToReplaceWithOptionalSpecialTreatment(_ stringToReplace: String)
-  -> TextToReplaceWithOptionalSpecialTreatment {
+  -> TextToReplaceWithOptionalSpecialTreatment
+{
   if stringToReplace.starts(with: "{") && stringToReplace.hasSuffix("}")
-    && stringToReplace.contains(":") {
+    && stringToReplace.contains(":")
+  {
     // remove prefix and suffix
     let trimmed = String(stringToReplace.dropFirst().dropLast())
     // split on : and return first part
@@ -309,15 +315,17 @@ func replacePlaceholdersInObject<T: Any>(
       if let specialTreatment = textToReplaceWithOptionalSpecialTreatment.specialTreatment {
         if specialTreatment == "asNumber" {
           if let placeholderValue = placeholders[
-            textToReplaceWithOptionalSpecialTreatment.textToReplace] as? String {
+            textToReplaceWithOptionalSpecialTreatment.textToReplace] as? String
+          {
             if let numberValue = Double(placeholderValue) {
               retVal[key] = numberValue as? T
             }
           }
         }
         if specialTreatment == "userDefaults" {
           if let value = userDefaults?.string(
-            forKey: textToReplaceWithOptionalSpecialTreatment.textToReplace) {
+            forKey: textToReplaceWithOptionalSpecialTreatment.textToReplace)
+          {
             retVal[key] = value as? T
           }
         }
@@ -355,7 +363,8 @@ func clearAllManagedSettingsStoreSettings() {
 @available(iOS 15.0, *)
 func getFamilyActivitySelectionIds() -> [FamilyActivitySelectionWithId] {
   if let familyActivitySelectionIds = userDefaults?.dictionary(
-    forKey: "familyActivitySelectionIds") {
+    forKey: "familyActivitySelectionIds")
+  {
     return familyActivitySelectionIds.compactMap { (key: String, value: Any) in
       if let familyActivitySelectionStr = value as? String {
         let activitySelection = deserializeFamilyActivitySelection(
@@ -372,7 +381,8 @@ func getFamilyActivitySelectionIds() -> [FamilyActivitySelectionWithId] {
 @available(iOS 15.0, *)
 func getFamilyActivitySelectionById(id: String) -> FamilyActivitySelection? {
   if let familyActivitySelectionIds = userDefaults?.dictionary(
-    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY) {
+    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY)
+  {
     if let familyActivitySelectionStr = familyActivitySelectionIds[id] as? String {
       let activitySelection = deserializeFamilyActivitySelection(
         familyActivitySelectionStr: familyActivitySelectionStr
@@ -385,7 +395,8 @@ func getFamilyActivitySelectionById(id: String) -> FamilyActivitySelection? {
 
 func removeFamilyActivitySelectionById(id: String) {
   if var familyActivitySelectionIds = userDefaults?.dictionary(
-    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY) {
+    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY)
+  {
     familyActivitySelectionIds.removeValue(forKey: id)
 
     userDefaults?
@@ -400,7 +411,8 @@ func setFamilyActivitySelectionById(id: String, activitySelection: FamilyActivit
   )
 
   if var familyActivitySelectionIds = userDefaults?.dictionary(
-    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY) {
+    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY)
+  {
     familyActivitySelectionIds[id] = serialized
 
     userDefaults?
@@ -416,7 +428,8 @@ func setFamilyActivitySelectionById(id: String, activitySelection: FamilyActivit
 @available(iOS 15.0, *)
 func renameFamilyActivitySelectionId(previousId: String, newId: String) {
   if var familyActivitySelectionIds = userDefaults?.dictionary(
-    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY) {
+    forKey: FAMILY_ACTIVITY_SELECTION_ID_KEY)
+  {
     familyActivitySelectionIds[newId] = familyActivitySelectionIds[previousId]
     familyActivitySelectionIds.removeValue(forKey: previousId)
 
@@ -430,14 +443,16 @@ func tryGetActivitySelectionIdConfigKey(
   keyPrefix: String,
   applicationToken: ApplicationToken? = nil,
   webDomainToken: WebDomainToken? = nil,
-  categoryToken: ActivityCategoryToken? = nil
+  categoryToken: ActivityCategoryToken? = nil,
+  onlyFamilySelectionIdsContainingMonitoredActivityNames: Bool = true
 ) -> String? {
   let familyActivitySelectionIds = getPossibleFamilyActivitySelectionIds(
     applicationToken: applicationToken,
     webDomainToken: webDomainToken,
     categoryToken: categoryToken,
-    onlyFamilySelectionIdsContainingMonitoredActivityNames: true,
-    sortByGranularity: true
+    onlyFamilySelectionIdsContainingMonitoredActivityNames:
+      onlyFamilySelectionIdsContainingMonitoredActivityNames,
+    sortByGranularity: true,
   )
 
   let activitySelection = familyActivitySelectionIds.first {
@@ -558,7 +573,8 @@ func getPossibleFamilyActivitySelectionIds(
 
 @available(iOS 15.0, *)
 func deserializeFamilyActivitySelection(familyActivitySelectionStr: String)
-  -> FamilyActivitySelection {
+  -> FamilyActivitySelection
+{
   var activitySelection = FamilyActivitySelection()
 
   let decoder = JSONDecoder()
@@ -604,7 +620,8 @@ func disableBlockAllMode(triggeredBy: String) {
 func setsIncludesEntireCategory(
   _ selection1: FamilyActivitySelection, _ selection2: FamilyActivitySelection
 )
-  -> Bool {
+  -> Bool
+{
   if #available(iOS 15.2, *) {
     let selection1Safe = selection1.includeEntireCategory || selection1.categoryTokens.count == 0
 
@@ -618,7 +635,8 @@ func setsIncludesEntireCategory(
 
 @available(iOS 15.0, *)
 func intersection(_ selection1: FamilyActivitySelection, _ selection2: FamilyActivitySelection)
-  -> FamilyActivitySelection {
+  -> FamilyActivitySelection
+{
   let applicationTokens = selection1.applicationTokens.intersection(
     selection2.applicationTokens
   )
@@ -681,7 +699,8 @@ func symmetricDifference(
 
 @available(iOS 15.0, *)
 func difference(_ selection1: FamilyActivitySelection, _ selection2: FamilyActivitySelection)
-  -> FamilyActivitySelection {
+  -> FamilyActivitySelection
+{
   let applicationTokens = selection1.applicationTokens.subtracting(
     selection2.applicationTokens
   )
@@ -712,7 +731,8 @@ func difference(_ selection1: FamilyActivitySelection, _ selection2: FamilyActiv
 
 @available(iOS 15.0, *)
 func union(_ selection1: FamilyActivitySelection, _ selection2: FamilyActivitySelection)
-  -> FamilyActivitySelection {
+  -> FamilyActivitySelection
+{
   let applicationTokens = selection1.applicationTokens.union(
     selection2.applicationTokens
   )
@@ -926,7 +946,7 @@ func updateBlock(triggeredBy: String) {
       "blocklistCategoryCount": currentBlocklist.categoryTokens.count,
       "whitelistAppCount": currentWhitelist.applicationTokens.count,
       "whitelistWebDomainCount": currentWhitelist.webDomainTokens.count,
-      "whitelistCategoryCount": currentWhitelist.categoryTokens.count
+      "whitelistCategoryCount": currentWhitelist.categoryTokens.count,
     ], forKey: "lastBlockUpdate")
 
   updateBlockInternal(
@@ -1010,7 +1030,8 @@ func getColor(color: [String: Double]?) -> UIColor? {
 }
 
 func userDefaultKeyForEvent(activityName: String, callbackName: String, eventName: String? = nil)
-  -> String {
+  -> String
+{
 
   let fullEventName =
     eventName == nil
@@ -1131,7 +1152,8 @@ func shouldExecuteAction(
       eventName: eventName
     ) {
       if lastTriggeredAt >= skipIfAlreadyTriggeredBetweenFromDate
-        && lastTriggeredAt <= skipIfAlreadyTriggeredBetweenToDate {
+        && lastTriggeredAt <= skipIfAlreadyTriggeredBetweenToDate
+      {
         logger.log(
           "skipping executing actions for \(callbackName)\(eventName ?? "") because the last triggered time is between \(skipIfAlreadyTriggeredBetweenFromDate) and \(skipIfAlreadyTriggeredBetweenToDate)"
         )
@@ -1155,7 +1177,8 @@ func shouldExecuteAction(
     }
   }
 
-  if let skipIfLargerEventRecordedAfter = skipIfLargerEventRecordedAfter, let eventName = eventName {
+  if let skipIfLargerEventRecordedAfter = skipIfLargerEventRecordedAfter, let eventName = eventName
+  {
     if hasHigherTriggeredEvent(
       activityName: activityName,
       callbackName: callbackName,
@@ -1187,7 +1210,8 @@ func shouldExecuteAction(
   }
 
   if let skipIfLargerEventRecordedWithinMS = skipIfLargerEventRecordedWithinMS,
-    let eventName = eventName {
+    let eventName = eventName
+  {
     let skipIfLargerEventRecordedAfter =
       Date().timeIntervalSince1970 * 1000 - skipIfLargerEventRecordedWithinMS
     if hasHigherTriggeredEvent(
@@ -1204,7 +1228,8 @@ func shouldExecuteAction(
   }
 
   if let skipIfLargerEventRecordedSinceIntervalStarted =
-    skipIfLargerEventRecordedSinceIntervalStarted, let eventName = eventName {
+    skipIfLargerEventRecordedSinceIntervalStarted, let eventName = eventName
+  {
     if skipIfLargerEventRecordedSinceIntervalStarted {
       if let skipIfLargerEventRecordedAfter = getLastTriggeredTimeFromUserDefaults(
         activityName: activityName,