Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Prepare for more DefaultFileSource changes #12072

Merged
merged 9 commits into from
Jun 12, 2018
+350 −346
Merged

Prepare for more DefaultFileSource changes #12072

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
77cf898
[test] pull out using namespace mbgl to reduce verbosity
kkaefer Jun 7, 2018
9709e72
[test] standardize on database file name and move I/O functions to util
kkaefer Jun 7, 2018
45b196b
[test] add partial message matching support to FixtureLog
kkaefer Jun 7, 2018
b12a177
[core] allow logging error codes and formatting strings at the same time
kkaefer Jun 7, 2018
432b559
[core] send all SQLite log messages to the Info bucket and add error …
kkaefer Jun 7, 2018
b0f24a9
[test] verify log messages of OfflineDatabase tests
kkaefer Jun 7, 2018
06bb3ae
[core] support moving Database object during a Transaction
kkaefer Jun 7, 2018
56cf8e7
[core] remove unused flags from SQLite header
kkaefer Jun 7, 2018
4b7ec06
[core] consolidate database opening workflow
kkaefer Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[test] pull out using namespace mbgl to reduce verbosity
  • Loading branch information
@kkaefer
kkaefer committed Jun 12, 2018
commit 77cf8984d14db3254c0a6b280bdf2ca01b53685c
69 changes: 3 additions & 66 deletions test/storage/offline_database.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <random>

using namespace std::literals::string_literals;
using namespace mbgl;

namespace {

Expand All @@ -35,18 +36,16 @@ void deleteFile(const char* name) {
}

void writeFile(const char* name, const std::string& data) {
mbgl::util::write_file(name, data);
util::write_file(name, data);
}

void copyFile(const char* orig, const char* dest) {
mbgl::util::write_file(dest, mbgl::util::read_file(orig));
util::write_file(dest, util::read_file(orig));
}

} // namespace

TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) {
using namespace mbgl;

createDir("test/fixtures/offline_database");
deleteFile("test/fixtures/offline_database/offline.db");

Expand All @@ -59,8 +58,6 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) {
}

TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) {
using namespace mbgl;

createDir("test/fixtures/offline_database");
deleteFile("test/fixtures/offline_database/offline.db");
std::string path("test/fixtures/offline_database/offline.db");
Expand All @@ -79,8 +76,6 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) {
}

TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) {
using namespace mbgl;

createDir("test/fixtures/offline_database");
deleteFile("test/fixtures/offline_database/invalid.db");
writeFile("test/fixtures/offline_database/invalid.db", "this is an invalid file");
Expand All @@ -95,8 +90,6 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) {
}

TEST(OfflineDatabase, PutDoesNotStoreConnectionErrors) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Resource resource { Resource::Unknown, "http://example.com/" };
Expand All @@ -108,8 +101,6 @@ TEST(OfflineDatabase, PutDoesNotStoreConnectionErrors) {
}

TEST(OfflineDatabase, PutDoesNotStoreServerErrors) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Resource resource { Resource::Unknown, "http://example.com/" };
Expand All @@ -121,8 +112,6 @@ TEST(OfflineDatabase, PutDoesNotStoreServerErrors) {
}

TEST(OfflineDatabase, PutResource) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Resource resource { Resource::Style, "http://example.com/" };
Expand All @@ -148,8 +137,6 @@ TEST(OfflineDatabase, PutResource) {
}

TEST(OfflineDatabase, TEST_REQUIRES_WRITE(GetResourceFromOfflineRegion)) {
using namespace mbgl;

createDir("test/fixtures/offline_database");
deleteFile("test/fixtures/offline_database/satellite.db");
copyFile("test/fixtures/offline_database/satellite_test.db", "test/fixtures/offline_database/satellite.db");
Expand All @@ -161,8 +148,6 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(GetResourceFromOfflineRegion)) {
}

TEST(OfflineDatabase, PutAndGetResource) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Response response1;
Expand All @@ -178,8 +163,6 @@ TEST(OfflineDatabase, PutAndGetResource) {
}

TEST(OfflineDatabase, PutTile) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Resource resource { Resource::Tile, "http://example.com/" };
Expand Down Expand Up @@ -212,8 +195,6 @@ TEST(OfflineDatabase, PutTile) {
}

