From bb2b914139ba0b37af0b10ca0ca4dc7e06c7c742 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Fri, 1 Jul 2022 18:29:37 -0700 Subject: [PATCH] Fixing test failures --- src/darwin/Framework/CHIP/MTRDevice.h | 4 ++-- src/darwin/Framework/CHIP/MTRDevice.mm | 4 ++-- src/darwin/Framework/CHIP/MTRDeviceOverXPC.m | 4 ++-- src/darwin/Framework/CHIPTests/MTRXPCListenerSampleTests.m | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDevice.h b/src/darwin/Framework/CHIP/MTRDevice.h index 3b19353f60a781..3230b26a15dedf 100644 --- 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 index 49aba6c9ac5cd0..581ab5abb36773 100644 --- 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 index acb80e579ce14f..0bbefcdeab8655 100644 --- 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 index a61d6a1e60e658..e4d20c29e32344 100644 --- 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) {