[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/darwin/Framework/CHIPTests/MTRDeviceTests.m

@@ -6795,7 +6795,7 @@ - (void)test055_WatchdogNoOpsWhenAdvertisementRacesAhead
     // measured from setDelegate; by now both the advertisement-driven
     // scheduling and the watchdog deadline are in the past.
     XCTestExpectation * settle = [self expectationWithDescription:@"Watchdog window has elapsed"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (2 * NSEC_PER_SEC)), queue, ^{
         [settle fulfill];
     });
     [self waitForExpectations:@[ settle ] timeout:5];
@@ -6897,7 +6897,7 @@ - (void)test056_NodeMayBeAdvertisingOperationalAfterDeferralCompletes
 
     // Allow time for any erroneous state churn to manifest.
     XCTestExpectation * settle = [self expectationWithDescription:@"Post-establishment advertisement processed"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (2 * NSEC_PER_SEC)), queue, ^{
         [settle fulfill];
     });
     [self waitForExpectations:@[ settle ] timeout:5];
@@ -7008,7 +7008,7 @@ - (void)test057_LatchIsPerInstanceFreshDeviceDefersAgain
     // (it's set synchronously inside _ensureSubscriptionForExistingDelegates,
     // before any subsequent state transitions), poll a few times via a
     // dispatch_after as a safety net so the assertion is robust on busy CI.
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(100 * NSEC_PER_MSEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (100 * NSEC_PER_MSEC)), queue, ^{
         if ([[deviceB valueForKey:@"hasDeferredFirstThreadSubscription"] boolValue]) {
             [deferralEnteredOnB fulfill];
         }
@@ -7092,7 +7092,7 @@ - (void)test058_CachedIPAddressShortCircuitsFirstThreadSubscribeDeferral
     // least one early callback.  We accumulate samples and assert the
     // strongest property afterwards: the flag was never observed YES.
     NSMutableArray<NSNumber *> * deferringSamples = [NSMutableArray array];
-    os_unfair_lock samplesLock = OS_UNFAIR_LOCK_INIT;
+    __block os_unfair_lock samplesLock = OS_UNFAIR_LOCK_INIT;
     delegate.onInternalStateChanged = ^{
         NSNumber * sample = [device valueForKey:@"deferringFirstThreadSubscription"];
         os_unfair_lock_lock(&samplesLock);
@@ -7275,7 +7275,7 @@ - (void)test059_AdvertisementBeforeSetDelegateDoesNotPoisonDeferralGate
     // _ensureSubscriptionForExistingDelegates before any state callback can
     // fire, so a quick dispatch-after also fulfils the expectation if the
     // initial state-change callback hasn't landed yet on busy CI.
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(100 * NSEC_PER_MSEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (100 * NSEC_PER_MSEC)), queue, ^{
         if ([[device valueForKey:@"hasDeferredFirstThreadSubscription"] boolValue]) {
             [latchSet fulfill];
         }
@@ -7356,7 +7356,7 @@ - (void)test060_RemoveDeviceDuringDeferralWindowIsSafe
     // Track every Subscribing/Established transition along with a timestamp so
     // we can prove no such transition fired after the removeDevice point.
     NSMutableArray<NSDictionary *> * transitions = [NSMutableArray array];
-    os_unfair_lock transitionsLock = OS_UNFAIR_LOCK_INIT;
+    __block os_unfair_lock transitionsLock = OS_UNFAIR_LOCK_INIT;
     delegate.onInternalStateChanged = ^{
         MTRInternalDeviceState state = [device _getInternalState];
         if (state == MTRInternalDeviceStateSubscribing
@@ -7392,7 +7392,7 @@ - (void)test060_RemoveDeviceDuringDeferralWindowIsSafe
     // we'd see a Subscribing transition (or worse, an InitialSubscriptionEstablished)
     // recorded after `removeAt` in the transitions array.
     XCTestExpectation * watchdogElapsed = [self expectationWithDescription:@"Watchdog window has elapsed"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (3 * NSEC_PER_SEC)), queue, ^{
         [watchdogElapsed fulfill];
     });
     [self waitForExpectations:@[ watchdogElapsed ] timeout:10];
@@ -7418,10 +7418,12 @@ - (void)test060_RemoveDeviceDuringDeferralWindowIsSafe
     for (NSDictionary * transition in snapshot) {
         XCTAssertNotEqualObjects(transition[@"state"], @(MTRInternalDeviceStateSubscribing),
             @"Should not have reached Subscribing during the deferral window before removal; "
-            @"transitions=%@", snapshot);
+            @"transitions=%@",
+            snapshot);
         XCTAssertNotEqualObjects(transition[@"state"], @(MTRInternalDeviceStateInitialSubscriptionEstablished),
             @"Should not have reached Established during the deferral window before removal; "
-            @"transitions=%@", snapshot);
+            @"transitions=%@",
+            snapshot);
     }
 
     delegate.onInternalStateChanged = nil;
@@ -7462,7 +7464,7 @@ - (void)test061_WatchdogTimingIsApproximatelyOneSecond
     // Capture the wall-clock instant Subscribing is first observed.  We use
     // an atomic-ish dance here: only the first transition sets the date.
     __block NSDate * subscribingAt = nil;
-    os_unfair_lock subLock = OS_UNFAIR_LOCK_INIT;
+    __block os_unfair_lock subLock = OS_UNFAIR_LOCK_INIT;
     delegate.onInternalStateChanged = ^{
         MTRInternalDeviceState state = [device _getInternalState];
         if (state == MTRInternalDeviceStateSubscribing) {
@@ -7514,7 +7516,8 @@ - (void)test061_WatchdogTimingIsApproximatelyOneSecond
     // stays well within the budget.
     XCTAssertLessThan(elapsed, 5.0,
         @"Subscribing reached in %.3fs after deferral was armed — exceeds the 1s watchdog budget plus generous slack; "
-        @"a regression in kFirstThreadSubscribeWatchdogNs would land here", elapsed);
+        @"a regression in kFirstThreadSubscribeWatchdogNs would land here",
+        elapsed);
 
     // End-state invariants: the deferring flag must be NO (cleared by the
     // watchdog), the latch must remain YES, and no advertisement was needed.
@@ -7603,7 +7606,7 @@ - (void)test062_MultipleAdvertisementsDuringDeferralWindowOnlyFirstReentersEnsur
     //     back to YES (no flag-bouncing).
     //   - The latch, once YES, must remain YES (one-shot for the instance).
     NSMutableArray<NSDictionary *> * samples = [NSMutableArray array];
-    os_unfair_lock samplesLock = OS_UNFAIR_LOCK_INIT;
+    __block os_unfair_lock samplesLock = OS_UNFAIR_LOCK_INIT;
 
     XCTestExpectation * established = [self expectationWithDescription:@"Subscription established"];
     established.assertForOverFulfill = NO;
@@ -7706,7 +7709,8 @@ - (void)test062_MultipleAdvertisementsDuringDeferralWindowOnlyFirstReentersEnsur
         BOOL deferring = [s[@"deferring"] boolValue];
         if (sawDeferringCleared && deferring) {
             XCTFail(@"deferringFirstThreadSubscription transitioned NO->YES after being cleared; "
-                    @"a regression in nodeMayBeAdvertisingOperational re-armed the flag. trace=%@", snapshot);
+                    @"a regression in nodeMayBeAdvertisingOperational re-armed the flag. trace=%@",
+                snapshot);
             break;
         }
         if (!deferring) {
@@ -7722,7 +7726,8 @@ - (void)test062_MultipleAdvertisementsDuringDeferralWindowOnlyFirstReentersEnsur
         BOOL latch = [s[@"latch"] boolValue];
         if (sawLatchSet && !latch) {
             XCTFail(@"hasDeferredFirstThreadSubscription transitioned YES->NO; "
-                    @"the latch must be one-shot for the MTRDevice instance's lifetime. trace=%@", snapshot);
+                    @"the latch must be one-shot for the MTRDevice instance's lifetime. trace=%@",
+                snapshot);
             break;
         }
         if (latch) {
@@ -7737,7 +7742,7 @@ - (void)test062_MultipleAdvertisementsDuringDeferralWindowOnlyFirstReentersEnsur
     // strongest "no double-scheduling" assertion we can make from outside.
     XCTAssertEqual(establishedTransitions, 1,
         @"Subscription must establish exactly once across multi-advertisement-during-deferral; got %ld",
-        (long)establishedTransitions);
+        (long) establishedTransitions);
 
     XCTAssertEqualObjects([device valueForKey:@"deferringFirstThreadSubscription"], @NO,
         @"End state: deferral flag clear");
@@ -7894,7 +7899,7 @@ - (void)test064_InvalidateClearsFirstThreadSubscribeDeferralFlags
     // Spin past the 1s watchdog deadline and re-sample.  If the watchdog
     // misbehaved and somehow set the flag back, we'd see it here.
     XCTestExpectation * pastWatchdog = [self expectationWithDescription:@"Past 1s watchdog deadline"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1500 * NSEC_PER_MSEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (1500 * NSEC_PER_MSEC)), queue, ^{
         [pastWatchdog fulfill];
     });
     [self waitForExpectations:@[ pastWatchdog ] timeout:5];
@@ -7959,7 +7964,7 @@ - (void)test065_SuspendDuringDeferralAbortsWatchdogScheduling
 
     // Wait past the 1s watchdog deadline.
     XCTestExpectation * pastWatchdog = [self expectationWithDescription:@"Past 1s watchdog deadline"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1500 * NSEC_PER_MSEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (1500 * NSEC_PER_MSEC)), queue, ^{
         [pastWatchdog fulfill];
     });
     [self waitForExpectations:@[ pastWatchdog ] timeout:5];
