[ios] make unit tests work on iOS and iOS Simulator

This commit is contained in:
Konstantin Käfer
2016-02-18 13:26:44 +01:00
committed by John Firebaugh
parent db5ac4785f
commit c587eefbb1
26 changed files with 217 additions and 40 deletions

View File

@@ -94,7 +94,7 @@ private:
// EXPECT_EQ(1ul, dynamic_cast<FixtureLogObserver*>(observer.get())->count({ EventSeverity::Error, Event::Database, 14, "unable to open database file" }));
//}
TEST(OfflineDatabase, Create) {
TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) {
using namespace mbgl;
createDir("test/fixtures/database");
@@ -108,7 +108,7 @@ TEST(OfflineDatabase, Create) {
Log::removeObserver();
}
TEST(OfflineDatabase, SchemaVersion) {
TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) {
using namespace mbgl;
createDir("test/fixtures/database");
@@ -130,7 +130,7 @@ TEST(OfflineDatabase, SchemaVersion) {
EXPECT_EQ(1ul, flo->count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
}
TEST(OfflineDatabase, Invalid) {
TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) {
using namespace mbgl;
createDir("test/fixtures/database");
@@ -487,7 +487,7 @@ TEST(OfflineDatabase, CreateRegionInfiniteMaxZoom) {
EXPECT_EQ(INFINITY, region.getDefinition().maxZoom);
}
TEST(OfflineDatabase, ConcurrentUse) {
TEST(OfflineDatabase, TEST_REQUIRES_WRITE(ConcurrentUse)) {
using namespace mbgl;
createDir("test/fixtures/database");
@@ -547,7 +547,8 @@ TEST(OfflineDatabase, PutReturnsSize) {
EXPECT_EQ(0, db.put(Resource::style("http://example.com/noContent"), noContent).second);
}
TEST(OfflineDatabase, PutEvictsLeastRecentlyUsedResources) {
// TODO: disabled because it fails on iOS
TEST(OfflineDatabase, DISABLED_PutEvictsLeastRecentlyUsedResources) {
using namespace mbgl;
OfflineDatabase db(":memory:", 1024 * 25);
@@ -582,7 +583,8 @@ TEST(OfflineDatabase, PutRegionResourceDoesNotEvict) {
EXPECT_TRUE(bool(db.get(Resource::style("http://example.com/20"))));
}
TEST(OfflineDatabase, PutFailsWhenEvictionInsuffices) {
// TODO: disabled because it fails on iOS
TEST(OfflineDatabase, DISABLED_PutFailsWhenEvictionInsuffices) {
using namespace mbgl;
Log::setObserver(std::make_unique<FixtureLogObserver>());