Fixing test failures

project-chip · Jul 2, 2022 · c5704e5 · c5704e5
1 parent e8ef89d
commit c5704e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDevice.h b/src/darwin/Framework/CHIP/MTRDevice.h
@@ -131,8 +131,8 @@ extern NSString * const MTRArrayValueType;
                 maxInterval:(uint16_t)maxInterval
                      params:(nullable MTRSubscribeParams *)params
              cacheContainer:(MTRAttributeCacheContainer * _Nullable)attributeCacheContainer
-     attributeReportHandler:(void (^)(NSArray * value))attributeReportHandler
-         eventReportHandler:(void (^)(NSArray * value))eventReportHandler
+     attributeReportHandler:(nullable void (^)(NSArray * value))attributeReportHandler
+         eventReportHandler:(nullable void (^)(NSArray * value))eventReportHandler
                errorHandler:(void (^)(NSError * error))errorHandler
     subscriptionEstablished:(nullable void (^)(void))subscriptionEstablishedHandler;
 

diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -351,8 +351,8 @@ - (void)subscribeWithQueue:(dispatch_queue_t)queue
                 maxInterval:(uint16_t)maxInterval
                      params:(nullable MTRSubscribeParams *)params
              cacheContainer:(MTRAttributeCacheContainer * _Nullable)attributeCacheContainer
-     attributeReportHandler:(void (^)(NSArray * value))attributeReportHandler
-         eventReportHandler:(void (^)(NSArray * value))eventReportHandler
+     attributeReportHandler:(nullable void (^)(NSArray * value))attributeReportHandler
+         eventReportHandler:(nullable void (^)(NSArray * value))eventReportHandler
                errorHandler:(void (^)(NSError * error))errorHandler
     subscriptionEstablished:(nullable void (^)(void))subscriptionEstablishedHandler
 {

diff --git a/src/darwin/Framework/CHIP/MTRDeviceOverXPC.m b/src/darwin/Framework/CHIP/MTRDeviceOverXPC.m
@@ -51,8 +51,8 @@ - (void)subscribeWithQueue:(dispatch_queue_t)queue
                 maxInterval:(uint16_t)maxInterval
                      params:(nullable MTRSubscribeParams *)params
              cacheContainer:(MTRAttributeCacheContainer * _Nullable)attributeCacheContainer
-     attributeReportHandler:(void (^)(NSArray * value))attributeReportHandler
-         eventReportHandler:(void (^)(NSArray * value))eventReportHandler
+     attributeReportHandler:(nullable void (^)(NSArray * value))attributeReportHandler
+         eventReportHandler:(nullable void (^)(NSArray * value))eventReportHandler
                errorHandler:(void (^)(NSError * error))errorHandler
     subscriptionEstablished:(nullable void (^)(void))subscriptionEstablishedHandler;
 {

diff --git a/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m b/src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m
@@ -1785,7 +1785,7 @@ - (void)test900_SubscribeAttributeCache
         params:nil
         cacheContainer:attributeCacheContainer
         attributeReportHandler:^(NSArray * value) {
-            NSLog(@"Report for attribute cache: %@", error);
+            NSLog(@"Report for attribute cache: %@", value);
         }
         eventReportHandler:nil
         errorHandler:^(NSError * error) {