commit 1c964cb5fe710ab0dff8c0ef2edbed06490345c8
author Boris Zbarsky <bzbarsky@apple.com> Tue Aug 29 23:27:44 2023 -0400
committer GitHub <noreply@github.com> Wed Aug 30 03:27:44 2023 +0000
tree 1cb047f055c6f1cf7a2df8989b89e01b791b3dbe
parent a40ac9ba569a42b317a1817d6ffc50f74b57d547

Fix darwin test build when ENABLE_OTA_TESTS == 0. (#28959)

src/darwin/Framework/CHIPTests/MTROTAProviderTests.m

diff --git a/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m b/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m
index c464e32..478a42f 100644
--- a/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m
+++ b/src/darwin/Framework/CHIPTests/MTROTAProviderTests.m
@@ -41,6 +41,8 @@
 #undef ENABLE_REAL_OTA_UPDATE_TESTS
 #endif
 
+#if ENABLE_OTA_TESTS
+
 static const uint16_t kPairingTimeoutInSeconds = 10;
 static const uint16_t kTimeoutInSeconds = 3;
 static const uint16_t kTimeoutWithUpdateInSeconds = 60;
@@ -78,15 +80,12 @@
 @class MTROTARequestorAppRunner;
 
 @interface MTROTAProviderTests : XCTestCase
-#if ENABLE_OTA_TESTS
 - (NSTask *)createTaskForPath:(NSString *)path;
 - (NSString *)createImageFromRawImage:(NSString *)rawImage withVersion:(NSNumber *)version;
 - (MTRDevice *)commissionDeviceWithPayload:(NSString *)payloadString nodeID:(NSNumber *)nodeID;
 - (void)registerRunningRequestor:(MTROTARequestorAppRunner *)requestor;
-#endif // ENABLE_OTA_TESTS
 @end
 
-#if ENABLE_OTA_TESTS
 static unsigned sAppRunnerIndex = 1;
 
 @interface MTROTARequestorAppRunner : NSObject
@@ -173,7 +172,6 @@
 }
 
 @end
-#endif // ENABLE_OTA_TESTS
 
 @interface MTROTAProviderTestControllerDelegate : NSObject <MTRDeviceControllerDelegate>
 @property (nonatomic, readonly) XCTestExpectation * expectation;
@@ -583,8 +581,6 @@
     NSMutableSet<MTROTARequestorAppRunner *> * _runningRequestors;
 }
 
-#if ENABLE_OTA_TESTS
-
 + (void)tearDown
 {
     // Global teardown, runs once
@@ -1573,6 +1569,14 @@
     [[self class] shutdownStack];
 }
 
-#endif // ENABLE_OTA_TESTS
-
 @end
+
+#else // ENABLE_OTA_TESTS
+
+@interface MTROTAProviderTests : XCTestCase
+@end
+
+@implementation MTROTAProviderTests
+@end
+
+#endif // ENABLE_OTA_TESTS