2 files changed, 4 insertions, 27 deletions
diff --git a/test/storage/offline_database.test.cpp b/test/storage/offline_database.test.cpp
index e54cd6813b..36b71bc4b4 100644
--- a/test/storage/offline_database.test.cpp
+++ b/test/storage/offline_database.test.cpp
@@ -23,17 +23,6 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) {
     OfflineDatabase db(filename);
     EXPECT_FALSE(bool(db.get({ Resource::Unknown, "mapbox://test" })));
 
-#ifdef __QT__
-    // Qt doesn't support opening a SQLite database without also creating it if it doesn't exist yet.
-    // Therefore, we're currently using the code path that thinks that we opened an old database
-    // (user_version = 0), deletes and recreates the database.
-    EXPECT_EQ(1u, log.count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
-#endif
-#ifndef __QT__
-    // Only non-Qt platforms are setting a logger on the SQLite object.
-    EXPECT_EQ(1u, log.count({ EventSeverity::Info, Event::Database, static_cast<int64_t>(mapbox::sqlite::ResultCode::CantOpen), "cannot open file" }, true));
-    EXPECT_EQ(1u, log.count({ EventSeverity::Info, Event::Database, static_cast<int64_t>(mapbox::sqlite::ResultCode::CantOpen), "No such file or directory" }, true));
-#endif
     EXPECT_EQ(0u, log.uncheckedCount());
 }
 
@@ -42,13 +31,12 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) {
     util::deleteFile(filename);
 
     {
-        mapbox::sqlite::Database db = mapbox::sqlite::Database::open(filename, mapbox::sqlite::Create | mapbox::sqlite::ReadWrite);
+        mapbox::sqlite::Database db = mapbox::sqlite::Database::open(filename, mapbox::sqlite::ReadWriteCreate);
         db.exec("PRAGMA user_version = 1");
     }
 
     OfflineDatabase db(filename);
 
-    EXPECT_EQ(1u, log.count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
     EXPECT_EQ(0u, log.uncheckedCount());
 }
 
@@ -339,17 +327,6 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(ConcurrentUse)) {
     util::deleteFile(filename);
 
     OfflineDatabase db1(filename);
-#ifdef __QT__
-    // Qt doesn't support opening a SQLite database without also creating it if it doesn't exist yet.
-    // Therefore, we're currently using the code path that thinks that we opened an old database
-    // (user_version = 0), deletes and recreates the database.
-    EXPECT_EQ(1u, log.count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
-#endif
-#ifndef __QT__
-    // Only non-Qt platforms are setting a logger on the SQLite object.
-    EXPECT_EQ(1u, log.count({ EventSeverity::Info, Event::Database, static_cast<int64_t>(mapbox::sqlite::ResultCode::CantOpen), "cannot open file" }, true));
-    EXPECT_EQ(1u, log.count({ EventSeverity::Info, Event::Database, static_cast<int64_t>(mapbox::sqlite::ResultCode::CantOpen), "No such file or directory" }, true));
-#endif
     EXPECT_EQ(0u, log.uncheckedCount());
 
     OfflineDatabase db2(filename);
diff --git a/test/storage/sqlite.test.cpp b/test/storage/sqlite.test.cpp
index a7c9d95e9b..22958c8bed 100644
--- a/test/storage/sqlite.test.cpp
+++ b/test/storage/sqlite.test.cpp
@@ -8,7 +8,7 @@ using namespace mbgl;
 TEST(SQLite, Statement) {
     using namespace mbgl;
 
-    mapbox::sqlite::Database db = mapbox::sqlite::Database::open(":memory:", mapbox::sqlite::Create | mapbox::sqlite::ReadWrite);
+    mapbox::sqlite::Database db = mapbox::sqlite::Database::open(":memory:", mapbox::sqlite::ReadWriteCreate);
     db.exec("CREATE TABLE test (id INTEGER);");
 
     mapbox::sqlite::Statement stmt1{ db, "INSERT INTO test (id) VALUES (?1);" };
@@ -49,7 +49,7 @@ TEST(SQLite, TEST_REQUIRES_WRITE(TryOpen)) {
 
 TEST(SQLite, CloseDatabaseWithPendingTransaction) {
     auto db = std::make_unique<mapbox::sqlite::Database>(mapbox::sqlite::Database::open(
-        ":memory:", mapbox::sqlite::ReadWrite | mapbox::sqlite::Create));
+        ":memory:", mapbox::sqlite::ReadWriteCreate));
     mapbox::sqlite::Transaction transaction(*db);
     transaction.commit();
 }
@@ -58,7 +58,7 @@ TEST(SQLite, CloseMovedDatabaseWithPendingTransaction) {
     // Verifies that we can correctly commit a transaction even if we move the Database object to
     // another address.
     auto db1 = mapbox::sqlite::Database::open(":memory:",
-                                              mapbox::sqlite::ReadWrite | mapbox::sqlite::Create);
+                                              mapbox::sqlite::ReadWriteCreate);
     std::unique_ptr<mapbox::sqlite::Database> db2;
     mapbox::sqlite::Transaction transaction(db1);
     db2 = std::make_unique<mapbox::sqlite::Database>(std::move(db1));