@@ -179,9 +179,7 @@ - (void)assertCallbacksReleasedForFetcher:(GTMSessionFetcher *)fetcher {
179
179
XCTAssertNil (fetcher.downloadProgressBlock );
180
180
XCTAssertNil (fetcher.willCacheURLResponseBlock );
181
181
XCTAssertNil (fetcher.retryBlock );
182
- if (@available(iOS 10.0, *)) {
183
- XCTAssertNil(fetcher.metricsCollectionBlock);
184
- }
182
+ XCTAssertNil (fetcher.metricsCollectionBlock );
185
183
XCTAssertNil (fetcher.testBlock );
186
184
187
185
if ([fetcher isKindOfClass: [GTMSessionUploadFetcher class ]]) {
@@ -2162,8 +2160,7 @@ - (void)testInsecureRequests_WithoutFetcherService {
2162
2160
[self testInsecureRequests ];
2163
2161
}
2164
2162
2165
- - (void)testCollectingMetrics_WithSuccessfulFetch API_AVAILABLE(ios(10.0), macosx(10.12),
2166
- tvos(10.0), watchos(6.0)) {
2163
+ - (void )testCollectingMetrics_WithSuccessfulFetch {
2167
2164
if (!_isServerRunning) return ;
2168
2165
2169
2166
CREATE_START_STOP_NOTIFICATION_EXPECTATIONS (1 , 1 );
@@ -2197,15 +2194,12 @@ - (void)testCollectingMetrics_WithSuccessfulFetch API_AVAILABLE(ios(10.0), macos
2197
2194
XCTAssertNotNil (collectedMetrics.transactionMetrics [0 ].responseEndDate );
2198
2195
}
2199
2196
2200
- - (void)testCollectingMetrics_WithSuccessfulFetch_WithoutFetcherService API_AVAILABLE(
2201
- ios(10.0), macosx(10.12), tvos(10.0), watchos(6.0)) {
2197
+ - (void )testCollectingMetrics_WithSuccessfulFetch_WithoutFetcherService {
2202
2198
_fetcherService = nil ;
2203
2199
[self testCollectingMetrics_WithSuccessfulFetch ];
2204
2200
}
2205
2201
2206
- - (void)testCollectingMetrics_WithWrongFetch_FaildToConnect API_AVAILABLE(ios(10.0), macosx(10.12),
2207
- tvos(10.0),
2208
- watchos(6.0)) {
2202
+ - (void )testCollectingMetrics_WithWrongFetch_FaildToConnect {
2209
2203
if (!_isServerRunning) return ;
2210
2204
2211
2205
CREATE_START_STOP_NOTIFICATION_EXPECTATIONS (1 , 1 );
@@ -2243,14 +2237,12 @@ - (void)testCollectingMetrics_WithWrongFetch_FaildToConnect API_AVAILABLE(ios(10
2243
2237
XCTAssertNil (collectedMetrics.transactionMetrics [0 ].responseEndDate );
2244
2238
}
2245
2239
2246
- - (void)testCollectingMetrics_WithWrongFetch_FaildToConnect_WithoutFetcherService API_AVAILABLE(
2247
- ios(10.0), macosx(10.12), tvos(10.0), watchos(6.0)) {
2240
+ - (void )testCollectingMetrics_WithWrongFetch_FaildToConnect_WithoutFetcherService {
2248
2241
_fetcherService = nil ;
2249
2242
[self testCollectingMetrics_WithWrongFetch_FaildToConnect ];
2250
2243
}
2251
2244
2252
- - (void)testCollectingMetrics_WithWrongFetch_BadStatusCode API_AVAILABLE(ios(10.0), macosx(10.12),
2253
- tvos(10.0), watchos(6.0)) {
2245
+ - (void )testCollectingMetrics_WithWrongFetch_BadStatusCode {
2254
2246
if (!_isServerRunning) return ;
2255
2247
2256
2248
CREATE_START_STOP_NOTIFICATION_EXPECTATIONS (1 , 1 );
@@ -2290,8 +2282,7 @@ - (void)testCollectingMetrics_WithWrongFetch_BadStatusCode API_AVAILABLE(ios(10.
2290
2282
XCTAssertNotNil (collectedMetrics.transactionMetrics [0 ].responseEndDate );
2291
2283
}
2292
2284
2293
- - (void)testCollectingMetrics_WithWrongFetch_BadStatusCode_WithoutFetcherService API_AVAILABLE(
2294
- ios(10.0), macosx(10.12), tvos(10.0), watchos(6.0)) {
2285
+ - (void )testCollectingMetrics_WithWrongFetch_BadStatusCode_WithoutFetcherService {
2295
2286
_fetcherService = nil ;
2296
2287
[self testCollectingMetrics_WithWrongFetch_BadStatusCode ];
2297
2288
}
0 commit comments