Adding Boris' test fixes

project-chip · Jul 2, 2022 · bf26067 · bf26067
1 parent fcbf745
commit bf26067
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 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/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
@@ -708,17 +708,28 @@ - (void)test011_ReadCachedAttribute
     XCTestExpectation * subscribeExpectation = [self expectationWithDescription:@"Subscription complete"];
 
     NSLog(@"Subscribing...");
+    __block void (^reportHandler)(NSArray * _Nullable value, NSError * _Nullable error);
     [device subscribeWithQueue:queue
         minInterval:2
         maxInterval:60
         params:nil
         cacheContainer:attributeCacheContainer
         attributeReportHandler:^(NSArray * value) {
             NSLog(@"Received report: %@", value);
+            if (reportHandler) {
+                __auto_type handler = reportHandler;
+                reportHandler = nil;
+                handler(value, nil);
+            }
         }
         eventReportHandler:nil
         errorHandler:^(NSError * error) {
             NSLog(@"Received report error: %@", error);
+            if (reportHandler) {
+                __auto_type handler = reportHandler;
+                reportHandler = nil;
+                handler(nil, error);
+            }
         }
         subscriptionEstablished:^() {
             [subscribeExpectation fulfill];

diff --git a/src/darwin/Framework/CHIPTests/MTRTestKeys.m b/src/darwin/Framework/CHIPTests/MTRTestKeys.m
@@ -18,8 +18,8 @@
 #import <Security/SecKey.h>
 
 @interface MTRTestKeys ()
-@property (readwrite, nonatomic, strong) SecKeyRef privateKey;
-@property (readwrite, nonatomic, strong) SecKeyRef publicKey;
+@property (readonly) SecKeyRef privateKey;
+@property (readonly) SecKeyRef publicKey;
 @end
 
 @implementation MTRTestKeys
@@ -79,11 +79,6 @@ - (NSData *)signMessageECDSA_DER:(NSData *)message
     return (__bridge_transfer NSData *) outData;
 }
 
-- (SecKeyRef)publicKey
-{
-    return _publicKey;
-}
-
 - (void)dealloc
 {
     if (_publicKey) {

diff --git a/src/darwin/Framework/CHIPTests/MTRThreadOperationalDatasetTests.mm b/src/darwin/Framework/CHIPTests/MTRThreadOperationalDatasetTests.mm
@@ -44,7 +44,7 @@ - (void)testThreadOperationalDataset
                     channel:25
                       panID:[NSData dataWithBytes:&panID length:sizeof(panID)]];
     XCTAssertNotNil(dataset);
-    NSData * data = [dataset asData];
+    NSData * data = [dataset data];
     XCTAssertNotNil(data);
 
     MTRThreadOperationalDataset * reconstructed = [[MTRThreadOperationalDataset alloc] initWithData:data];

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) {