TEST(OfflineDatabase, PutResourceNoContent) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Resource resource { Resource::Style, "http://example.com/" };
Expand All @@ -228,8 +209,6 @@ TEST(OfflineDatabase, PutResourceNoContent) {
}

TEST(OfflineDatabase, PutTileNotFound) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Resource resource { Resource::Tile, "http://example.com/" };
Expand All @@ -251,8 +230,6 @@ TEST(OfflineDatabase, PutTileNotFound) {
}

TEST(OfflineDatabase, CreateRegion) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "http://example.com/style", LatLngBounds::hull({1, 2}, {3, 4}), 5, 6, 2.0 };
OfflineRegionMetadata metadata {{ 1, 2, 3 }};
Expand All @@ -267,8 +244,6 @@ TEST(OfflineDatabase, CreateRegion) {
}

TEST(OfflineDatabase, UpdateMetadata) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "http://example.com/style", LatLngBounds::hull({1, 2}, {3, 4}), 5, 6, 2.0 };
OfflineRegionMetadata metadata {{ 1, 2, 3 }};
Expand All @@ -280,8 +255,6 @@ TEST(OfflineDatabase, UpdateMetadata) {
}

TEST(OfflineDatabase, ListRegions) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "http://example.com/style", LatLngBounds::hull({1, 2}, {3, 4}), 5, 6, 2.0 };
OfflineRegionMetadata metadata {{ 1, 2, 3 }};
Expand All @@ -300,8 +273,6 @@ TEST(OfflineDatabase, ListRegions) {
}

TEST(OfflineDatabase, GetRegionDefinition) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "http://example.com/style", LatLngBounds::hull({1, 2}, {3, 4}), 5, 6, 2.0 };
OfflineRegionMetadata metadata {{ 1, 2, 3 }};
Expand All @@ -317,8 +288,6 @@ TEST(OfflineDatabase, GetRegionDefinition) {
}

TEST(OfflineDatabase, DeleteRegion) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "http://example.com/style", LatLngBounds::hull({1, 2}, {3, 4}), 5, 6, 2.0 };
OfflineRegionMetadata metadata {{ 1, 2, 3 }};
Expand All @@ -336,8 +305,6 @@ TEST(OfflineDatabase, DeleteRegion) {
}

TEST(OfflineDatabase, CreateRegionInfiniteMaxZoom) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "", LatLngBounds::world(), 0, INFINITY, 1.0 };
OfflineRegionMetadata metadata;
Expand All @@ -348,8 +315,6 @@ TEST(OfflineDatabase, CreateRegionInfiniteMaxZoom) {
}

