1 files changed, 23 insertions, 24 deletions
diff --git a/test/storage/sqlite.test.cpp b/test/storage/sqlite.test.cpp
index 36715a2fd0..553736a0b1 100644
--- a/test/storage/sqlite.test.cpp
+++ b/test/storage/sqlite.test.cpp
@@ -6,33 +6,32 @@
 TEST(SQLite, Statement) {
     using namespace mbgl;
 
-    mapbox::sqlite::Database db(":memory:", mapbox::sqlite::Create | mapbox::sqlite::ReadWrite);
+    mapbox::sqlite::Database db = mapbox::sqlite::Database::open(":memory:", mapbox::sqlite::Create | mapbox::sqlite::ReadWrite);
     db.exec("CREATE TABLE test (id INTEGER);");
 
-    mapbox::sqlite::Statement stmt1 = db.prepare("INSERT INTO test (id) VALUES (?1);");
-    ASSERT_EQ(stmt1.lastInsertRowId(), 0);
-    ASSERT_EQ(stmt1.changes(), 0u);
-    stmt1.bind(1, 10);
-    stmt1.run();
-    ASSERT_EQ(stmt1.lastInsertRowId(), 1);
-    ASSERT_EQ(stmt1.changes(), 1u);
+    mapbox::sqlite::Statement stmt1{ db, "INSERT INTO test (id) VALUES (?1);" };
+    mapbox::sqlite::Query query1{ stmt1 };
+    ASSERT_EQ(query1.lastInsertRowId(), 0);
+    ASSERT_EQ(query1.changes(), 0u);
+    query1.bind(1, 10);
+    query1.run();
+    ASSERT_EQ(query1.lastInsertRowId(), 1);
+    ASSERT_EQ(query1.changes(), 1u);
 
-    mapbox::sqlite::Statement stmt2 = db.prepare("INSERT INTO test (id) VALUES (?1);");
-    ASSERT_EQ(stmt2.lastInsertRowId(), 0);
-    ASSERT_EQ(stmt2.changes(), 0u);
-    stmt2.bind(1, 20);
-    stmt2.run();
-    ASSERT_EQ(stmt2.lastInsertRowId(), 2);
-    ASSERT_EQ(stmt2.changes(), 1u);
+    mapbox::sqlite::Statement stmt2{ db, "INSERT INTO test (id) VALUES (?1);" };
+    mapbox::sqlite::Query query2{ stmt2 };
+    ASSERT_EQ(query2.lastInsertRowId(), 0);
+    ASSERT_EQ(query2.changes(), 0u);
+    query2.bind(1, 20);
+    query2.run();
+    ASSERT_EQ(query2.lastInsertRowId(), 2);
+    ASSERT_EQ(query2.changes(), 1u);
 }
 
-TEST(SQLite, TEST_REQUIRES_WRITE(CantOpenException)) {
-    try {
-        // Should throw a CANTOPEN when the database doesn't exist,
-        // make sure all the backends behave the same way.
-        mapbox::sqlite::Database("test/fixtures/offline_database/foobar123.db", mapbox::sqlite::ReadOnly);
-        FAIL();
-    } catch (mapbox::sqlite::Exception& ex) {
-        ASSERT_EQ(ex.code, mapbox::sqlite::Exception::Code::CANTOPEN);
-    }
+TEST(SQLite, TEST_REQUIRES_WRITE(TryOpen)) {
+    // Should return a CANTOPEN exception when the database doesn't exist,
+    // make sure all the backends behave the same way.
+    auto result = mapbox::sqlite::Database::tryOpen("test/fixtures/offline_database/foobar123.db", mapbox::sqlite::ReadOnly);
+    ASSERT_TRUE(result.is<mapbox::sqlite::Exception>());
+    ASSERT_EQ(result.get<mapbox::sqlite::Exception>().code, mapbox::sqlite::ResultCode::CantOpen);
 }