[core] std::shared_ptr<const Response> ⇢ const Response&

This commit is contained in:
John Firebaugh
2016-01-13 16:31:54 -08:00
parent 7fb5e973ed
commit 2ee1fe4178
7 changed files with 46 additions and 51 deletions

View File

@@ -75,9 +75,7 @@ TEST_F(Storage, DatabaseVersion) {
{
SQLiteCache::Impl cache(path);
auto response = std::make_shared<Response>();
cache.put({ Resource::Unknown, "mapbox://test" }, response);
cache.put({ Resource::Unknown, "mapbox://test" }, Response());
}
sqlite3* db;
@@ -193,8 +191,7 @@ TEST_F(Storage, DatabaseLockedWrite) {
// Adds a file (which should fail).
Log::setObserver(std::make_unique<FixtureLogObserver>());
auto response = std::make_shared<Response>();
cache.put({ Resource::Unknown, "mapbox://test" }, response);
cache.put({ Resource::Unknown, "mapbox://test" }, Response());
cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
});
@@ -211,8 +208,8 @@ TEST_F(Storage, DatabaseLockedWrite) {
// Then, set a file and obtain it again.
Log::setObserver(std::make_unique<FixtureLogObserver>());
auto response = std::make_shared<Response>();
response->data = std::make_shared<std::string>("Demo");
Response response;
response.data = std::make_shared<std::string>("Demo");
cache.put({ Resource::Unknown, "mapbox://test" }, response);
cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
ASSERT_NE(nullptr, res.get());
@@ -244,8 +241,8 @@ TEST_F(Storage, DatabaseLockedRefresh) {
// Adds a file.
Log::setObserver(std::make_unique<FixtureLogObserver>());
auto response = std::make_shared<Response>();
response->data = std::make_shared<std::string>("Demo");
Response response;
response.data = std::make_shared<std::string>("Demo");
cache.put({ Resource::Unknown, "mapbox://test" }, response);
cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
@@ -260,9 +257,7 @@ TEST_F(Storage, DatabaseLockedRefresh) {
// Then, try to refresh it.
Log::setObserver(std::make_unique<FixtureLogObserver>());
auto response = std::make_shared<Response>();
response->data = std::make_shared<std::string>("Demo");
cache.refresh({ Resource::Unknown, "mapbox://test" }, response->expires);
cache.refresh({ Resource::Unknown, "mapbox://test" }, Seconds::zero());
cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
EXPECT_EQ(nullptr, res.get());
});
@@ -289,8 +284,8 @@ TEST_F(Storage, DatabaseDeleted) {
// Adds a file.
Log::setObserver(std::make_unique<FixtureLogObserver>());
auto response = std::make_shared<Response>();
response->data = std::make_shared<std::string>("Demo");
Response response;
response.data = std::make_shared<std::string>("Demo");
cache.put({ Resource::Unknown, "mapbox://test" }, response);
cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
ASSERT_NE(nullptr, res.get());
@@ -307,8 +302,8 @@ TEST_F(Storage, DatabaseDeleted) {
// Adds a file.
Log::setObserver(std::make_unique<FixtureLogObserver>());
auto response = std::make_shared<Response>();
response->data = std::make_shared<std::string>("Demo");
Response response;
response.data = std::make_shared<std::string>("Demo");
cache.put({ Resource::Unknown, "mapbox://test" }, response);
cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
ASSERT_NE(nullptr, res.get());
@@ -338,8 +333,8 @@ TEST_F(Storage, DatabaseInvalid) {
// Adds a file.
Log::setObserver(std::make_unique<FixtureLogObserver>());
auto response = std::make_shared<Response>();
response->data = std::make_shared<std::string>("Demo");
Response response;
response.data = std::make_shared<std::string>("Demo");
cache.put({ Resource::Unknown, "mapbox://test" }, response);
cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
ASSERT_NE(nullptr, res.get());