@@ -7974,7 +7979,7 @@ - (void)test065_SuspendDuringDeferralAbortsWatchdogScheduling
     XCTAssertEqual(subscribingTransitionsAfterSuspend, 0,
         @"Watchdog firing while subscriptions are not allowed must not schedule pool work; "
         @"observed %ld Subscribing transitions",
-        (long)subscribingTransitionsAfterSuspend);
+        (long) subscribingTransitionsAfterSuspend);
 
     // The deferring flag must end at NO regardless of which branch caught it.
     XCTAssertEqualObjects([device valueForKey:@"deferringFirstThreadSubscription"], @NO,
@@ -8155,7 +8160,7 @@ - (void)test_FirstThreadSubscribe_RecentReportShortCircuitsGate
     // still NO.  If the short-circuit had failed and the gate had armed the
     // watchdog, we'd observe deferring == YES throughout this interval.
     XCTestExpectation * sampled = [self expectationWithDescription:@"Deferral never arms post-recent-report"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(200 * NSEC_PER_MSEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (200 * NSEC_PER_MSEC)), queue, ^{
         [sampled fulfill];
     });
     [self waitForExpectations:@[ sampled ] timeout:5];
@@ -8477,7 +8482,7 @@ - (void)test_FirstThreadSubscribe_GatedDuringInterfaceColdStart
     //       already be MTRInternalDeviceStateSubscribing and the errno 65
     //       send would have already happened).
     XCTestExpectation * earlySample = [self expectationWithDescription:@"Sampled state within 100ms of setDelegate"];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(50 * NSEC_PER_MSEC)), queue, ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (50 * NSEC_PER_MSEC)), queue, ^{
         [earlySample fulfill];
     });
     [self waitForExpectations:@[ earlySample ] timeout:5];
