[ios] moved tests, renamed resetDatabase example

2 files changed, 29 insertions, 21 deletions

diff --git a/platform/darwin/test/MGLOfflineStorageTests.mm b/platform/darwin/test/MGLOfflineStorageTests.mm
index f91c8958d3..47646a83f6 100644
--- a/platform/darwin/test/MGLOfflineStorageTests.mm
+++ b/platform/darwin/test/MGLOfflineStorageTests.mm
@@ -201,6 +201,33 @@
     pack = nil;
 }
 
+- (void)testInvalidateAmbientCache {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Expect cache to be invalidated without an error."];
+    [[MGLOfflineStorage sharedOfflineStorage] invalidateAmbientCacheWithCompletion:^(NSError * _Nullable error) {
+        XCTAssertNil(error);
+        [expectation fulfill];
+    }];
+    [self waitForExpectationsWithTimeout:30 handler:nil];
+}
+
+- (void)testClearCache {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Expect cache to be cleared without an error."];
+    [[MGLOfflineStorage sharedOfflineStorage] clearAmbientCacheWithCompletion:^(NSError * _Nullable error) {
+        XCTAssertNil(error);
+        [expectation fulfill];
+    }];
+    [self waitForExpectationsWithTimeout:10 handler:nil];
+}
+
+- (void)testResetDatabase {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Expect database to be reset without an error."];
+    [[MGLOfflineStorage sharedOfflineStorage] resetDatabaseWithCompletionHandler:^(NSError * _Nullable error) {
+        XCTAssertNil(error);
+        [expectation fulfill];
+    }];
+    [self waitForExpectationsWithTimeout:10 handler:nil];
+}
+
 - (void)testBackupExclusion {
     NSURL *cacheDirectoryURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory
                                                                       inDomain:NSUserDomainMask
@@ -413,23 +440,4 @@
     CFRunLoopRun();
 }
 
-- (void)testInvalidateAmbientCache {
-    [[MGLOfflineStorage sharedOfflineStorage] invalidateAmbientCacheWithCompletion:^(NSError * _Nullable error) {
-        XCTAssertNil(error);
-    }];
-}
-
-- (void)testClearCache {
-    [[MGLOfflineStorage sharedOfflineStorage] clearAmbientCacheWithCompletion:^(NSError * _Nullable error) {
-        XCTAssertNil(error);
-    }];
-}
-
-- (void)testResetDatabase {
-    [[MGLOfflineStorage sharedOfflineStorage] resetDatabaseWithCompletionHandler:^(NSError * _Nullable error) {
-        XCTAssertNil(error);
-    }];
-}
-
-
 @end
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 1ca55fe34f..032852d08f 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -443,7 +443,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
                 @"View Route Simulation",
                 @"Ornaments Placement",
                 @"Invalidate Ambient Cache",
-                @"Clear Database",
+                @"Reset Database",
                 @"Reset Ambient Cache",
             ]];
 
@@ -1801,7 +1801,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
         if (!error) {
             CFTimeInterval end = CACurrentMediaTime();
             CFTimeInterval difference = end - start;
-            NSLog(@"clearDatabase\nStarted: %f\nEnded: %f\nTotal Time: %f", start, end, difference);
+            NSLog(@"resetDatabase\nStarted: %f\nEnded: %f\nTotal Time: %f", start, end, difference);
         }
     }];
 }