diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-05-26 15:18:27 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-05-26 17:57:38 +0200 |
| commit | f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed (patch) | |
| tree | 31102ca2b739d2b21fcfc231585830969f2b4fa4 /test/storage | |
| parent | fdf6026e6249f99b260f15ec672a35c7e9db950d (diff) | |
| download | qtlocation-mapboxgl-f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed.tar.gz | |
Replace mbgl::util::make_unique<> with std::make_unique<>
Diffstat (limited to 'test/storage')
| -rw-r--r-- | test/storage/database.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/storage/database.cpp b/test/storage/database.cpp index a44c7ff4b4..b54b69a133 100644 --- a/test/storage/database.cpp +++ b/test/storage/database.cpp @@ -11,7 +11,7 @@ TEST_F(Storage, DatabaseDoesNotExist) { using namespace mbgl; - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); SQLiteCache::Impl cache(nullptr, "test/fixtures/404/cache.db"); @@ -52,7 +52,7 @@ TEST_F(Storage, DatabaseCreate) { createDir("test/fixtures/database"); deleteFile("test/fixtures/database/cache.db"); - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); SQLiteCache::Impl cache(nullptr, "test/fixtures/database/cache.db"); @@ -113,7 +113,7 @@ TEST_F(Storage, DatabaseLockedRead) { { // First request should fail. - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" }); EXPECT_EQ(nullptr, res.get()); @@ -129,7 +129,7 @@ TEST_F(Storage, DatabaseLockedRead) { { // First, try getting a file (the cache value should not exist). - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); std::unique_ptr<Response> res = cache.get({ Resource::Unknown, "mapbox://test" }); EXPECT_EQ(nullptr, res.get()); @@ -153,7 +153,7 @@ TEST_F(Storage, DatabaseLockedWrite) { { // Adds a file (which should fail). - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); auto response = std::make_shared<Response>(); cache.put({ Resource::Unknown, "mapbox://test" }, response); @@ -170,7 +170,7 @@ TEST_F(Storage, DatabaseLockedWrite) { { // Then, set a file and obtain it again. - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); auto response = std::make_shared<Response>(); response->data = "Demo"; @@ -201,7 +201,7 @@ TEST_F(Storage, DatabaseLockedRefresh) { { // Adds a file. - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); auto response = std::make_shared<Response>(); response->data = "Demo"; @@ -216,7 +216,7 @@ TEST_F(Storage, DatabaseLockedRefresh) { { // Then, try to refresh it. - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); auto response = std::make_shared<Response>(); response->data = "Demo"; @@ -244,7 +244,7 @@ TEST_F(Storage, DatabaseDeleted) { { // Adds a file. - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); auto response = std::make_shared<Response>(); response->data = "Demo"; @@ -260,7 +260,7 @@ TEST_F(Storage, DatabaseDeleted) { { // Adds a file. - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); auto response = std::make_shared<Response>(); response->data = "Demo"; @@ -289,7 +289,7 @@ TEST_F(Storage, DatabaseInvalid) { { // Adds a file. - Log::setObserver(util::make_unique<FixtureLogObserver>()); + Log::setObserver(std::make_unique<FixtureLogObserver>()); auto response = std::make_shared<Response>(); response->data = "Demo"; |