TEST(OfflineDatabase, TEST_REQUIRES_WRITE(ConcurrentUse)) {
using namespace mbgl;

createDir("test/fixtures/offline_database");
deleteFile("test/fixtures/offline_database/offline.db");

Expand Down Expand Up @@ -390,8 +355,6 @@ static std::shared_ptr<std::string> randomString(size_t size) {
}

TEST(OfflineDatabase, PutReturnsSize) {
using namespace mbgl;

OfflineDatabase db(":memory:");

Response compressible;
Expand All @@ -408,8 +371,6 @@ TEST(OfflineDatabase, PutReturnsSize) {
}

TEST(OfflineDatabase, PutEvictsLeastRecentlyUsedResources) {
using namespace mbgl;

OfflineDatabase db(":memory:", 1024 * 100);

Response response;
Expand All @@ -425,8 +386,6 @@ TEST(OfflineDatabase, PutEvictsLeastRecentlyUsedResources) {
}

TEST(OfflineDatabase, PutRegionResourceDoesNotEvict) {
using namespace mbgl;

OfflineDatabase db(":memory:", 1024 * 100);
OfflineRegionDefinition definition { "", LatLngBounds::world(), 0, INFINITY, 1.0 };
OfflineRegion region = db.createRegion(definition, OfflineRegionMetadata());
Expand All @@ -443,8 +402,6 @@ TEST(OfflineDatabase, PutRegionResourceDoesNotEvict) {
}

TEST(OfflineDatabase, PutFailsWhenEvictionInsuffices) {
using namespace mbgl;

OfflineDatabase db(":memory:", 1024 * 100);

Response big;
Expand All @@ -455,8 +412,6 @@ TEST(OfflineDatabase, PutFailsWhenEvictionInsuffices) {
}

TEST(OfflineDatabase, GetRegionCompletedStatus) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "http://example.com/style", LatLngBounds::hull({1, 2}, {3, 4}), 5, 6, 2.0 };
OfflineRegionMetadata metadata;
Expand Down Expand Up @@ -489,8 +444,6 @@ TEST(OfflineDatabase, GetRegionCompletedStatus) {
}

TEST(OfflineDatabase, HasRegionResource) {
using namespace mbgl;

OfflineDatabase db(":memory:", 1024 * 100);
OfflineRegionDefinition definition { "", LatLngBounds::world(), 0, INFINITY, 1.0 };
OfflineRegion region = db.createRegion(definition, OfflineRegionMetadata());
Expand All @@ -511,8 +464,6 @@ TEST(OfflineDatabase, HasRegionResource) {
}

TEST(OfflineDatabase, HasRegionResourceTile) {
using namespace mbgl;

OfflineDatabase db(":memory:", 1024 * 100);
OfflineRegionDefinition definition { "", LatLngBounds::world(), 0, INFINITY, 1.0 };
OfflineRegion region = db.createRegion(definition, OfflineRegionMetadata());
Expand Down Expand Up @@ -542,8 +493,6 @@ TEST(OfflineDatabase, HasRegionResourceTile) {
}

TEST(OfflineDatabase, OfflineMapboxTileCount) {
using namespace mbgl;

OfflineDatabase db(":memory:");
OfflineRegionDefinition definition { "http://example.com/style", LatLngBounds::hull({1, 2}, {3, 4}), 5, 6, 2.0 };
OfflineRegionMetadata metadata;
Expand Down Expand Up @@ -600,8 +549,6 @@ TEST(OfflineDatabase, OfflineMapboxTileCount) {


TEST(OfflineDatabase, BatchInsertion) {
using namespace mbgl;

OfflineDatabase db(":memory:", 1024 * 100);
OfflineRegionDefinition definition { "", LatLngBounds::world(), 0, INFINITY, 1.0 };
OfflineRegion region = db.createRegion(definition, OfflineRegionMetadata());
Expand Down Expand Up @@ -697,8 +644,6 @@ static std::vector<std::string> databaseTableColumns(const std::string& path, co
}

TEST(OfflineDatabase, MigrateFromV2Schema) {
using namespace mbgl;

// v2.db is a v2 database containing a single offline region with a small number of resources.

deleteFile("test/fixtures/offline_database/migrated.db");
Expand All @@ -718,8 +663,6 @@ TEST(OfflineDatabase, MigrateFromV2Schema) {
}

TEST(OfflineDatabase, MigrateFromV3Schema) {
using namespace mbgl;

// v3.db is a v3 database, migrated from v2.

deleteFile("test/fixtures/offline_database/migrated.db");
Expand All @@ -737,8 +680,6 @@ TEST(OfflineDatabase, MigrateFromV3Schema) {
}

TEST(OfflineDatabase, MigrateFromV4Schema) {
using namespace mbgl;

// v4.db is a v4 database, migrated from v2 & v3. This database used `journal_mode = WAL` and `synchronous = NORMAL`.

deleteFile("test/fixtures/offline_database/migrated.db");
Expand All @@ -763,8 +704,6 @@ TEST(OfflineDatabase, MigrateFromV4Schema) {


TEST(OfflineDatabase, MigrateFromV5Schema) {
using namespace mbgl;

// v5.db is a v5 database, migrated from v2, v3 & v4.

deleteFile("test/fixtures/offline_database/migrated.db");
Expand All @@ -790,8 +729,6 @@ TEST(OfflineDatabase, MigrateFromV5Schema) {
}

TEST(OfflineDatabase, DowngradeSchema) {
using namespace mbgl;

// v999.db is a v999 database, it should be deleted
// and recreated with the current schema.

Expand Down