Skip to content

Commit

Permalink
Fix darwin test build when ENABLE_OTA_TESTS == 0. (#28959)
Browse files Browse the repository at this point in the history
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Oct 4, 2023
1 parent 2b13ece commit 3429790
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions src/darwin/Framework/CHIPTests/MTROTAProviderTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -173,7 +172,6 @@ - (void)terminate
}

@end
#endif // ENABLE_OTA_TESTS

@interface MTROTAProviderTestControllerDelegate : NSObject <MTRDeviceControllerDelegate>
@property (nonatomic, readonly) XCTestExpectation * expectation;
Expand Down Expand Up @@ -583,8 +581,6 @@ @implementation MTROTAProviderTests {
NSMutableSet<MTROTARequestorAppRunner *> * _runningRequestors;
}

#if ENABLE_OTA_TESTS

+ (void)tearDown
{
// Global teardown, runs once
Expand Down Expand Up @@ -1573,6 +1569,14 @@ - (void)test999_TearDown
[[self class] shutdownStack];
}

#endif // ENABLE_OTA_TESTS
@end

#else // ENABLE_OTA_TESTS

@interface MTROTAProviderTests : XCTestCase
@end

@implementation MTROTAProviderTests
@end

#endif // ENABLE_OTA_TESTS

0 comments on commit 3429790

Please sign in to comment.