Skip to content

Commit cd84490

Browse files
GDT tests: Xcode 12 fixes (#6469)
* GDT tests: Xcode 12 fixes * Silent unused warnings for weakSelf vars (for Xcode 12)
1 parent 2b4b9be commit cd84490

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

GoogleDataTransport/GDTCCTTests/Unit/GDTCCTUploaderTest.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ - (void)testStorageSelectorWhenConditionsHighPriority {
360360
[self assertStorageSelectorWithCondition:GDTCORUploadConditionHighPriority
361361
validationBlock:^(GDTCORStorageEventSelector *_Nullable eventSelector,
362362
NSDate *expiration) {
363-
id self = weakSelf;
363+
__unused id self = weakSelf;
364364
XCTAssertLessThan([expiration timeIntervalSinceNow], 600);
365365
XCTAssertEqual(eventSelector.selectedTarget, kGDTCORTargetTest);
366366
XCTAssertNil(eventSelector.selectedEventIDs);
@@ -375,7 +375,7 @@ - (void)testStorageSelectorWhenConditionsMobileData {
375375
assertStorageSelectorWithCondition:GDTCORUploadConditionMobileData
376376
validationBlock:^(GDTCORStorageEventSelector *_Nullable eventSelector,
377377
NSDate *expiration) {
378-
id self = weakSelf;
378+
__unused id self = weakSelf;
379379
XCTAssertLessThan([expiration timeIntervalSinceNow], 600);
380380
XCTAssertEqual(eventSelector.selectedTarget, kGDTCORTargetTest);
381381
XCTAssertNil(eventSelector.selectedEventIDs);
@@ -393,7 +393,7 @@ - (void)testStorageSelectorWhenConditionsWifiData {
393393
assertStorageSelectorWithCondition:GDTCORUploadConditionWifiData
394394
validationBlock:^(GDTCORStorageEventSelector *_Nullable eventSelector,
395395
NSDate *expiration) {
396-
id self = weakSelf;
396+
__unused id self = weakSelf;
397397
XCTAssertLessThan([expiration timeIntervalSinceNow], 600);
398398
XCTAssertEqual(eventSelector.selectedTarget, kGDTCORTargetTest);
399399
XCTAssertNil(eventSelector.selectedEventIDs);
@@ -582,7 +582,7 @@ - (XCTestExpectation *)expectStorageHasEventsForTarget:(GDTCORTarget)expectedTar
582582
__weak __auto_type weakSelf = self;
583583
self.testStorage.hasEventsForTargetHandler =
584584
^(GDTCORTarget target, GDTCCTTestStorageHasEventsCompletion _Nonnull completion) {
585-
__auto_type self = weakSelf;
585+
__unused __auto_type self = weakSelf;
586586
[expectation fulfill];
587587
XCTAssertEqual(target, expectedTarget);
588588
completion(hasEvents);

GoogleDataTransport/GDTCORTests/Unit/GDTCORTransformerTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ - (void)testWriteEventWithTransformersThatCreateANewEvent {
173173

174174
self.fakeApplication.beginTaskHandler =
175175
^GDTCORBackgroundIdentifier(NSString *_Nonnull name, dispatch_block_t _Nonnull handler) {
176-
__auto_type self = weakSelf;
176+
__unused __auto_type self = weakSelf;
177177
XCTAssertEqualObjects(expectedName, name);
178178

179179
[beginExpectation fulfill];
180180
return taskID;
181181
};
182182

183183
self.fakeApplication.endTaskHandler = ^(GDTCORBackgroundIdentifier endTaskID) {
184-
__auto_type self = weakSelf;
184+
__unused __auto_type self = weakSelf;
185185
XCTAssert(endTaskID == taskID);
186186
[endExpectation fulfill];
187187
};

0 commit comments

Comments
 (0)