@@ -8555,7 +8560,7 @@ - (void)test_FirstThreadSubscribe_AvoidsErrno65WastedBackoff
     // observed.  Only the FIRST transition counts — re-entries during a
     // subsequent re-subscribe cycle don't represent the first SubscribeRequest.
     __block NSDate * firstSubscribingAt = nil;
-    os_unfair_lock subLock = OS_UNFAIR_LOCK_INIT;
+    __block os_unfair_lock subLock = OS_UNFAIR_LOCK_INIT;
     delegate.onInternalStateChanged = ^{
         if ([device _getInternalState] != MTRInternalDeviceStateSubscribing) {
             return;
@@ -8612,7 +8617,8 @@ - (void)test_FirstThreadSubscribe_AvoidsErrno65WastedBackoff
     // breadcrumb if a regression sneaks below the 100ms floor above.
     if (elapsed < 0.9) {
         NSLog(@"[test_FirstThreadSubscribe_AvoidsErrno65WastedBackoff] elapsed=%.3fs <0.9s — "
-              @"likely advertisement-release path; relying on >=100ms lower bound", elapsed);
+              @"likely advertisement-release path; relying on >=100ms lower bound",
+            elapsed);
     } else {
         XCTAssertGreaterThanOrEqual(elapsed, 0.9,
             @"Watchdog-release path must have held the gate for ~1s (observed %.3fs)", elapsed);

src/darwin/Framework/CHIPTests/TestHelpers/MTRTestDeclarations.h

@@ -54,6 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)forceLocalhostAdvertisingOnly;
 - (void)removeDevice:(MTRDevice *)device;
 - (void)syncRunOnWorkQueue:(void (^)(void))block error:(NSError * __autoreleasing *)error;
+- (void)asyncDispatchToMatterQueue:(dispatch_block_t)block errorHandler:(nullable MTRDeviceErrorHandler)errorHandler;
 @property (nonatomic, readonly, nullable) id<MTRDeviceControllerDataStoreAttributeStoreMethods> controllerDataStore;
 @property (nonatomic, readonly) MTRAsyncWorkQueue<MTRDeviceController *> * concurrentSubscriptionPool;
 @end