From c69e8fc0a6ee61f3b9ced7eef9212103b5962119 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 15 May 2017 15:04:23 +0300 Subject: [tidy] Use NOLINT instead of per-folder .clang-tidy --- benchmark/parse/filter.benchmark.cpp | 5 ++- platform/default/mbgl/storage/.clang-tidy | 2 - platform/default/mbgl/storage/offline.cpp | 5 ++- test/.clang-tidy | 2 - test/actor/actor.test.cpp | 8 ++-- test/actor/actor_ref.test.cpp | 2 +- test/algorithm/covered_by_children.test.cpp | 4 +- test/algorithm/generate_clip_ids.test.cpp | 18 ++++----- test/algorithm/update_renderables.test.cpp | 32 +++++++-------- test/api/annotations.test.cpp | 46 ++++++++++----------- test/api/api_misuse.test.cpp | 4 +- test/api/custom_layer.test.cpp | 2 +- test/api/query.test.cpp | 12 +++--- test/api/render_missing.test.cpp | 8 ++-- test/api/repeated_render.test.cpp | 6 +-- test/geometry/binpack.test.cpp | 4 +- test/gl/bucket.test.cpp | 8 ++-- test/gl/object.test.cpp | 4 +- test/map/map.test.cpp | 48 +++++++++++----------- test/map/transform.test.cpp | 30 +++++++------- test/math/clamp.test.cpp | 4 +- test/math/minmax.test.cpp | 4 +- test/math/wrap.test.cpp | 10 ++--- test/programs/binary_program.test.cpp | 2 +- test/renderer/group_by_layout.test.cpp | 8 ++-- test/sprite/sprite_atlas.test.cpp | 10 ++--- test/sprite/sprite_image_collection.test.cpp | 6 +-- test/sprite/sprite_loader.test.cpp | 12 +++--- test/sprite/sprite_parser.test.cpp | 22 +++++----- test/src/mbgl/test/test.cpp | 4 +- test/src/mbgl/test/util.cpp | 6 +-- test/storage/asset_file_source.test.cpp | 12 +++--- test/storage/default_file_source.test.cpp | 30 +++++++------- test/storage/headers.test.cpp | 2 +- test/storage/http_file_source.test.cpp | 20 ++++----- test/storage/local_file_source.test.cpp | 12 +++--- test/storage/offline.test.cpp | 10 ++--- test/storage/offline_database.test.cpp | 54 ++++++++++++------------- test/storage/offline_download.test.cpp | 30 +++++++------- test/storage/online_file_source.test.cpp | 32 +++++++-------- test/storage/resource.test.cpp | 12 +++--- test/storage/sqlite.test.cpp | 2 +- test/style/conversion/function.test.cpp | 2 +- test/style/conversion/geojson_options.test.cpp | 8 ++-- test/style/conversion/layer.test.cpp | 2 +- test/style/conversion/light.test.cpp | 2 +- test/style/conversion/stringify.test.cpp | 36 ++++++++--------- test/style/filter.test.cpp | 20 ++++----- test/style/function/camera_function.test.cpp | 4 +- test/style/function/composite_function.test.cpp | 2 +- test/style/function/source_function.test.cpp | 4 +- test/style/paint_property.test.cpp | 10 ++--- test/style/source.test.cpp | 24 +++++------ test/style/style.test.cpp | 4 +- test/style/style_image.test.cpp | 10 ++--- test/style/style_layer.test.cpp | 14 +++---- test/style/style_parser.test.cpp | 6 +-- test/text/glyph_atlas.test.cpp | 10 ++--- test/text/glyph_pbf.test.cpp | 2 +- test/text/quads.test.cpp | 4 +- test/tile/annotation_tile.test.cpp | 2 +- test/tile/geojson_tile.test.cpp | 2 +- test/tile/geometry_tile_data.test.cpp | 10 ++--- test/tile/raster_tile.test.cpp | 8 ++-- test/tile/tile_coordinate.test.cpp | 4 +- test/tile/tile_id.test.cpp | 6 +-- test/tile/vector_tile.test.cpp | 8 ++-- test/util/async_task.test.cpp | 10 ++--- test/util/geo.test.cpp | 28 ++++++------- test/util/http_timeout.test.cpp | 16 ++++---- test/util/image.test.cpp | 24 +++++------ test/util/mapbox.test.cpp | 16 ++++---- test/util/memory.test.cpp | 6 +-- test/util/merge_lines.test.cpp | 10 ++--- test/util/number_conversions.test.cpp | 2 +- test/util/offscreen_texture.test.cpp | 4 +- test/util/position.test.cpp | 2 +- test/util/projection.test.cpp | 6 +-- test/util/run_loop.test.cpp | 6 +-- test/util/text_conversions.test.cpp | 4 +- test/util/thread.test.cpp | 20 ++++----- test/util/thread_local.test.cpp | 6 +-- test/util/tile_cover.test.cpp | 22 +++++----- test/util/timer.test.cpp | 12 +++--- test/util/token.test.cpp | 2 +- test/util/url.test.cpp | 20 ++++----- test/util/work_queue.test.cpp | 4 +- 87 files changed, 488 insertions(+), 490 deletions(-) delete mode 100644 platform/default/mbgl/storage/.clang-tidy delete mode 100644 test/.clang-tidy diff --git a/benchmark/parse/filter.benchmark.cpp b/benchmark/parse/filter.benchmark.cpp index d650cb72c9..e1e939f2ab 100644 --- a/benchmark/parse/filter.benchmark.cpp +++ b/benchmark/parse/filter.benchmark.cpp @@ -19,8 +19,9 @@ style::Filter parse(const char* expression) { } static void Parse_Filter(benchmark::State& state) { - while (state.KeepRunning()) { - parse(R"FILTER(["==", "foo", "bar"])FILTER"); + // warning: Attempt to free released memory [clang-analyzer-cplusplus.NewDelete] + while (state.KeepRunning()) { // NOLINT + parse(R"FILTER(["==", "foo", "bar"])FILTER"); // NOLINT } } diff --git a/platform/default/mbgl/storage/.clang-tidy b/platform/default/mbgl/storage/.clang-tidy deleted file mode 100644 index b4ecd26b95..0000000000 --- a/platform/default/mbgl/storage/.clang-tidy +++ /dev/null @@ -1,2 +0,0 @@ -Checks: 'modernize-*,misc-static-assert,llvm-namespace-comment,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-core.uninitialized.UndefReturn,-clang-analyzer-core.StackAddressEscape,-clang-analyzer-core.CallAndMessage,-clang-diagnostic-unused-command-line-argument,-clang-analyzer-core.uninitialized.*,-clang-analyzer-core.NullDereference,-clang-analyzer-cplusplus.NewDelete,-clang-analyzer-unix.MismatchedDeallocator,-clang-analyzer-unix.cstring.NullArg,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-unix.Malloc,-clang-analyzer-core.NonNullParamChecker' -HeaderFilterRegex: '\/mbgl\/' diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/mbgl/storage/offline.cpp index fd2d47819b..8c5f874881 100644 --- a/platform/default/mbgl/storage/offline.cpp +++ b/platform/default/mbgl/storage/offline.cpp @@ -82,8 +82,9 @@ std::string encodeOfflineRegionDefinition(const OfflineRegionDefinition& region) bounds.PushBack(region.bounds.east(), doc.GetAllocator()); doc.AddMember("bounds", bounds, doc.GetAllocator()); - doc.AddMember("min_zoom", region.minZoom, doc.GetAllocator()); - if (std::isfinite(region.maxZoom)) { + // warning: Potential memory leak [clang-analyzer-unix.Malloc] + doc.AddMember("min_zoom", region.minZoom, doc.GetAllocator()); // NOLINT + if (std::isfinite(region.maxZoom)) { // NOLINT doc.AddMember("max_zoom", region.maxZoom, doc.GetAllocator()); } diff --git a/test/.clang-tidy b/test/.clang-tidy deleted file mode 100644 index 492d4affbd..0000000000 --- a/test/.clang-tidy +++ /dev/null @@ -1,2 +0,0 @@ -Checks: 'modernize-*,-modernize-use-equals-delete,-modernize-use-equals-default,misc-static-assert,llvm-namespace-comment,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-core.uninitialized.UndefReturn,-clang-analyzer-core.StackAddressEscape,-clang-analyzer-core.CallAndMessage,-clang-diagnostic-unused-command-line-argument,-clang-analyzer-core.uninitialized.*,-clang-analyzer-core.NullDereference,-clang-analyzer-core.NonNullParamChecker' -HeaderFilterRegex: '\/mbgl\/' diff --git a/test/actor/actor.test.cpp b/test/actor/actor.test.cpp index 03f41a6e64..431323229c 100644 --- a/test/actor/actor.test.cpp +++ b/test/actor/actor.test.cpp @@ -10,7 +10,7 @@ using namespace mbgl; using namespace std::chrono_literals; -TEST(Actor, Construction) { +TEST(Actor, Construction) { // NOLINT // Construction is currently synchronous. It may become asynchronous in the future. struct Test { @@ -26,7 +26,7 @@ TEST(Actor, Construction) { EXPECT_TRUE(constructed); } -TEST(Actor, DestructionClosesMailbox) { +TEST(Actor, DestructionClosesMailbox) { // NOLINT // Destruction blocks until the actor is not receiving. struct Test { @@ -67,7 +67,7 @@ TEST(Actor, DestructionClosesMailbox) { exitingPromise.set_value(); } -TEST(Actor, OrderedMailbox) { +TEST(Actor, OrderedMailbox) { // NOLINT // Messages are processed in order. struct Test { @@ -102,7 +102,7 @@ TEST(Actor, OrderedMailbox) { endedFuture.wait(); } -TEST(Actor, NonConcurrentMailbox) { +TEST(Actor, NonConcurrentMailbox) { // NOLINT // An individual actor is never itself concurrent. struct Test { diff --git a/test/actor/actor_ref.test.cpp b/test/actor/actor_ref.test.cpp index 78721c965e..2d13f21d95 100644 --- a/test/actor/actor_ref.test.cpp +++ b/test/actor/actor_ref.test.cpp @@ -10,7 +10,7 @@ using namespace mbgl; using namespace std::chrono_literals; -TEST(ActorRef, CanOutliveActor) { +TEST(ActorRef, CanOutliveActor) { // NOLINT // An ActorRef can outlive its actor. Doing does not extend the actor's lifetime. // Sending a message to an ActorRef whose actor has died is a no-op. diff --git a/test/algorithm/covered_by_children.test.cpp b/test/algorithm/covered_by_children.test.cpp index b2a219bf29..c9c8bb3331 100644 --- a/test/algorithm/covered_by_children.test.cpp +++ b/test/algorithm/covered_by_children.test.cpp @@ -8,7 +8,7 @@ using namespace mbgl; using List = std::map; -TEST(CoveredByChildren, NotCovered) { +TEST(CoveredByChildren, NotCovered) { // NOLINT const List list1; EXPECT_FALSE(algorithm::coveredByChildren(UnwrappedTileID{ 0, 0, 0 }, list1)); @@ -33,7 +33,7 @@ TEST(CoveredByChildren, NotCovered) { EXPECT_FALSE(algorithm::coveredByChildren(UnwrappedTileID{ 0, 0, 0 }, list3)); } -TEST(CoveredByChildren, Covered) { +TEST(CoveredByChildren, Covered) { // NOLINT const List list1{ { UnwrappedTileID{ 0, 0, 0 }, true }, // all four child tiles diff --git a/test/algorithm/generate_clip_ids.test.cpp b/test/algorithm/generate_clip_ids.test.cpp index 8ca0191b3a..0133eaf332 100644 --- a/test/algorithm/generate_clip_ids.test.cpp +++ b/test/algorithm/generate_clip_ids.test.cpp @@ -48,7 +48,7 @@ namespace { } // end namespace -TEST(GenerateClipIDs, ParentAndFourChildren) { +TEST(GenerateClipIDs, ParentAndFourChildren) { // NOLINT std::map renderables{ { UnwrappedTileID{ 0, 0, 0 }, Renderable{ {} } }, // All four covering children @@ -81,7 +81,7 @@ TEST(GenerateClipIDs, ParentAndFourChildren) { stencils); } -TEST(GenerateClipIDs, ParentAndFourChildrenNegative) { +TEST(GenerateClipIDs, ParentAndFourChildrenNegative) { // NOLINT std::map renderables{ { UnwrappedTileID{ 1, -2, 0 }, Renderable{ {} } }, { UnwrappedTileID{ 1, -2, 1 }, Renderable{ {} } }, @@ -112,7 +112,7 @@ TEST(GenerateClipIDs, ParentAndFourChildrenNegative) { stencils); } -TEST(GenerateClipIDs, NegativeParentAndMissingLevel) { +TEST(GenerateClipIDs, NegativeParentAndMissingLevel) { // NOLINT std::map renderables{ { UnwrappedTileID{ 1, -1, 0 }, Renderable{ {} } }, { UnwrappedTileID{ 2, -1, 0 }, Renderable{ {} } }, @@ -143,7 +143,7 @@ TEST(GenerateClipIDs, NegativeParentAndMissingLevel) { stencils); } -TEST(GenerateClipIDs, SevenOnSameLevel) { +TEST(GenerateClipIDs, SevenOnSameLevel) { // NOLINT std::map renderables{ // first column { UnwrappedTileID{ 2, 0, 0 }, Renderable{ {} } }, @@ -183,7 +183,7 @@ TEST(GenerateClipIDs, SevenOnSameLevel) { stencils); } -TEST(GenerateClipIDs, MultipleLevels) { +TEST(GenerateClipIDs, MultipleLevels) { // NOLINT std::map renderables{ { UnwrappedTileID{ 2, 0, 0 }, Renderable{ {} } }, // begin subtiles of (2/0/0) @@ -239,7 +239,7 @@ TEST(GenerateClipIDs, MultipleLevels) { stencils); } -TEST(GenerateClipIDs, Bug206) { +TEST(GenerateClipIDs, Bug206) { // NOLINT std::map renderables{ { UnwrappedTileID{ 10, 162, 395 }, Renderable{ {} } }, { UnwrappedTileID{ 10, 162, 396 }, Renderable{ {} } }, @@ -291,7 +291,7 @@ TEST(GenerateClipIDs, Bug206) { stencils); } -TEST(GenerateClipIDs, MultipleSources) { +TEST(GenerateClipIDs, MultipleSources) { // NOLINT std::map renderables1{ { UnwrappedTileID{ 0, 0, 0 }, Renderable{ {} } }, { UnwrappedTileID{ 1, 1, 1 }, Renderable{ {} } }, @@ -355,7 +355,7 @@ TEST(GenerateClipIDs, MultipleSources) { stencils); } -TEST(GenerateClipIDs, DuplicateIDs) { +TEST(GenerateClipIDs, DuplicateIDs) { // NOLINT std::map renderables1{ { UnwrappedTileID{ 2, 0, 0 }, Renderable{ {} } }, { UnwrappedTileID{ 2, 0, 1 }, Renderable{ {} } }, @@ -388,7 +388,7 @@ TEST(GenerateClipIDs, DuplicateIDs) { stencils); } -TEST(GenerateClipIDs, SecondSourceHasParentOfFirstSource) { +TEST(GenerateClipIDs, SecondSourceHasParentOfFirstSource) { // NOLINT std::map renderables1{ { UnwrappedTileID{ 1, 0, 0 }, Renderable{ {} } }, }; diff --git a/test/algorithm/update_renderables.test.cpp b/test/algorithm/update_renderables.test.cpp index af90d262de..7bcb9ca7c6 100644 --- a/test/algorithm/update_renderables.test.cpp +++ b/test/algorithm/update_renderables.test.cpp @@ -112,7 +112,7 @@ auto renderTileFn(ActionLog& log) { }; } -TEST(UpdateRenderables, SingleTile) { +TEST(UpdateRenderables, SingleTile) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -256,7 +256,7 @@ TEST(UpdateRenderables, SingleTile) { log); } -TEST(UpdateRenderables, UseParentTile) { +TEST(UpdateRenderables, UseParentTile) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -302,7 +302,7 @@ TEST(UpdateRenderables, UseParentTile) { log); } -TEST(UpdateRenderables, DontUseWrongParentTile) { +TEST(UpdateRenderables, DontUseWrongParentTile) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -379,7 +379,7 @@ TEST(UpdateRenderables, DontUseWrongParentTile) { log); } -TEST(UpdateRenderables, UseParentTileWhenChildNotReady) { +TEST(UpdateRenderables, UseParentTileWhenChildNotReady) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -424,7 +424,7 @@ TEST(UpdateRenderables, UseParentTileWhenChildNotReady) { log); } -TEST(UpdateRenderables, UseOverlappingParentTile) { +TEST(UpdateRenderables, UseOverlappingParentTile) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -462,7 +462,7 @@ TEST(UpdateRenderables, UseOverlappingParentTile) { log); } -TEST(UpdateRenderables, UseChildTiles) { +TEST(UpdateRenderables, UseChildTiles) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -496,7 +496,7 @@ TEST(UpdateRenderables, UseChildTiles) { log); } -TEST(UpdateRenderables, PreferChildTiles) { +TEST(UpdateRenderables, PreferChildTiles) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -605,7 +605,7 @@ TEST(UpdateRenderables, PreferChildTiles) { log); } -TEST(UpdateRenderables, UseParentAndChildTiles) { +TEST(UpdateRenderables, UseParentAndChildTiles) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -658,7 +658,7 @@ TEST(UpdateRenderables, UseParentAndChildTiles) { log); } -TEST(UpdateRenderables, DontUseTilesLowerThanMinzoom) { +TEST(UpdateRenderables, DontUseTilesLowerThanMinzoom) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -687,7 +687,7 @@ TEST(UpdateRenderables, DontUseTilesLowerThanMinzoom) { log); } -TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) { +TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -791,7 +791,7 @@ TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) { log); } -TEST(UpdateRenderables, AscendToNonOverzoomedTiles) { +TEST(UpdateRenderables, AscendToNonOverzoomedTiles) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -871,7 +871,7 @@ TEST(UpdateRenderables, AscendToNonOverzoomedTiles) { log); } -TEST(UpdateRenderables, DoNotAscendMultipleTimesIfNotFound) { +TEST(UpdateRenderables, DoNotAscendMultipleTimesIfNotFound) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -944,7 +944,7 @@ TEST(UpdateRenderables, DoNotAscendMultipleTimesIfNotFound) { log); } -TEST(UpdateRenderables, DontRetainUnusedNonIdealTiles) { +TEST(UpdateRenderables, DontRetainUnusedNonIdealTiles) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -973,7 +973,7 @@ TEST(UpdateRenderables, DontRetainUnusedNonIdealTiles) { log); } -TEST(UpdateRenderables, WrappedTiles) { +TEST(UpdateRenderables, WrappedTiles) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -1035,7 +1035,7 @@ TEST(UpdateRenderables, WrappedTiles) { log); } -TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) { +TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); @@ -1227,7 +1227,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) { log); } -TEST(UpdateRenderables, LoadRequiredIfIdealTileCantBeFound) { +TEST(UpdateRenderables, LoadRequiredIfIdealTileCantBeFound) { // NOLINT ActionLog log; MockSource source; auto getTileData = getTileDataFn(log, source.dataTiles); diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp index 100187c587..18c29ed6e2 100644 --- a/test/api/annotations.test.cpp +++ b/test/api/annotations.test.cpp @@ -39,7 +39,7 @@ public: } // end namespace -TEST(Annotations, SymbolAnnotation) { +TEST(Annotations, SymbolAnnotation) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -56,7 +56,7 @@ TEST(Annotations, SymbolAnnotation) { // } } -TEST(Annotations, LineAnnotation) { +TEST(Annotations, LineAnnotation) { // NOLINT AnnotationTest test; LineString line = {{ { 0, 0 }, { 45, 45 }, { 30, 0 } }}; @@ -72,7 +72,7 @@ TEST(Annotations, LineAnnotation) { test.checkRendering("line_annotation_max_zoom"); } -TEST(Annotations, FillAnnotation) { +TEST(Annotations, FillAnnotation) { // NOLINT AnnotationTest test; Polygon polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; @@ -87,7 +87,7 @@ TEST(Annotations, FillAnnotation) { test.checkRendering("fill_annotation_max_zoom"); } -TEST(Annotations, AntimeridianAnnotationSmall) { +TEST(Annotations, AntimeridianAnnotationSmall) { // NOLINT AnnotationTest test; double antimeridian = 180; @@ -108,7 +108,7 @@ TEST(Annotations, AntimeridianAnnotationSmall) { test.checkRendering("antimeridian_annotation_small"); } -TEST(Annotations, AntimeridianAnnotationLarge) { +TEST(Annotations, AntimeridianAnnotationLarge) { // NOLINT AnnotationTest test; double antimeridian = 180; @@ -129,7 +129,7 @@ TEST(Annotations, AntimeridianAnnotationLarge) { test.checkRendering("antimeridian_annotation_large"); } -TEST(Annotations, OverlappingFillAnnotation) { +TEST(Annotations, OverlappingFillAnnotation) { // NOLINT AnnotationTest test; Polygon polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; @@ -144,7 +144,7 @@ TEST(Annotations, OverlappingFillAnnotation) { test.checkRendering("overlapping_fill_annotation"); } -TEST(Annotations, AddMultiple) { +TEST(Annotations, AddMultiple) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -157,7 +157,7 @@ TEST(Annotations, AddMultiple) { test.checkRendering("add_multiple"); } -TEST(Annotations, NonImmediateAdd) { +TEST(Annotations, NonImmediateAdd) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -171,7 +171,7 @@ TEST(Annotations, NonImmediateAdd) { test.checkRendering("non_immediate_add"); } -TEST(Annotations, UpdateSymbolAnnotationGeometry) { +TEST(Annotations, UpdateSymbolAnnotationGeometry) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -185,7 +185,7 @@ TEST(Annotations, UpdateSymbolAnnotationGeometry) { test.checkRendering("update_point"); } -TEST(Annotations, UpdateSymbolAnnotationIcon) { +TEST(Annotations, UpdateSymbolAnnotationIcon) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -199,7 +199,7 @@ TEST(Annotations, UpdateSymbolAnnotationIcon) { test.checkRendering("update_icon"); } -TEST(Annotations, UpdateLineAnnotationGeometry) { +TEST(Annotations, UpdateLineAnnotationGeometry) { // NOLINT AnnotationTest test; LineAnnotation annotation { LineString {{ { 0, 0 }, { 45, 45 }, { 30, 0 } }} }; @@ -216,7 +216,7 @@ TEST(Annotations, UpdateLineAnnotationGeometry) { test.checkRendering("update_line_geometry"); } -TEST(Annotations, UpdateLineAnnotationStyle) { +TEST(Annotations, UpdateLineAnnotationStyle) { // NOLINT AnnotationTest test; LineAnnotation annotation { LineString {{ { 0, 0 }, { 45, 45 }, { 30, 0 } }} }; @@ -234,7 +234,7 @@ TEST(Annotations, UpdateLineAnnotationStyle) { test.checkRendering("update_line_style"); } -TEST(Annotations, UpdateFillAnnotationGeometry) { +TEST(Annotations, UpdateFillAnnotationGeometry) { // NOLINT AnnotationTest test; FillAnnotation annotation { Polygon { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} } }; @@ -250,7 +250,7 @@ TEST(Annotations, UpdateFillAnnotationGeometry) { test.checkRendering("update_fill_geometry"); } -TEST(Annotations, UpdateFillAnnotationStyle) { +TEST(Annotations, UpdateFillAnnotationStyle) { // NOLINT AnnotationTest test; Polygon polygon = { {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }; @@ -267,7 +267,7 @@ TEST(Annotations, UpdateFillAnnotationStyle) { test.checkRendering("update_fill_style"); } -TEST(Annotations, RemovePoint) { +TEST(Annotations, RemovePoint) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -280,7 +280,7 @@ TEST(Annotations, RemovePoint) { test.checkRendering("remove_point"); } -TEST(Annotations, RemoveShape) { +TEST(Annotations, RemoveShape) { // NOLINT AnnotationTest test; LineString line = {{ { 0, 0 }, { 45, 45 } }}; @@ -297,7 +297,7 @@ TEST(Annotations, RemoveShape) { test.checkRendering("remove_shape"); } -TEST(Annotations, ImmediateRemoveShape) { +TEST(Annotations, ImmediateRemoveShape) { // NOLINT AnnotationTest test; test.map.removeAnnotation(test.map.addAnnotation(LineAnnotation { LineString() })); @@ -306,7 +306,7 @@ TEST(Annotations, ImmediateRemoveShape) { test::render(test.map, test.view); } -TEST(Annotations, SwitchStyle) { +TEST(Annotations, SwitchStyle) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -319,7 +319,7 @@ TEST(Annotations, SwitchStyle) { test.checkRendering("switch_style"); } -TEST(Annotations, QueryRenderedFeatures) { +TEST(Annotations, QueryRenderedFeatures) { // NOLINT AnnotationTest test; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -340,7 +340,7 @@ TEST(Annotations, QueryRenderedFeatures) { EXPECT_EQ(*features2[0].id, uint64_t(1)); } -TEST(Annotations, QueryFractionalZoomLevels) { +TEST(Annotations, QueryFractionalZoomLevels) { // NOLINT AnnotationTest test; auto viewSize = test.view.getSize(); @@ -372,7 +372,7 @@ TEST(Annotations, QueryFractionalZoomLevels) { } } -TEST(Annotations, VisibleFeatures) { +TEST(Annotations, VisibleFeatures) { // NOLINT AnnotationTest test; auto viewSize = test.view.getSize(); @@ -410,7 +410,7 @@ TEST(Annotations, VisibleFeatures) { } -TEST(Annotations, DebugEmpty) { +TEST(Annotations, DebugEmpty) { // NOLINT // This test should render nothing, not even the tile borders. Tile borders are only rendered // when there is an actual tile we're trying to render, but since there is no annotation, we // should not render them. @@ -424,7 +424,7 @@ TEST(Annotations, DebugEmpty) { } -TEST(Annotations, DebugSparse) { +TEST(Annotations, DebugSparse) { // NOLINT // This test should only render the top right tile with the associated tile border, but no other // tiles because they're all empty. AnnotationTest test; diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp index af703fddfb..ae177474ee 100644 --- a/test/api/api_misuse.test.cpp +++ b/test/api/api_misuse.test.cpp @@ -16,7 +16,7 @@ using namespace mbgl; -TEST(API, RenderWithoutCallback) { +TEST(API, RenderWithoutCallback) { // NOLINT auto log = new FixtureLogObserver(); Log::setObserver(std::unique_ptr(log)); @@ -45,7 +45,7 @@ TEST(API, RenderWithoutCallback) { EXPECT_EQ(log->count(logMessage), 1u); } -TEST(API, RenderWithoutStyle) { +TEST(API, RenderWithoutStyle) { // NOLINT util::RunLoop loop; HeadlessBackend backend { test::sharedDisplay() }; diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp index 5a30220cd7..7c127c6f66 100644 --- a/test/api/custom_layer.test.cpp +++ b/test/api/custom_layer.test.cpp @@ -83,7 +83,7 @@ public: GLuint a_pos = 0; }; -TEST(CustomLayer, Basic) { +TEST(CustomLayer, Basic) { // NOLINT util::RunLoop loop; HeadlessBackend backend { test::sharedDisplay() }; diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp index c509753d2d..71867e6123 100644 --- a/test/api/query.test.cpp +++ b/test/api/query.test.cpp @@ -37,7 +37,7 @@ public: } // end namespace -TEST(Query, QueryRenderedFeatures) { +TEST(Query, QueryRenderedFeatures) { // NOLINT QueryTest test; auto features1 = test.map.queryRenderedFeatures(test.map.pixelForLatLng({ 0, 0 })); @@ -47,7 +47,7 @@ TEST(Query, QueryRenderedFeatures) { EXPECT_EQ(features2.size(), 0u); } -TEST(Query, QueryRenderedFeaturesFilterLayer) { +TEST(Query, QueryRenderedFeaturesFilterLayer) { // NOLINT QueryTest test; auto zz = test.map.pixelForLatLng({ 0, 0 }); @@ -65,7 +65,7 @@ TEST(Query, QueryRenderedFeaturesFilterLayer) { EXPECT_EQ(features4.size(), 1u); } -TEST(Query, QueryRenderedFeaturesFilter) { +TEST(Query, QueryRenderedFeaturesFilter) { // NOLINT QueryTest test; auto zz = test.map.pixelForLatLng({ 0, 0 }); @@ -83,14 +83,14 @@ TEST(Query, QueryRenderedFeaturesFilter) { EXPECT_EQ(features3.size(), 1u); } -TEST(Query, QuerySourceFeatures) { +TEST(Query, QuerySourceFeatures) { // NOLINT QueryTest test; auto features1 = test.map.querySourceFeatures("source3"); EXPECT_EQ(features1.size(), 1u); } -TEST(Query, QuerySourceFeaturesOptionValidation) { +TEST(Query, QuerySourceFeaturesOptionValidation) { // NOLINT QueryTest test; // GeoJSONSource, doesn't require a layer id @@ -106,7 +106,7 @@ TEST(Query, QuerySourceFeaturesOptionValidation) { ASSERT_EQ(features.size(), 0u); } -TEST(Query, QuerySourceFeaturesFilter) { +TEST(Query, QuerySourceFeaturesFilter) { // NOLINT QueryTest test; const EqualsFilter eqFilter = { "key1", std::string("value1") }; diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp index 6e99501708..4a0aae631d 100644 --- a/test/api/render_missing.test.cpp +++ b/test/api/render_missing.test.cpp @@ -13,13 +13,13 @@ #include -#if TEST_HAS_SERVER -#define TEST_REQUIRES_SERVER(name) name +#if TEST_HAS_SERVER // NOLINT +#define TEST_REQUIRES_SERVER(name) name // NOLINT #else -#define TEST_REQUIRES_SERVER(name) DISABLED_ ## name +#define TEST_REQUIRES_SERVER(name) DISABLED_ ## name // NOLINT #endif -TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) { +TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) { // NOLINT using namespace mbgl; util::RunLoop loop; diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp index 0b9726d3fa..803d1e74c4 100644 --- a/test/api/repeated_render.test.cpp +++ b/test/api/repeated_render.test.cpp @@ -16,7 +16,7 @@ using namespace mbgl; -TEST(API, RepeatedRender) { +TEST(API, RepeatedRender) { // NOLINT util::RunLoop loop; @@ -45,7 +45,7 @@ TEST(API, RepeatedRender) { ASSERT_EQ(256u, result.size.width); ASSERT_EQ(512u, result.size.height); -#if !TEST_READ_ONLY +#if !TEST_READ_ONLY // NOLINT util::write_file("test/fixtures/api/1.png", encodePNG(result)); #endif } @@ -63,7 +63,7 @@ TEST(API, RepeatedRender) { ASSERT_EQ(256u, result.size.width); ASSERT_EQ(512u, result.size.height); -#if !TEST_READ_ONLY +#if !TEST_READ_ONLY // NOLINT util::write_file("test/fixtures/api/2.png", encodePNG(result)); #endif } diff --git a/test/geometry/binpack.test.cpp b/test/geometry/binpack.test.cpp index 0b74df7fa9..73219af8b4 100644 --- a/test/geometry/binpack.test.cpp +++ b/test/geometry/binpack.test.cpp @@ -11,7 +11,7 @@ template ::std::ostream& operator<<(::std::ostream& os, const Rect< } } // namespace mbgl -TEST(BinPack, Allocating) { +TEST(BinPack, Allocating) { // NOLINT mbgl::BinPack bin(128, 128); std::array, 4> rects; @@ -30,7 +30,7 @@ TEST(BinPack, Allocating) { } -TEST(BinPack, Full) { +TEST(BinPack, Full) { // NOLINT mbgl::BinPack bin(128, 128); std::vector> rects; diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp index e0ca635ddf..c3702cf268 100644 --- a/test/gl/bucket.test.cpp +++ b/test/gl/bucket.test.cpp @@ -11,22 +11,22 @@ using namespace mbgl; -TEST(Buckets, CircleBucket) { +TEST(Buckets, CircleBucket) { // NOLINT CircleBucket bucket { { {0, 0, 0}, MapMode::Still }, {} }; ASSERT_FALSE(bucket.hasData()); } -TEST(Buckets, FillBucket) { +TEST(Buckets, FillBucket) { // NOLINT FillBucket bucket { { {0, 0, 0}, MapMode::Still }, {} }; ASSERT_FALSE(bucket.hasData()); } -TEST(Buckets, LineBucket) { +TEST(Buckets, LineBucket) { // NOLINT LineBucket bucket { { {0, 0, 0}, MapMode::Still }, {}, {} }; ASSERT_FALSE(bucket.hasData()); } -TEST(Buckets, SymbolBucket) { +TEST(Buckets, SymbolBucket) { // NOLINT style::SymbolLayoutProperties::PossiblyEvaluated layout; bool sdfIcons = false; bool iconsNeedLinear = false; diff --git a/test/gl/object.test.cpp b/test/gl/object.test.cpp index b5a055f4ca..49de63f0d8 100644 --- a/test/gl/object.test.cpp +++ b/test/gl/object.test.cpp @@ -26,7 +26,7 @@ struct MockGLObject { const bool MockGLObject::Default = false; -TEST(GLObject, Value) { +TEST(GLObject, Value) { // NOLINT setFlag = false; auto object = std::make_unique>(); @@ -46,7 +46,7 @@ TEST(GLObject, Value) { EXPECT_TRUE(setFlag); } -TEST(GLObject, Store) { +TEST(GLObject, Store) { // NOLINT HeadlessBackend backend { test::sharedDisplay() }; BackendScope scope { backend }; OffscreenView view(backend.getContext()); diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 6809fefb65..bee89ef9cb 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -53,7 +53,7 @@ struct MapTest { ThreadPool threadPool { 4 }; }; -TEST(Map, LatLngBehavior) { +TEST(Map, LatLngBehavior) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -69,7 +69,7 @@ TEST(Map, LatLngBehavior) { ASSERT_DOUBLE_EQ(latLng1.longitude(), latLng2.longitude()); } -TEST(Map, LatLngBoundsToCamera) { +TEST(Map, LatLngBoundsToCamera) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -81,7 +81,7 @@ TEST(Map, LatLngBoundsToCamera) { ASSERT_TRUE(bounds.contains(*virtualCamera.center)); } -TEST(Map, CameraToLatLngBounds) { +TEST(Map, CameraToLatLngBounds) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -102,7 +102,7 @@ TEST(Map, CameraToLatLngBounds) { ASSERT_NEAR(camera.center->longitude(), virtualCamera.center->longitude(), 1e-7); } -TEST(Map, Offline) { +TEST(Map, Offline) { // NOLINT MapTest test; DefaultFileSource fileSource(":memory:", "."); @@ -133,7 +133,7 @@ TEST(Map, Offline) { NetworkStatus::Set(NetworkStatus::Status::Online); } -TEST(Map, SetStyleInvalidJSON) { +TEST(Map, SetStyleInvalidJSON) { // NOLINT MapTest test; Log::setObserver(std::make_unique()); @@ -159,7 +159,7 @@ TEST(Map, SetStyleInvalidJSON) { EXPECT_TRUE(unchecked.empty()) << unchecked; } -TEST(Map, SetStyleInvalidURL) { +TEST(Map, SetStyleInvalidURL) { // NOLINT MapTest test; test.fileSource.styleResponse = [] (const Resource&) { @@ -180,7 +180,7 @@ TEST(Map, SetStyleInvalidURL) { test.runLoop.run(); } -TEST(Map, DoubleStyleLoad) { +TEST(Map, DoubleStyleLoad) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -188,7 +188,7 @@ TEST(Map, DoubleStyleLoad) { map.setStyleJSON(""); } -TEST(Map, StyleFresh) { +TEST(Map, StyleFresh) { // NOLINT // The map should not revalidate fresh styles. MapTest test; @@ -206,7 +206,7 @@ TEST(Map, StyleFresh) { EXPECT_EQ(0u, fileSource.requests.size()); } -TEST(Map, StyleExpired) { +TEST(Map, StyleExpired) { // NOLINT // The map should allow expired styles to be revalidated, so long as no mutations are made. using namespace std::chrono_literals; @@ -233,7 +233,7 @@ TEST(Map, StyleExpired) { EXPECT_NE(nullptr, map.getLayer("bg")); } -TEST(Map, StyleExpiredWithAnnotations) { +TEST(Map, StyleExpiredWithAnnotations) { // NOLINT // Adding an annotation should not prevent revalidation of an expired style. using namespace std::chrono_literals; @@ -259,7 +259,7 @@ TEST(Map, StyleExpiredWithAnnotations) { EXPECT_EQ(1u, fileSource.requests.size()); } -TEST(Map, StyleEarlyMutation) { +TEST(Map, StyleEarlyMutation) { // NOLINT // An early mutation should not prevent the initial style load. MapTest test; @@ -277,7 +277,7 @@ TEST(Map, StyleEarlyMutation) { EXPECT_NE(nullptr, map.getLayer("water")); } -TEST(Map, StyleLoadedSignal) { +TEST(Map, StyleLoadedSignal) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -296,7 +296,7 @@ TEST(Map, StyleLoadedSignal) { } // Test for https://github.com/mapbox/mapbox-gl-native/issues/7902 -TEST(Map, TEST_REQUIRES_SERVER(StyleNetworkErrorRetry)) { +TEST(Map, TEST_REQUIRES_SERVER(StyleNetworkErrorRetry)) { // NOLINT MapTest test; OnlineFileSource fileSource; @@ -310,7 +310,7 @@ TEST(Map, TEST_REQUIRES_SERVER(StyleNetworkErrorRetry)) { test.runLoop.run(); } -TEST(Map, TEST_REQUIRES_SERVER(StyleNotFound)) { +TEST(Map, TEST_REQUIRES_SERVER(StyleNotFound)) { // NOLINT MapTest test; OnlineFileSource fileSource; @@ -338,7 +338,7 @@ TEST(Map, TEST_REQUIRES_SERVER(StyleNotFound)) { test.runLoop.run(); } -TEST(Map, AddLayer) { +TEST(Map, AddLayer) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -351,7 +351,7 @@ TEST(Map, AddLayer) { test::checkImage("test/fixtures/map/add_layer", test::render(map, test.view)); } -TEST(Map, WithoutVAOExtension) { +TEST(Map, WithoutVAOExtension) { // NOLINT MapTest test; test.backend.getContext().disableVAOExtension = true; @@ -364,7 +364,7 @@ TEST(Map, WithoutVAOExtension) { test::checkImage("test/fixtures/map/no_vao", test::render(map, test.view), 0.002); } -TEST(Map, RemoveLayer) { +TEST(Map, RemoveLayer) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -378,7 +378,7 @@ TEST(Map, RemoveLayer) { test::checkImage("test/fixtures/map/remove_layer", test::render(map, test.view)); } -TEST(Map, DisabledSources) { +TEST(Map, DisabledSources) { // NOLINT MapTest test; // Always load the same image tile for raster layers. @@ -439,7 +439,7 @@ TEST(Map, DisabledSources) { test::checkImage("test/fixtures/map/disabled_layers/second", test::render(map, test.view)); } -TEST(Map, Classes) { +TEST(Map, Classes) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -473,7 +473,7 @@ TEST(Map, Classes) { EXPECT_FALSE(map.getTransitionOptions().duration); } -TEST(Map, AddImage) { +TEST(Map, AddImage) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -490,7 +490,7 @@ TEST(Map, AddImage) { test::checkImage("test/fixtures/map/add_icon", test::render(map, test.view)); } -TEST(Map, RemoveImage) { +TEST(Map, RemoveImage) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -503,7 +503,7 @@ TEST(Map, RemoveImage) { test::checkImage("test/fixtures/map/remove_icon", test::render(map, test.view)); } -TEST(Map, GetImage) { +TEST(Map, GetImage) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -515,7 +515,7 @@ TEST(Map, GetImage) { test::checkImage("test/fixtures/map/get_icon", map.getImage("test-icon")->getImage()); } -TEST(Map, DontLoadUnneededTiles) { +TEST(Map, DontLoadUnneededTiles) { // NOLINT MapTest test; Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still); @@ -578,7 +578,7 @@ public: } }; -TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { +TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { // NOLINT util::RunLoop runLoop; MockBackend backend { test::sharedDisplay() }; BackendScope scope { backend }; diff --git a/test/map/transform.test.cpp b/test/map/transform.test.cpp index 40cae09d8b..16980f7b69 100644 --- a/test/map/transform.test.cpp +++ b/test/map/transform.test.cpp @@ -5,7 +5,7 @@ using namespace mbgl; -TEST(Transform, InvalidZoom) { +TEST(Transform, InvalidZoom) { // NOLINT Transform transform; ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude()); @@ -31,7 +31,7 @@ TEST(Transform, InvalidZoom) { } -TEST(Transform, InvalidBearing) { +TEST(Transform, InvalidBearing) { // NOLINT Transform transform; ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude()); @@ -55,7 +55,7 @@ TEST(Transform, InvalidBearing) { ASSERT_DOUBLE_EQ(2, transform.getAngle()); } -TEST(Transform, IntegerZoom) { +TEST(Transform, IntegerZoom) { // NOLINT Transform transform; auto checkIntegerZoom = [&transform](uint8_t zoomInt, double zoom) { @@ -76,7 +76,7 @@ TEST(Transform, IntegerZoom) { checkIntegerZoom(20, 20.0); } -TEST(Transform, PerspectiveProjection) { +TEST(Transform, PerspectiveProjection) { // NOLINT LatLng loc; Transform transform; @@ -108,7 +108,7 @@ TEST(Transform, PerspectiveProjection) { ASSERT_NEAR(point.y, 0, 0.02); } -TEST(Transform, UnwrappedLatLng) { +TEST(Transform, UnwrappedLatLng) { // NOLINT Transform transform; transform.resize({ 1000, 1000 }); transform.setZoom(10); @@ -138,7 +138,7 @@ TEST(Transform, UnwrappedLatLng) { ASSERT_NEAR(wrappedLeftwards.longitude(), -76.99999999988728, 0.001); // 1.1272E-11 } -TEST(Transform, ConstrainHeightOnly) { +TEST(Transform, ConstrainHeightOnly) { // NOLINT LatLng loc; Transform transform; @@ -156,7 +156,7 @@ TEST(Transform, ConstrainHeightOnly) { ASSERT_NEAR(util::LONGITUDE_MAX, std::abs(loc.longitude()), 0.001); } -TEST(Transform, ConstrainWidthAndHeight) { +TEST(Transform, ConstrainWidthAndHeight) { // NOLINT LatLng loc; Transform transform(MapObserver::nullObserver(), ConstrainMode::WidthAndHeight); @@ -174,7 +174,7 @@ TEST(Transform, ConstrainWidthAndHeight) { ASSERT_NEAR(util::LONGITUDE_MAX, std::abs(loc.longitude()), 0.001); } -TEST(Transform, Anchor) { +TEST(Transform, Anchor) { // NOLINT Transform transform; transform.resize({ 1000, 1000 }); @@ -274,7 +274,7 @@ TEST(Transform, Anchor) { ASSERT_NEAR(anchorLatLng.longitude(), transform.getLatLng().longitude(), 1); } -TEST(Transform, Padding) { +TEST(Transform, Padding) { // NOLINT Transform transform; transform.resize({ 1000, 1000 }); @@ -301,7 +301,7 @@ TEST(Transform, Padding) { ASSERT_DOUBLE_EQ(manualShiftedCenter.longitude(), shiftedCenter.longitude()); } -TEST(Transform, MoveBy) { +TEST(Transform, MoveBy) { // NOLINT Transform transform; transform.resize({ 1000, 1000 }); transform.setLatLngZoom({ 0, 0 }, 10); @@ -328,7 +328,7 @@ TEST(Transform, MoveBy) { ASSERT_NEAR(0, trueCenter.longitude(), 1.1); } -TEST(Transform, Antimeridian) { +TEST(Transform, Antimeridian) { // NOLINT Transform transform; transform.resize({ 1000, 1000 }); transform.setLatLngZoom({ 0, 0 }, 1); @@ -388,7 +388,7 @@ TEST(Transform, Antimeridian) { ASSERT_NEAR(coordinateWaikiri.longitude(), coordinateFromPixel.longitude(), 0.000001); } -TEST(Transform, Camera) { +TEST(Transform, Camera) { // NOLINT Transform transform; transform.resize({ 1000, 1000 }); @@ -455,7 +455,7 @@ TEST(Transform, Camera) { ASSERT_FALSE(transform.inTransition()); } -TEST(Transform, DefaultTransform) { +TEST(Transform, DefaultTransform) { // NOLINT struct TransformObserver : public mbgl::MapObserver { void onCameraWillChange(MapObserver::CameraChangeMode) final { cameraWillChangeCallback(); @@ -528,7 +528,7 @@ TEST(Transform, DefaultTransform) { ASSERT_DOUBLE_EQ(point.y, center.y); } -TEST(Transform, LatLngBounds) { +TEST(Transform, LatLngBounds) { // NOLINT const LatLng nullIsland {}; const LatLng sanFrancisco { 37.7749, -122.4194 }; @@ -567,7 +567,7 @@ TEST(Transform, LatLngBounds) { ASSERT_EQ(transform.getLatLng().longitude(), 0.0); } -TEST(Transform, PitchBounds) { +TEST(Transform, PitchBounds) { // NOLINT Transform transform; transform.resize({ 1000, 1000 }); transform.setLatLngZoom({ 0, 0 }, transform.getState().getMaxZoom()); diff --git a/test/math/clamp.test.cpp b/test/math/clamp.test.cpp index 2fdafae1b4..b834e6fe27 100644 --- a/test/math/clamp.test.cpp +++ b/test/math/clamp.test.cpp @@ -5,7 +5,7 @@ using namespace mbgl; -TEST(Math, ClampFloatingPoint) { +TEST(Math, ClampFloatingPoint) { // NOLINT double lowestValue = std::numeric_limits::lowest(); double maximumValue = std::numeric_limits::max(); double quietNAN = std::numeric_limits::quiet_NaN(); @@ -14,7 +14,7 @@ TEST(Math, ClampFloatingPoint) { ASSERT_DOUBLE_EQ(0., util::clamp(0., lowestValue, maximumValue)); } -TEST(Math, ClampIntegral) { +TEST(Math, ClampIntegral) { // NOLINT int32_t lowestValue = std::numeric_limits::lowest(); int32_t maximumValue = std::numeric_limits::max(); int32_t quietNAN = std::numeric_limits::quiet_NaN(); diff --git a/test/math/minmax.test.cpp b/test/math/minmax.test.cpp index 2e3ebdc340..d427a7a3fd 100644 --- a/test/math/minmax.test.cpp +++ b/test/math/minmax.test.cpp @@ -5,7 +5,7 @@ using namespace mbgl; -TEST(Math, MinMaxFloatingPoint) { +TEST(Math, MinMaxFloatingPoint) { // NOLINT double minimumValue = std::numeric_limits::min(); double lowestValue = std::numeric_limits::lowest(); double maximumValue = std::numeric_limits::max(); @@ -21,7 +21,7 @@ TEST(Math, MinMaxFloatingPoint) { ASSERT_DOUBLE_EQ(10., util::max(8., 9., 10.)); } -TEST(Math, MinMaxIntegral) { +TEST(Math, MinMaxIntegral) { // NOLINT int32_t minimumValue = std::numeric_limits::min(); int32_t lowestValue = std::numeric_limits::lowest(); int32_t maximumValue = std::numeric_limits::max(); diff --git a/test/math/wrap.test.cpp b/test/math/wrap.test.cpp index 5610257a5c..8d12f3b100 100644 --- a/test/math/wrap.test.cpp +++ b/test/math/wrap.test.cpp @@ -5,22 +5,22 @@ using namespace mbgl; -TEST(Math, WrapHigherValue) { +TEST(Math, WrapHigherValue) { // NOLINT ASSERT_DOUBLE_EQ(4.0, util::wrap(16.0, 0.0, 12.0)); } -TEST(Math, WrapLowerValue) { +TEST(Math, WrapLowerValue) { // NOLINT ASSERT_DOUBLE_EQ(9.0, util::wrap(-3.0, 0.0, 12.0)); } -TEST(Math, WrapInRangeValue) { +TEST(Math, WrapInRangeValue) { // NOLINT ASSERT_DOUBLE_EQ(4.0, util::wrap(4.0, 0.0, 12.0)); } -TEST(Math, WrapMaxValue) { +TEST(Math, WrapMaxValue) { // NOLINT ASSERT_DOUBLE_EQ(0.0, util::wrap(12.0, 0.0, 12.0)); } -TEST(Math, WrapMinValue) { +TEST(Math, WrapMinValue) { // NOLINT ASSERT_DOUBLE_EQ(0.0, util::wrap(0.0, 0.0, 12.0)); } diff --git a/test/programs/binary_program.test.cpp b/test/programs/binary_program.test.cpp index ce544e7652..52527120e4 100644 --- a/test/programs/binary_program.test.cpp +++ b/test/programs/binary_program.test.cpp @@ -4,7 +4,7 @@ using namespace mbgl; -TEST(BinaryProgram, ObtainValues) { +TEST(BinaryProgram, ObtainValues) { // NOLINT const BinaryProgram binaryProgram{ 42, "binary code", "identifier", diff --git a/test/renderer/group_by_layout.test.cpp b/test/renderer/group_by_layout.test.cpp index 958f1bdf24..fe16aa7172 100644 --- a/test/renderer/group_by_layout.test.cpp +++ b/test/renderer/group_by_layout.test.cpp @@ -18,7 +18,7 @@ static std::vector> toRenderLayers(const std::vecto return result; } -TEST(GroupByLayout, Related) { +TEST(GroupByLayout, Related) { // NOLINT std::vector> layers; layers.push_back(std::make_unique("a", "source")); layers.push_back(std::make_unique("b", "source")); @@ -27,7 +27,7 @@ TEST(GroupByLayout, Related) { ASSERT_EQ(2u, result[0].size()); } -TEST(GroupByLayout, UnrelatedType) { +TEST(GroupByLayout, UnrelatedType) { // NOLINT std::vector> layers; layers.push_back(std::make_unique("background")); layers.push_back(std::make_unique("circle", "source")); @@ -35,7 +35,7 @@ TEST(GroupByLayout, UnrelatedType) { ASSERT_EQ(2u, result.size()); } -TEST(GroupByLayout, UnrelatedFilter) { +TEST(GroupByLayout, UnrelatedFilter) { // NOLINT std::vector> layers; layers.push_back(std::make_unique("a", "source")); layers.push_back(std::make_unique("b", "source")); @@ -44,7 +44,7 @@ TEST(GroupByLayout, UnrelatedFilter) { ASSERT_EQ(2u, result.size()); } -TEST(GroupByLayout, UnrelatedLayout) { +TEST(GroupByLayout, UnrelatedLayout) { // NOLINT std::vector> layers; layers.push_back(std::make_unique("a", "source")); layers.push_back(std::make_unique("b", "source")); diff --git a/test/sprite/sprite_atlas.test.cpp b/test/sprite/sprite_atlas.test.cpp index 0cbd211de8..6318d91a28 100644 --- a/test/sprite/sprite_atlas.test.cpp +++ b/test/sprite/sprite_atlas.test.cpp @@ -15,7 +15,7 @@ using namespace mbgl; -TEST(SpriteAtlas, Basic) { +TEST(SpriteAtlas, Basic) { // NOLINT FixtureLog log; SpriteAtlas atlas({ 63, 112 }, 1); @@ -73,7 +73,7 @@ TEST(SpriteAtlas, Basic) { test::checkImage("test/fixtures/sprite_atlas/basic", atlas.getAtlasImage()); } -TEST(SpriteAtlas, Size) { +TEST(SpriteAtlas, Size) { // NOLINT SpriteAtlas atlas({ 63, 112 }, 1.4); auto images = parseSprite(util::read_file("test/fixtures/annotations/emerald.png"), @@ -105,7 +105,7 @@ TEST(SpriteAtlas, Size) { test::checkImage("test/fixtures/sprite_atlas/size", atlas.getAtlasImage()); } -TEST(SpriteAtlas, Updates) { +TEST(SpriteAtlas, Updates) { // NOLINT SpriteAtlas atlas({ 32, 32 }, 1); EXPECT_EQ(1.0f, atlas.getPixelRatio()); @@ -141,7 +141,7 @@ TEST(SpriteAtlas, Updates) { test::checkImage("test/fixtures/sprite_atlas/updates_after", atlas.getAtlasImage()); } -TEST(SpriteAtlas, AddRemove) { +TEST(SpriteAtlas, AddRemove) { // NOLINT FixtureLog log; SpriteAtlas atlas({ 32, 32 }, 1); @@ -170,7 +170,7 @@ TEST(SpriteAtlas, AddRemove) { })); } -TEST(SpriteAtlas, RemoveReleasesBinPackRect) { +TEST(SpriteAtlas, RemoveReleasesBinPackRect) { // NOLINT FixtureLog log; SpriteAtlas atlas({ 36, 36 }, 1); diff --git a/test/sprite/sprite_image_collection.test.cpp b/test/sprite/sprite_image_collection.test.cpp index 51ea20fdf3..00626b8617 100644 --- a/test/sprite/sprite_image_collection.test.cpp +++ b/test/sprite/sprite_image_collection.test.cpp @@ -9,7 +9,7 @@ using namespace mbgl; -TEST(SpriteImageCollection, OtherPixelRatio) { +TEST(SpriteImageCollection, OtherPixelRatio) { // NOLINT FixtureLog log; Images images; @@ -17,7 +17,7 @@ TEST(SpriteImageCollection, OtherPixelRatio) { addSpriteImage(images, "one", std::make_unique(PremultipliedImage({ 8, 8 }), 2)); } -TEST(SpriteImageCollection, Replace) { +TEST(SpriteImageCollection, Replace) { // NOLINT FixtureLog log; Images images; @@ -27,7 +27,7 @@ TEST(SpriteImageCollection, Replace) { EXPECT_NE(image, images.find("sprite")->second.get()); } -TEST(SpriteImageCollection, ReplaceWithDifferentDimensions) { +TEST(SpriteImageCollection, ReplaceWithDifferentDimensions) { // NOLINT FixtureLog log; Images images; diff --git a/test/sprite/sprite_loader.test.cpp b/test/sprite/sprite_loader.test.cpp index 99f44e57e4..4667d0fcc8 100644 --- a/test/sprite/sprite_loader.test.cpp +++ b/test/sprite/sprite_loader.test.cpp @@ -83,7 +83,7 @@ Response corruptSpriteResponse(const Resource&) { return response; } -TEST(SpriteLoader, LoadingSuccess) { +TEST(SpriteLoader, LoadingSuccess) { // NOLINT SpriteLoaderTest test; test.fileSource.spriteImageResponse = successfulSpriteImageResponse; @@ -102,7 +102,7 @@ TEST(SpriteLoader, LoadingSuccess) { test.run(); } -TEST(SpriteLoader, JSONLoadingFail) { +TEST(SpriteLoader, JSONLoadingFail) { // NOLINT SpriteLoaderTest test; test.fileSource.spriteImageResponse = successfulSpriteImageResponse; @@ -117,7 +117,7 @@ TEST(SpriteLoader, JSONLoadingFail) { test.run(); } -TEST(SpriteLoader, ImageLoadingFail) { +TEST(SpriteLoader, ImageLoadingFail) { // NOLINT SpriteLoaderTest test; test.fileSource.spriteImageResponse = failedSpriteResponse; @@ -132,7 +132,7 @@ TEST(SpriteLoader, ImageLoadingFail) { test.run(); } -TEST(SpriteLoader, JSONLoadingCorrupted) { +TEST(SpriteLoader, JSONLoadingCorrupted) { // NOLINT SpriteLoaderTest test; test.fileSource.spriteImageResponse = successfulSpriteImageResponse; @@ -147,7 +147,7 @@ TEST(SpriteLoader, JSONLoadingCorrupted) { test.run(); } -TEST(SpriteLoader, ImageLoadingCorrupted) { +TEST(SpriteLoader, ImageLoadingCorrupted) { // NOLINT SpriteLoaderTest test; test.fileSource.spriteImageResponse = corruptSpriteResponse; @@ -162,7 +162,7 @@ TEST(SpriteLoader, ImageLoadingCorrupted) { test.run(); } -TEST(SpriteLoader, LoadingCancel) { +TEST(SpriteLoader, LoadingCancel) { // NOLINT SpriteLoaderTest test; test.fileSource.spriteImageResponse = diff --git a/test/sprite/sprite_parser.test.cpp b/test/sprite/sprite_parser.test.cpp index 19c6b914a8..decba2d7aa 100644 --- a/test/sprite/sprite_parser.test.cpp +++ b/test/sprite/sprite_parser.test.cpp @@ -19,7 +19,7 @@ auto readImage(const std::string& name) { } // namespace -TEST(Sprite, SpriteImageCreationInvalid) { +TEST(Sprite, SpriteImageCreationInvalid) { // NOLINT FixtureLog log; const PremultipliedImage image_1x = decodeImage(util::read_file("test/fixtures/annotations/emerald.png")); @@ -134,7 +134,7 @@ TEST(Sprite, SpriteImageCreationInvalid) { } -TEST(Sprite, SpriteImageCreation1x) { +TEST(Sprite, SpriteImageCreation1x) { // NOLINT const PremultipliedImage image_1x = decodeImage(util::read_file("test/fixtures/annotations/emerald.png")); ASSERT_EQ(200u, image_1x.size.width); @@ -153,7 +153,7 @@ TEST(Sprite, SpriteImageCreation1x) { } } -TEST(Sprite, SpriteImageCreation2x) { +TEST(Sprite, SpriteImageCreation2x) { // NOLINT const PremultipliedImage image_2x = decodeImage(util::read_file("test/fixtures/annotations/emerald@2x.png")); // "museum_icon":{"x":354,"y":374,"width":36,"height":36,"pixelRatio":2,"sdf":false} @@ -168,7 +168,7 @@ TEST(Sprite, SpriteImageCreation2x) { sprite->getImage()); } -TEST(Sprite, SpriteImageCreation1_5x) { +TEST(Sprite, SpriteImageCreation1_5x) { // NOLINT const PremultipliedImage image_2x = decodeImage(util::read_file("test/fixtures/annotations/emerald@2x.png")); // "museum_icon":{"x":354,"y":374,"width":36,"height":36,"pixelRatio":2,"sdf":false} @@ -194,7 +194,7 @@ TEST(Sprite, SpriteImageCreation1_5x) { sprite2->getImage()); } -TEST(Sprite, SpriteParsing) { +TEST(Sprite, SpriteParsing) { // NOLINT const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png"); const auto json_1x = util::read_file("test/fixtures/annotations/emerald.json"); @@ -290,7 +290,7 @@ TEST(Sprite, SpriteParsing) { } } -TEST(Sprite, SpriteParsingInvalidJSON) { +TEST(Sprite, SpriteParsingInvalidJSON) { // NOLINT const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png"); const auto json_1x = R"JSON({ "image": " })JSON"; @@ -304,7 +304,7 @@ TEST(Sprite, SpriteParsingInvalidJSON) { } } -TEST(Sprite, SpriteParsingEmptyImage) { +TEST(Sprite, SpriteParsingEmptyImage) { // NOLINT FixtureLog log; const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png"); @@ -321,7 +321,7 @@ TEST(Sprite, SpriteParsingEmptyImage) { })); } -TEST(Sprite, SpriteParsingSimpleWidthHeight) { +TEST(Sprite, SpriteParsingSimpleWidthHeight) { // NOLINT FixtureLog log; const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png"); @@ -331,7 +331,7 @@ TEST(Sprite, SpriteParsingSimpleWidthHeight) { EXPECT_EQ(1u, images.size()); } -TEST(Sprite, SpriteParsingWidthTooBig) { +TEST(Sprite, SpriteParsingWidthTooBig) { // NOLINT FixtureLog log; const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png"); @@ -354,7 +354,7 @@ TEST(Sprite, SpriteParsingWidthTooBig) { })); } -TEST(Sprite, SpriteParsingNegativeWidth) { +TEST(Sprite, SpriteParsingNegativeWidth) { // NOLINT FixtureLog log; const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png"); @@ -377,7 +377,7 @@ TEST(Sprite, SpriteParsingNegativeWidth) { })); } -TEST(Sprite, SpriteParsingNullRatio) { +TEST(Sprite, SpriteParsingNullRatio) { // NOLINT FixtureLog log; const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png"); diff --git a/test/src/mbgl/test/test.cpp b/test/src/mbgl/test/test.cpp index 4c3dad1727..fc1e860798 100644 --- a/test/src/mbgl/test/test.cpp +++ b/test/src/mbgl/test/test.cpp @@ -6,12 +6,12 @@ namespace mbgl { int runTests(int argc, char *argv[]) { -#if TEST_HAS_SERVER +#if TEST_HAS_SERVER // NOLINT auto server = std::make_unique("test/storage/server.js"); #endif testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + return RUN_ALL_TESTS(); // NOLINT } } // namespace mbgl diff --git a/test/src/mbgl/test/util.cpp b/test/src/mbgl/test/util.cpp index 7ca2d72504..d49a6a6f9f 100644 --- a/test/src/mbgl/test/util.cpp +++ b/test/src/mbgl/test/util.cpp @@ -121,7 +121,7 @@ void checkImage(const std::string& base, const PremultipliedImage& actual, double imageThreshold, double pixelThreshold) { -#if !TEST_READ_ONLY +#if !TEST_READ_ONLY // NOLINT if (getenv("UPDATE")) { util::write_file(base + "/expected.png", encodePNG(actual)); return; @@ -141,7 +141,7 @@ void checkImage(const std::string& base, PremultipliedImage diff { expected.size }; -#if !TEST_READ_ONLY +#if !TEST_READ_ONLY // NOLINT util::write_file(base + "/actual.png", encodePNG(actual)); #endif @@ -156,7 +156,7 @@ void checkImage(const std::string& base, EXPECT_LE(pixels / (expected.size.width * expected.size.height), imageThreshold); -#if !TEST_READ_ONLY +#if !TEST_READ_ONLY // NOLINT util::write_file(base + "/diff.png", encodePNG(diff)); #endif } diff --git a/test/storage/asset_file_source.test.cpp b/test/storage/asset_file_source.test.cpp index 010a2c9dc7..3641911a8f 100644 --- a/test/storage/asset_file_source.test.cpp +++ b/test/storage/asset_file_source.test.cpp @@ -9,7 +9,7 @@ using namespace mbgl; #if !ANDROID -TEST(AssetFileSource, Load) { +TEST(AssetFileSource, Load) { // NOLINT util::RunLoop loop; AssetFileSource fs("test/fixtures/storage/assets"); @@ -76,7 +76,7 @@ TEST(AssetFileSource, Load) { loop.run(); } -TEST(AssetFileSource, EmptyFile) { +TEST(AssetFileSource, EmptyFile) { // NOLINT util::RunLoop loop; AssetFileSource fs("test/fixtures/storage/assets"); @@ -92,7 +92,7 @@ TEST(AssetFileSource, EmptyFile) { loop.run(); } -TEST(AssetFileSource, NonEmptyFile) { +TEST(AssetFileSource, NonEmptyFile) { // NOLINT util::RunLoop loop; AssetFileSource fs("test/fixtures/storage/assets"); @@ -108,7 +108,7 @@ TEST(AssetFileSource, NonEmptyFile) { loop.run(); } -TEST(AssetFileSource, NonExistentFile) { +TEST(AssetFileSource, NonExistentFile) { // NOLINT util::RunLoop loop; AssetFileSource fs("test/fixtures/storage/assets"); @@ -125,7 +125,7 @@ TEST(AssetFileSource, NonExistentFile) { loop.run(); } -TEST(AssetFileSource, ReadDirectory) { +TEST(AssetFileSource, ReadDirectory) { // NOLINT util::RunLoop loop; AssetFileSource fs("test/fixtures/storage/assets"); @@ -142,7 +142,7 @@ TEST(AssetFileSource, ReadDirectory) { loop.run(); } -TEST(AssetFileSource, URLEncoding) { +TEST(AssetFileSource, URLEncoding) { // NOLINT util::RunLoop loop; AssetFileSource fs("test/fixtures/storage/assets"); diff --git a/test/storage/default_file_source.test.cpp b/test/storage/default_file_source.test.cpp index 03f1076559..eecf4947fa 100644 --- a/test/storage/default_file_source.test.cpp +++ b/test/storage/default_file_source.test.cpp @@ -4,7 +4,7 @@ using namespace mbgl; -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheResponse)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheResponse)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -42,7 +42,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheResponse)) { loop.run(); } -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateSame)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateSame)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -86,7 +86,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateSame)) { loop.run(); } -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateModified)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateModified)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -130,7 +130,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateModified)) { loop.run(); } -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateEtag)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateEtag)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -185,7 +185,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(CacheRevalidateEtag)) { // gets invalidated by the first notify's pending.erase, and when it gets notified, the crash // occurs. -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(HTTPIssue1369)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(HTTPIssue1369)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -209,7 +209,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(HTTPIssue1369)) { loop.run(); } -TEST(DefaultFileSource, OptionalNonExpired) { +TEST(DefaultFileSource, OptionalNonExpired) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -238,7 +238,7 @@ TEST(DefaultFileSource, OptionalNonExpired) { loop.run(); } -TEST(DefaultFileSource, OptionalExpired) { +TEST(DefaultFileSource, OptionalExpired) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -267,7 +267,7 @@ TEST(DefaultFileSource, OptionalExpired) { loop.run(); } -TEST(DefaultFileSource, GetBaseURLAndAccessTokenWhilePaused) { +TEST(DefaultFileSource, GetBaseURLAndAccessTokenWhilePaused) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -283,7 +283,7 @@ TEST(DefaultFileSource, GetBaseURLAndAccessTokenWhilePaused) { EXPECT_EQ(fs.getAccessToken(), accessToken); } -TEST(DefaultFileSource, OptionalNotFound) { +TEST(DefaultFileSource, OptionalNotFound) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -309,7 +309,7 @@ TEST(DefaultFileSource, OptionalNotFound) { // Test that we can make a request with etag data that doesn't first try to load // from cache like a regular request -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagNotModified)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagNotModified)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -343,7 +343,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagNotModified)) { // Test that we can make a request with etag data that doesn't first try to load // from cache like a regular request -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagModified)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagModified)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -377,7 +377,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagModified)) { // Test that we can make a request that doesn't first try to load // from cache like a regular request. -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheFull)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheFull)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -412,7 +412,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheFull)) { // Test that we can make a request with a Modified field that doesn't first try to load // from cache like a regular request -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedNotModified)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedNotModified)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -446,7 +446,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedNotModified)) // Test that we can make a request with a Modified field that doesn't first try to load // from cache like a regular request -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedModified)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedModified)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); @@ -477,7 +477,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedModified)) { loop.run(); } -TEST(DefaultFileSource, TEST_REQUIRES_SERVER(SetResourceTransform)) { +TEST(DefaultFileSource, TEST_REQUIRES_SERVER(SetResourceTransform)) { // NOLINT util::RunLoop loop; DefaultFileSource fs(":memory:", "."); diff --git a/test/storage/headers.test.cpp b/test/storage/headers.test.cpp index b7dcfc025d..c385c18941 100644 --- a/test/storage/headers.test.cpp +++ b/test/storage/headers.test.cpp @@ -1,7 +1,7 @@ #include #include -TEST(HTTPHeader, Parsing) { +TEST(HTTPHeader, Parsing) { // NOLINT using namespace mbgl; http::CacheControl cc; diff --git a/test/storage/http_file_source.test.cpp b/test/storage/http_file_source.test.cpp index 5b081d7d57..f906117f80 100644 --- a/test/storage/http_file_source.test.cpp +++ b/test/storage/http_file_source.test.cpp @@ -6,7 +6,7 @@ using namespace mbgl; -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Cancel)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Cancel)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -17,7 +17,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Cancel)) { loop.runOnce(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -34,7 +34,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP404)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP404)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -52,7 +52,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP404)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTPTile404)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTPTile404)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -69,7 +69,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTPTile404)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200EmptyData)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200EmptyData)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -86,7 +86,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200EmptyData)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP204)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP204)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -103,7 +103,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP204)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP500)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP500)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -121,7 +121,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP500)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(ExpiresParsing)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(ExpiresParsing)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -139,7 +139,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(ExpiresParsing)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(CacheControlParsing)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(CacheControlParsing)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; @@ -156,7 +156,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(CacheControlParsing)) { loop.run(); } -TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Load)) { +TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Load)) { // NOLINT util::RunLoop loop; HTTPFileSource fs; diff --git a/test/storage/local_file_source.test.cpp b/test/storage/local_file_source.test.cpp index 4d509e6c7d..c653c1a038 100644 --- a/test/storage/local_file_source.test.cpp +++ b/test/storage/local_file_source.test.cpp @@ -20,7 +20,7 @@ std::string toAbsoluteURL(const std::string& fileName) { using namespace mbgl; -TEST(LocalFileSource, EmptyFile) { +TEST(LocalFileSource, EmptyFile) { // NOLINT util::RunLoop loop; LocalFileSource fs; @@ -36,7 +36,7 @@ TEST(LocalFileSource, EmptyFile) { loop.run(); } -TEST(LocalFileSource, NonEmptyFile) { +TEST(LocalFileSource, NonEmptyFile) { // NOLINT util::RunLoop loop; LocalFileSource fs; @@ -52,7 +52,7 @@ TEST(LocalFileSource, NonEmptyFile) { loop.run(); } -TEST(LocalFileSource, NonExistentFile) { +TEST(LocalFileSource, NonExistentFile) { // NOLINT util::RunLoop loop; LocalFileSource fs; @@ -69,7 +69,7 @@ TEST(LocalFileSource, NonExistentFile) { loop.run(); } -TEST(LocalFileSource, ReadDirectory) { +TEST(LocalFileSource, ReadDirectory) { // NOLINT util::RunLoop loop; LocalFileSource fs; @@ -86,7 +86,7 @@ TEST(LocalFileSource, ReadDirectory) { loop.run(); } -TEST(LocalFileSource, URLEncoding) { +TEST(LocalFileSource, URLEncoding) { // NOLINT util::RunLoop loop; LocalFileSource fs; @@ -102,7 +102,7 @@ TEST(LocalFileSource, URLEncoding) { loop.run(); } -TEST(LocalFileSource, URLLimit) { +TEST(LocalFileSource, URLLimit) { // NOLINT util::RunLoop loop; size_t length = PATH_MAX - toAbsoluteURL("").size(); diff --git a/test/storage/offline.test.cpp b/test/storage/offline.test.cpp index 0faaabc298..1fcfdcc944 100644 --- a/test/storage/offline.test.cpp +++ b/test/storage/offline.test.cpp @@ -11,13 +11,13 @@ static const LatLngBounds sanFrancisco = static const LatLngBounds sanFranciscoWrapped = LatLngBounds::hull({ 37.6609, 238.5744 }, { 37.8271, 238.3204 }); -TEST(OfflineTilePyramidRegionDefinition, TileCoverEmpty) { +TEST(OfflineTilePyramidRegionDefinition, TileCoverEmpty) { // NOLINT OfflineTilePyramidRegionDefinition region("", LatLngBounds::empty(), 0, 20, 1.0); EXPECT_EQ((std::vector{}), region.tileCover(SourceType::Vector, 512, { 0, 22 })); } -TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomIntersection) { +TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomIntersection) { // NOLINT OfflineTilePyramidRegionDefinition region("", sanFrancisco, 2, 2, 1.0); EXPECT_EQ((std::vector{ { 2, 0, 1 } }), @@ -26,7 +26,7 @@ TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomIntersection) { EXPECT_EQ((std::vector{}), region.tileCover(SourceType::Vector, 512, { 3, 22 })); } -TEST(OfflineTilePyramidRegionDefinition, TileCoverTileSize) { +TEST(OfflineTilePyramidRegionDefinition, TileCoverTileSize) { // NOLINT OfflineTilePyramidRegionDefinition region("", LatLngBounds::world(), 0, 0, 1.0); EXPECT_EQ((std::vector{ { 0, 0, 0 } }), @@ -36,7 +36,7 @@ TEST(OfflineTilePyramidRegionDefinition, TileCoverTileSize) { region.tileCover(SourceType::Vector, 256, { 0, 22 })); } -TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomRounding) { +TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomRounding) { // NOLINT OfflineTilePyramidRegionDefinition region("", sanFrancisco, 0.6, 0.7, 1.0); EXPECT_EQ((std::vector{ { 0, 0, 0 } }), @@ -46,7 +46,7 @@ TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomRounding) { region.tileCover(SourceType::Raster, 512, { 0, 22 })); } -TEST(OfflineTilePyramidRegionDefinition, TileCoverWrapped) { +TEST(OfflineTilePyramidRegionDefinition, TileCoverWrapped) { // NOLINT OfflineTilePyramidRegionDefinition region("", sanFranciscoWrapped, 0, 0, 1.0); EXPECT_EQ((std::vector{ { 0, 0, 0 } }), diff --git a/test/storage/offline_database.test.cpp b/test/storage/offline_database.test.cpp index 872310e46f..d8bd99fa22 100644 --- a/test/storage/offline_database.test.cpp +++ b/test/storage/offline_database.test.cpp @@ -80,7 +80,7 @@ private: } // namespace -TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) { +TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) { // NOLINT using namespace mbgl; createDir("test/fixtures/offline_database"); @@ -94,7 +94,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) { Log::removeObserver(); } -TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) { +TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) { // NOLINT using namespace mbgl; createDir("test/fixtures/offline_database"); @@ -116,7 +116,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) { EXPECT_EQ(1u, flo->count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" })); } -TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) { +TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) { // NOLINT using namespace mbgl; createDir("test/fixtures/offline_database"); @@ -132,7 +132,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) { EXPECT_EQ(1u, flo->count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" })); } -TEST(OfflineDatabase, PutDoesNotStoreConnectionErrors) { +TEST(OfflineDatabase, PutDoesNotStoreConnectionErrors) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -145,7 +145,7 @@ TEST(OfflineDatabase, PutDoesNotStoreConnectionErrors) { EXPECT_FALSE(bool(db.get(resource))); } -TEST(OfflineDatabase, PutDoesNotStoreServerErrors) { +TEST(OfflineDatabase, PutDoesNotStoreServerErrors) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -158,7 +158,7 @@ TEST(OfflineDatabase, PutDoesNotStoreServerErrors) { EXPECT_FALSE(bool(db.get(resource))); } -TEST(OfflineDatabase, PutResource) { +TEST(OfflineDatabase, PutResource) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -185,7 +185,7 @@ TEST(OfflineDatabase, PutResource) { EXPECT_EQ("second", *updateGetResult->data); } -TEST(OfflineDatabase, PutTile) { +TEST(OfflineDatabase, PutTile) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -219,7 +219,7 @@ TEST(OfflineDatabase, PutTile) { EXPECT_EQ("second", *updateGetResult->data); } -TEST(OfflineDatabase, PutResourceNoContent) { +TEST(OfflineDatabase, PutResourceNoContent) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -235,7 +235,7 @@ TEST(OfflineDatabase, PutResourceNoContent) { EXPECT_FALSE(res->data.get()); } -TEST(OfflineDatabase, PutTileNotFound) { +TEST(OfflineDatabase, PutTileNotFound) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -258,7 +258,7 @@ TEST(OfflineDatabase, PutTileNotFound) { EXPECT_FALSE(res->data.get()); } -TEST(OfflineDatabase, CreateRegion) { +TEST(OfflineDatabase, CreateRegion) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -274,7 +274,7 @@ TEST(OfflineDatabase, CreateRegion) { EXPECT_EQ(metadata, region.getMetadata()); } -TEST(OfflineDatabase, UpdateMetadata) { +TEST(OfflineDatabase, UpdateMetadata) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -287,7 +287,7 @@ TEST(OfflineDatabase, UpdateMetadata) { EXPECT_EQ(db.listRegions().at(0).getMetadata(), newmetadata); } -TEST(OfflineDatabase, ListRegions) { +TEST(OfflineDatabase, ListRegions) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -307,7 +307,7 @@ TEST(OfflineDatabase, ListRegions) { EXPECT_EQ(metadata, regions.at(0).getMetadata()); } -TEST(OfflineDatabase, GetRegionDefinition) { +TEST(OfflineDatabase, GetRegionDefinition) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -324,7 +324,7 @@ TEST(OfflineDatabase, GetRegionDefinition) { EXPECT_EQ(definition.pixelRatio, result.pixelRatio); } -TEST(OfflineDatabase, DeleteRegion) { +TEST(OfflineDatabase, DeleteRegion) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -343,7 +343,7 @@ TEST(OfflineDatabase, DeleteRegion) { ASSERT_EQ(0u, db.listRegions().size()); } -TEST(OfflineDatabase, CreateRegionInfiniteMaxZoom) { +TEST(OfflineDatabase, CreateRegionInfiniteMaxZoom) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -355,7 +355,7 @@ TEST(OfflineDatabase, CreateRegionInfiniteMaxZoom) { EXPECT_EQ(INFINITY, region.getDefinition().maxZoom); } -TEST(OfflineDatabase, TEST_REQUIRES_WRITE(ConcurrentUse)) { +TEST(OfflineDatabase, TEST_REQUIRES_WRITE(ConcurrentUse)) { // NOLINT using namespace mbgl; createDir("test/fixtures/offline_database"); @@ -397,7 +397,7 @@ static std::shared_ptr randomString(size_t size) { return result; } -TEST(OfflineDatabase, PutReturnsSize) { +TEST(OfflineDatabase, PutReturnsSize) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -415,7 +415,7 @@ TEST(OfflineDatabase, PutReturnsSize) { EXPECT_EQ(0u, db.put(Resource::style("http://example.com/noContent"), noContent).second); } -TEST(OfflineDatabase, PutEvictsLeastRecentlyUsedResources) { +TEST(OfflineDatabase, PutEvictsLeastRecentlyUsedResources) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:", 1024 * 100); @@ -432,7 +432,7 @@ TEST(OfflineDatabase, PutEvictsLeastRecentlyUsedResources) { EXPECT_FALSE(bool(db.get(Resource::style("http://example.com/1")))); } -TEST(OfflineDatabase, PutRegionResourceDoesNotEvict) { +TEST(OfflineDatabase, PutRegionResourceDoesNotEvict) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:", 1024 * 100); @@ -450,7 +450,7 @@ TEST(OfflineDatabase, PutRegionResourceDoesNotEvict) { EXPECT_TRUE(bool(db.get(Resource::style("http://example.com/20")))); } -TEST(OfflineDatabase, PutFailsWhenEvictionInsuffices) { +TEST(OfflineDatabase, PutFailsWhenEvictionInsuffices) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:", 1024 * 100); @@ -462,7 +462,7 @@ TEST(OfflineDatabase, PutFailsWhenEvictionInsuffices) { EXPECT_FALSE(bool(db.get(Resource::style("http://example.com/big")))); } -TEST(OfflineDatabase, GetRegionCompletedStatus) { +TEST(OfflineDatabase, GetRegionCompletedStatus) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -496,7 +496,7 @@ TEST(OfflineDatabase, GetRegionCompletedStatus) { EXPECT_EQ(tileSize, status3.completedTileSize); } -TEST(OfflineDatabase, HasRegionResource) { +TEST(OfflineDatabase, HasRegionResource) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:", 1024 * 100); @@ -518,7 +518,7 @@ TEST(OfflineDatabase, HasRegionResource) { EXPECT_EQ(1024, *(db.hasRegionResource(region.getID(), Resource::style("http://example.com/20")))); } -TEST(OfflineDatabase, HasRegionResourceTile) { +TEST(OfflineDatabase, HasRegionResourceTile) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:", 1024 * 100); @@ -549,7 +549,7 @@ TEST(OfflineDatabase, HasRegionResourceTile) { } -TEST(OfflineDatabase, OfflineMapboxTileCount) { +TEST(OfflineDatabase, OfflineMapboxTileCount) { // NOLINT using namespace mbgl; OfflineDatabase db(":memory:"); @@ -634,7 +634,7 @@ static int databaseSyncMode(const std::string& path) { return stmt.get(0); } -TEST(OfflineDatabase, MigrateFromV2Schema) { +TEST(OfflineDatabase, MigrateFromV2Schema) { // NOLINT using namespace mbgl; // v2.db is a v2 database containing a single offline region with a small number of resources. @@ -655,7 +655,7 @@ TEST(OfflineDatabase, MigrateFromV2Schema) { databasePageCount("test/fixtures/offline_database/v2.db")); } -TEST(OfflineDatabase, MigrateFromV3Schema) { +TEST(OfflineDatabase, MigrateFromV3Schema) { // NOLINT using namespace mbgl; // v3.db is a v3 database, migrated from v2. @@ -674,7 +674,7 @@ TEST(OfflineDatabase, MigrateFromV3Schema) { EXPECT_EQ(5, databaseUserVersion("test/fixtures/offline_database/v5.db")); } -TEST(OfflineDatabase, MigrateFromV4Schema) { +TEST(OfflineDatabase, MigrateFromV4Schema) { // NOLINT using namespace mbgl; // v4.db is a v4 database, migrated from v2 & v3. This database used `journal_mode = WAL` and `synchronous = NORMAL`. diff --git a/test/storage/offline_download.test.cpp b/test/storage/offline_download.test.cpp index 27e57771c8..e47ace2d78 100644 --- a/test/storage/offline_download.test.cpp +++ b/test/storage/offline_download.test.cpp @@ -58,7 +58,7 @@ public: } }; -TEST(OfflineDownload, NoSubresources) { +TEST(OfflineDownload, NoSubresources) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -98,7 +98,7 @@ TEST(OfflineDownload, NoSubresources) { test.loop.run(); } -TEST(OfflineDownload, InlineSource) { +TEST(OfflineDownload, InlineSource) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -138,7 +138,7 @@ TEST(OfflineDownload, InlineSource) { test.loop.run(); } -TEST(OfflineDownload, GeoJSONSource) { +TEST(OfflineDownload, GeoJSONSource) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -173,7 +173,7 @@ TEST(OfflineDownload, GeoJSONSource) { test.loop.run(); } -TEST(OfflineDownload, Activate) { +TEST(OfflineDownload, Activate) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -242,7 +242,7 @@ TEST(OfflineDownload, Activate) { test.loop.run(); } -TEST(OfflineDownload, DoesNotFloodTheFileSourceWithRequests) { +TEST(OfflineDownload, DoesNotFloodTheFileSourceWithRequests) { // NOLINT FakeFileSource fileSource; OfflineTest test; OfflineRegion region = test.createRegion(); @@ -265,7 +265,7 @@ TEST(OfflineDownload, DoesNotFloodTheFileSourceWithRequests) { EXPECT_EQ(HTTPFileSource::maximumConcurrentRequests(), fileSource.requests.size()); } -TEST(OfflineDownload, GetStatusNoResources) { +TEST(OfflineDownload, GetStatusNoResources) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -282,7 +282,7 @@ TEST(OfflineDownload, GetStatusNoResources) { EXPECT_FALSE(status.complete()); } -TEST(OfflineDownload, GetStatusStyleComplete) { +TEST(OfflineDownload, GetStatusStyleComplete) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -304,7 +304,7 @@ TEST(OfflineDownload, GetStatusStyleComplete) { EXPECT_FALSE(status.complete()); } -TEST(OfflineDownload, GetStatusStyleAndSourceComplete) { +TEST(OfflineDownload, GetStatusStyleAndSourceComplete) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -330,7 +330,7 @@ TEST(OfflineDownload, GetStatusStyleAndSourceComplete) { EXPECT_FALSE(status.complete()); } -TEST(OfflineDownload, RequestError) { +TEST(OfflineDownload, RequestError) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -358,7 +358,7 @@ TEST(OfflineDownload, RequestError) { test.loop.run(); } -TEST(OfflineDownload, RequestErrorsAreRetried) { +TEST(OfflineDownload, RequestErrorsAreRetried) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -391,7 +391,7 @@ TEST(OfflineDownload, RequestErrorsAreRetried) { test.loop.run(); } -TEST(OfflineDownload, TileCountLimitExceededNoTileResponse) { +TEST(OfflineDownload, TileCountLimitExceededNoTileResponse) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -433,7 +433,7 @@ TEST(OfflineDownload, TileCountLimitExceededNoTileResponse) { test.loop.run(); } -TEST(OfflineDownload, TileCountLimitExceededWithTileResponse) { +TEST(OfflineDownload, TileCountLimitExceededWithTileResponse) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -487,7 +487,7 @@ TEST(OfflineDownload, TileCountLimitExceededWithTileResponse) { test.loop.run(); } -TEST(OfflineDownload, WithPreviouslyExistingTile) { +TEST(OfflineDownload, WithPreviouslyExistingTile) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -521,7 +521,7 @@ TEST(OfflineDownload, WithPreviouslyExistingTile) { test.loop.run(); } -TEST(OfflineDownload, ReactivatePreviouslyCompletedDownload) { +TEST(OfflineDownload, ReactivatePreviouslyCompletedDownload) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( @@ -588,7 +588,7 @@ TEST(OfflineDownload, ReactivatePreviouslyCompletedDownload) { EXPECT_EQ(2u, statusesAfterReactivate[2].completedResourceCount); } -TEST(OfflineDownload, Deactivate) { +TEST(OfflineDownload, Deactivate) { // NOLINT OfflineTest test; OfflineRegion region = test.createRegion(); OfflineDownload download( diff --git a/test/storage/online_file_source.test.cpp b/test/storage/online_file_source.test.cpp index 1a1d2d42f8..9a33a1a633 100644 --- a/test/storage/online_file_source.test.cpp +++ b/test/storage/online_file_source.test.cpp @@ -10,7 +10,7 @@ using namespace mbgl; -TEST(OnlineFileSource, Cancel) { +TEST(OnlineFileSource, Cancel) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -21,7 +21,7 @@ TEST(OnlineFileSource, Cancel) { loop.runOnce(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(CancelMultiple)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(CancelMultiple)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -45,7 +45,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(CancelMultiple)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(TemporaryError)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(TemporaryError)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -83,7 +83,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(TemporaryError)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(ConnectionError)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(ConnectionError)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -113,7 +113,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(ConnectionError)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(Timeout)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(Timeout)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -139,7 +139,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(Timeout)) { EXPECT_EQ(4, counter); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryDelayOnExpiredTile)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryDelayOnExpiredTile)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -162,7 +162,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryDelayOnExpiredTile)) { EXPECT_EQ(1, counter); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryOnClockSkew)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryOnClockSkew)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -190,7 +190,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryOnClockSkew)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RespectPriorExpires)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RespectPriorExpires)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -220,7 +220,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RespectPriorExpires)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(Load)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(Load)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -264,7 +264,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(Load)) { // trigger an immediate retry of all requests that are not in progress. This test makes sure that // we don't accidentally double-trigger the request. -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChange)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChange)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -293,7 +293,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChange)) { // Tests that a change in network status preempts requests that failed due to connection or // reachability issues. -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChangePreempt)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChangePreempt)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -333,7 +333,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChangePreempt)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusOnlineOffline)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusOnlineOffline)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -361,7 +361,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusOnlineOffline)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitStandard)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitStandard)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -376,7 +376,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitStandard)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitMBX)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitMBX)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -391,7 +391,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitMBX)) { loop.run(); } -TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitDefault)) { +TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitDefault)) { // NOLINT util::RunLoop loop; OnlineFileSource fs; @@ -405,7 +405,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitDefault)) { loop.run(); } -TEST(OnlineFileSource, ChangeAPIBaseURL){ +TEST(OnlineFileSource, ChangeAPIBaseURL){ // NOLINT util::RunLoop loop; OnlineFileSource fs; diff --git a/test/storage/resource.test.cpp b/test/storage/resource.test.cpp index 1c15fe6503..b89ad496cd 100644 --- a/test/storage/resource.test.cpp +++ b/test/storage/resource.test.cpp @@ -2,21 +2,21 @@ #include -TEST(Resource, Style) { +TEST(Resource, Style) { // NOLINT using namespace mbgl; Resource resource = Resource::style("http://example.com"); EXPECT_EQ(Resource::Kind::Style, resource.kind); EXPECT_EQ("http://example.com", resource.url); } -TEST(Resource, Source) { +TEST(Resource, Source) { // NOLINT using namespace mbgl; Resource resource = Resource::source("http://example.com"); EXPECT_EQ(Resource::Kind::Source, resource.kind); EXPECT_EQ("http://example.com", resource.url); } -TEST(Resource, Tile) { +TEST(Resource, Tile) { // NOLINT using namespace mbgl; Resource rasterTile = Resource::tile("http://example.com/{z}/{x}/{y}{ratio}.png", 2.0, 1, 2, 3, Tileset::Scheme::XYZ); @@ -103,21 +103,21 @@ TEST(Resource, Tile) { EXPECT_EQ(3, tmsTile.tileData->z); } -TEST(Resource, Glyphs) { +TEST(Resource, Glyphs) { // NOLINT using namespace mbgl; Resource resource = Resource::glyphs("http://example.com/{fontstack}/{range}", {{"stack"}}, {0, 255}); EXPECT_EQ(Resource::Kind::Glyphs, resource.kind); EXPECT_EQ("http://example.com/stack/0-255", resource.url); } -TEST(Resource, SpriteImage) { +TEST(Resource, SpriteImage) { // NOLINT using namespace mbgl; Resource resource = Resource::spriteImage("http://example.com/sprite", 2.0); EXPECT_EQ(Resource::Kind::SpriteImage, resource.kind); EXPECT_EQ("http://example.com/sprite@2x.png", resource.url); } -TEST(Resource, SpriteJSON) { +TEST(Resource, SpriteJSON) { // NOLINT using namespace mbgl; Resource resource = Resource::spriteJSON("http://example.com/sprite", 2.0); EXPECT_EQ(Resource::Kind::SpriteJSON, resource.kind); diff --git a/test/storage/sqlite.test.cpp b/test/storage/sqlite.test.cpp index dbd7a09868..414b0569c0 100644 --- a/test/storage/sqlite.test.cpp +++ b/test/storage/sqlite.test.cpp @@ -3,7 +3,7 @@ #include #include -TEST(SQLite, Statement) { +TEST(SQLite, Statement) { // NOLINT using namespace mbgl; mapbox::sqlite::Database db(":memory:", mapbox::sqlite::Create | mapbox::sqlite::ReadWrite); diff --git a/test/style/conversion/function.test.cpp b/test/style/conversion/function.test.cpp index 1eff94d939..e8367e5194 100644 --- a/test/style/conversion/function.test.cpp +++ b/test/style/conversion/function.test.cpp @@ -10,7 +10,7 @@ using namespace mbgl; using namespace mbgl::style; using namespace mbgl::style::conversion; -TEST(StyleConversion, Function) { +TEST(StyleConversion, Function) { // NOLINT Error error; auto parseFunction = [&](const std::string& src) { diff --git a/test/style/conversion/geojson_options.test.cpp b/test/style/conversion/geojson_options.test.cpp index e6bd984f36..fd83efe93a 100644 --- a/test/style/conversion/geojson_options.test.cpp +++ b/test/style/conversion/geojson_options.test.cpp @@ -9,7 +9,7 @@ using namespace mbgl::style; using namespace mbgl::style::conversion; -TEST(GeoJSONOptions, Basic) { +TEST(GeoJSONOptions, Basic) { // NOLINT ValueMap map; Value raw(map); Error error; @@ -17,7 +17,7 @@ TEST(GeoJSONOptions, Basic) { ASSERT_TRUE((bool) converted); } -TEST(GeoJSONOptions, ErrorHandling) { +TEST(GeoJSONOptions, ErrorHandling) { // NOLINT ValueMap map {{"maxzoom", std::string{"should not be a string"}}}; Value raw(map); Error error; @@ -25,7 +25,7 @@ TEST(GeoJSONOptions, ErrorHandling) { ASSERT_FALSE((bool) converted); } -TEST(GeoJSONOptions, RetainsDefaults) { +TEST(GeoJSONOptions, RetainsDefaults) { // NOLINT ValueMap map; Value raw(map); Error error; @@ -44,7 +44,7 @@ TEST(GeoJSONOptions, RetainsDefaults) { } -TEST(GeoJSONOptions, FullConversion) { +TEST(GeoJSONOptions, FullConversion) { // NOLINT ValueMap map { // GeoJSON-VT {"maxzoom", 1.0f}, diff --git a/test/style/conversion/layer.test.cpp b/test/style/conversion/layer.test.cpp index 8ca5ed7e2b..57bf623356 100644 --- a/test/style/conversion/layer.test.cpp +++ b/test/style/conversion/layer.test.cpp @@ -18,7 +18,7 @@ std::unique_ptr parseLayer(const std::string& src) { return std::move(*convert, JSValue>(doc, error)); } -TEST(StyleConversion, LayerTransition) { +TEST(StyleConversion, LayerTransition) { // NOLINT auto layer = parseLayer(R"JSON({ "type": "background", "id": "background", diff --git a/test/style/conversion/light.test.cpp b/test/style/conversion/light.test.cpp index 28e22b3550..b66e286327 100644 --- a/test/style/conversion/light.test.cpp +++ b/test/style/conversion/light.test.cpp @@ -15,7 +15,7 @@ using namespace mbgl; using namespace mbgl::style; using namespace mbgl::style::conversion; -TEST(StyleConversion, Light) { +TEST(StyleConversion, Light) { // NOLINT Error error; auto parseLight = [&](const std::string& src) { diff --git a/test/style/conversion/stringify.test.cpp b/test/style/conversion/stringify.test.cpp index 1dae20b26b..f369bc06ab 100644 --- a/test/style/conversion/stringify.test.cpp +++ b/test/style/conversion/stringify.test.cpp @@ -20,73 +20,73 @@ std::string stringify(const T& t) { return s.GetString(); } -TEST(Stringify, NullValue) { +TEST(Stringify, NullValue) { // NOLINT ASSERT_EQ(stringify(NullValue()), "null"); } -TEST(Stringify, Boolean) { +TEST(Stringify, Boolean) { // NOLINT ASSERT_EQ(stringify(true), "true"); ASSERT_EQ(stringify(false), "false"); } -TEST(Stringify, Uint64) { +TEST(Stringify, Uint64) { // NOLINT ASSERT_EQ(stringify(uint64_t(0)), "0"); ASSERT_EQ(stringify(uint64_t(1)), "1"); } -TEST(Stringify, Int64) { +TEST(Stringify, Int64) { // NOLINT ASSERT_EQ(stringify(int64_t(0)), "0"); ASSERT_EQ(stringify(int64_t(-1)), "-1"); } -TEST(Stringify, Double) { +TEST(Stringify, Double) { // NOLINT ASSERT_EQ(stringify(0.0), "0.0"); ASSERT_EQ(stringify(10.1234), "10.1234"); } -TEST(Stringify, String) { +TEST(Stringify, String) { // NOLINT ASSERT_EQ(stringify(std::string("test")), "\"test\""); } -TEST(Stringify, Enum) { +TEST(Stringify, Enum) { // NOLINT ASSERT_EQ(stringify(VisibilityType::Visible), "\"visible\""); } -TEST(Stringify, Color) { +TEST(Stringify, Color) { // NOLINT ASSERT_EQ(stringify(Color::blue()), "\"rgba(0,0,255,1)\""); } -TEST(Stringify, Array) { +TEST(Stringify, Array) { // NOLINT ASSERT_EQ(stringify(std::array {{ 1, 2 }}), "[1.0,2.0]"); } -TEST(Stringify, Vector) { +TEST(Stringify, Vector) { // NOLINT ASSERT_EQ(stringify(std::vector {{ 1, 2 }}), "[1.0,2.0]"); } -TEST(Stringify, Map) { +TEST(Stringify, Map) { // NOLINT ASSERT_EQ(stringify(std::unordered_map {{ "a", 1 }}), "{\"a\":1.0}"); } -TEST(Stringify, Value) { +TEST(Stringify, Value) { // NOLINT ASSERT_EQ(stringify(Value(true)), "true"); ASSERT_EQ(stringify(Value(uint64_t(0))), "0"); ASSERT_EQ(stringify(Value(1.2)), "1.2"); } -TEST(Stringify, Filter) { +TEST(Stringify, Filter) { // NOLINT ASSERT_EQ(stringify(NullFilter()), "null"); ASSERT_EQ(stringify(EqualsFilter { "a", 1.0 }), "[\"==\",\"a\",1.0]"); } -TEST(Stringify, CameraFunction) { +TEST(Stringify, CameraFunction) { // NOLINT ASSERT_EQ(stringify(CameraFunction(ExponentialStops { {{0, 1}}, 2 })), "{\"type\":\"exponential\",\"base\":2.0,\"stops\":[[0.0,1.0]]}"); ASSERT_EQ(stringify(CameraFunction(IntervalStops { {{0, 1}} })), "{\"type\":\"interval\",\"stops\":[[0.0,1.0]]}"); } -TEST(Stringify, SourceFunction) { +TEST(Stringify, SourceFunction) { // NOLINT ASSERT_EQ(stringify(SourceFunction("property", ExponentialStops { {{0, 1}}, 2 })), "{\"property\":\"property\",\"type\":\"exponential\",\"base\":2.0,\"stops\":[[0.0,1.0]]}"); ASSERT_EQ(stringify(SourceFunction("property", IntervalStops { {{0, 1}} })), @@ -99,7 +99,7 @@ TEST(Stringify, SourceFunction) { "{\"property\":\"property\",\"type\":\"identity\",\"default\":0.0}"); } -TEST(Stringify, CompositeFunction) { +TEST(Stringify, CompositeFunction) { // NOLINT ASSERT_EQ(stringify(CompositeFunction("property", CompositeExponentialStops { { @@ -114,13 +114,13 @@ TEST(Stringify, CompositeFunction) { "[{\"zoom\":1.0,\"value\":0.0},1.0]],\"default\":0.0}"); } -TEST(Stringify, PropertyValue) { +TEST(Stringify, PropertyValue) { // NOLINT ASSERT_EQ(stringify(PropertyValue(1)), "1.0"); ASSERT_EQ(stringify(PropertyValue(CameraFunction(ExponentialStops { {{0, 1}}, 2 }))), "{\"type\":\"exponential\",\"base\":2.0,\"stops\":[[0.0,1.0]]}"); } -TEST(Stringify, Layout) { +TEST(Stringify, Layout) { // NOLINT ASSERT_EQ(stringify(SymbolLayoutProperties()), "{}"); SymbolLayoutProperties layout; diff --git a/test/style/filter.test.cpp b/test/style/filter.test.cpp index 96de125945..cba76c69c9 100644 --- a/test/style/filter.test.cpp +++ b/test/style/filter.test.cpp @@ -28,13 +28,13 @@ Feature feature(const PropertyMap& properties, const Geometry& geometry return result; } -TEST(Filter, EqualsString) { +TEST(Filter, EqualsString) { // NOLINT Filter f = parse(R"(["==", "foo", "bar"])"); ASSERT_TRUE(f(feature({{ "foo", std::string("bar") }}))); ASSERT_FALSE(f(feature({{ "foo", std::string("baz") }}))); } -TEST(Filter, EqualsNumber) { +TEST(Filter, EqualsNumber) { // NOLINT Filter f = parse(R"(["==", "foo", 0])"); ASSERT_TRUE(f(feature({{ "foo", int64_t(0) }}))); ASSERT_TRUE(f(feature({{ "foo", uint64_t(0) }}))); @@ -49,20 +49,20 @@ TEST(Filter, EqualsNumber) { ASSERT_FALSE(f(feature({{}}))); } -TEST(Filter, EqualsType) { +TEST(Filter, EqualsType) { // NOLINT Filter f = parse(R"(["==", "$type", "LineString"])"); ASSERT_FALSE(f(feature({{}}, Point()))); ASSERT_TRUE(f(feature({{}}, LineString()))); } -TEST(Filter, InType) { +TEST(Filter, InType) { // NOLINT Filter f = parse(R"(["in", "$type", "LineString", "Polygon"])"); ASSERT_FALSE(f(feature({{}}, Point()))); ASSERT_TRUE(f(feature({{}}, LineString()))); ASSERT_TRUE(f(feature({{}}, Polygon()))); } -TEST(Filter, Any) { +TEST(Filter, Any) { // NOLINT ASSERT_FALSE(parse("[\"any\"]")(feature({{}}))); ASSERT_TRUE(parse("[\"any\", [\"==\", \"foo\", 1]]")( feature({{ std::string("foo"), int64_t(1) }}))); @@ -72,7 +72,7 @@ TEST(Filter, Any) { feature({{ std::string("foo"), int64_t(1) }}))); } -TEST(Filter, All) { +TEST(Filter, All) { // NOLINT ASSERT_TRUE(parse("[\"all\"]")(feature({{}}))); ASSERT_TRUE(parse("[\"all\", [\"==\", \"foo\", 1]]")( feature({{ std::string("foo"), int64_t(1) }}))); @@ -82,7 +82,7 @@ TEST(Filter, All) { feature({{ std::string("foo"), int64_t(1) }}))); } -TEST(Filter, None) { +TEST(Filter, None) { // NOLINT ASSERT_TRUE(parse("[\"none\"]")(feature({{}}))); ASSERT_FALSE(parse("[\"none\", [\"==\", \"foo\", 1]]")( feature({{ std::string("foo"), int64_t(1) }}))); @@ -92,7 +92,7 @@ TEST(Filter, None) { feature({{ std::string("foo"), int64_t(1) }}))); } -TEST(Filter, Has) { +TEST(Filter, Has) { // NOLINT ASSERT_TRUE(parse("[\"has\", \"foo\"]")( feature({{ std::string("foo"), int64_t(1) }}))); ASSERT_TRUE(parse("[\"has\", \"foo\"]")( @@ -103,7 +103,7 @@ TEST(Filter, Has) { feature({{}}))); } -TEST(Filter, NotHas) { +TEST(Filter, NotHas) { // NOLINT ASSERT_FALSE(parse("[\"!has\", \"foo\"]")( feature({{ std::string("foo"), int64_t(1) }}))); ASSERT_FALSE(parse("[\"!has\", \"foo\"]")( @@ -114,7 +114,7 @@ TEST(Filter, NotHas) { feature({{}}))); } -TEST(Filter, ID) { +TEST(Filter, ID) { // NOLINT Feature feature1 { Point() }; feature1.id = { uint64_t(1234) }; diff --git a/test/style/function/camera_function.test.cpp b/test/style/function/camera_function.test.cpp index 59e3f2cef3..12278b2682 100644 --- a/test/style/function/camera_function.test.cpp +++ b/test/style/function/camera_function.test.cpp @@ -17,7 +17,7 @@ bool evaluate(PropertyValue value, float zoom) { return value.evaluate(PropertyEvaluator(PropertyEvaluationParameters(zoom), false)); } -TEST(CameraFunction, Constant) { +TEST(CameraFunction, Constant) { // NOLINT EXPECT_EQ(2.0f, evaluate(PropertyValue(2.0), 0)); EXPECT_EQ(3.8f, evaluate(PropertyValue(3.8), 0)); EXPECT_EQ(22.0f, evaluate(PropertyValue(22.0), 0)); @@ -29,7 +29,7 @@ TEST(CameraFunction, Constant) { EXPECT_EQ(22.0f, evaluate(PropertyValue(22.0), 22)); } -TEST(CameraFunction, Stops) { +TEST(CameraFunction, Stops) { // NOLINT // Explicit constant slope in fringe regions. CameraFunction slope_1(ExponentialStops { { { 0, 1.5 }, { 6, 1.5 }, { 8, 3 }, { 22, 3 } }, 1.75}); EXPECT_EQ(1.5, evaluate(slope_1, 0)); diff --git a/test/style/function/composite_function.test.cpp b/test/style/function/composite_function.test.cpp index e0804d4b27..d42a17bf4f 100644 --- a/test/style/function/composite_function.test.cpp +++ b/test/style/function/composite_function.test.cpp @@ -12,7 +12,7 @@ static StubGeometryTileFeature oneInteger { PropertyMap {{ "property", uint64_t(1) }} }; -TEST(CompositeFunction, ZoomInterpolation) { +TEST(CompositeFunction, ZoomInterpolation) { // NOLINT EXPECT_EQ(40.0f, CompositeFunction("property", CompositeExponentialStops({ {0.0f, {{uint64_t(1), 24.0f}}}, {1.5f, {{uint64_t(1), 36.0f}}}, diff --git a/test/style/function/source_function.test.cpp b/test/style/function/source_function.test.cpp index 260620c8d0..d266385ba9 100644 --- a/test/style/function/source_function.test.cpp +++ b/test/style/function/source_function.test.cpp @@ -44,7 +44,7 @@ static StubGeometryTileFeature falseFeature { PropertyMap {{ "property", false }} }; -TEST(SourceFunction, Identity) { +TEST(SourceFunction, Identity) { // NOLINT EXPECT_EQ(1.0f, SourceFunction("property", IdentityStops(), 0.0f) .evaluate(oneInteger, 2.0f)); EXPECT_EQ(1.0f, SourceFunction("property", IdentityStops(), 0.0f) @@ -68,7 +68,7 @@ TEST(SourceFunction, Identity) { .evaluate(oneTwoString, zeroArray))); } -TEST(SourceFunction, Categorical) { +TEST(SourceFunction, Categorical) { // NOLINT EXPECT_EQ(1.0f, SourceFunction("property", CategoricalStops({{ int64_t(1), 1.0f }})) .evaluate(oneInteger, 0.0f)); EXPECT_EQ(1.0f, SourceFunction("property", CategoricalStops({{ int64_t(1), 1.0f }})) diff --git a/test/style/paint_property.test.cpp b/test/style/paint_property.test.cpp index fcca05f3bd..aa6a2f2a9e 100644 --- a/test/style/paint_property.test.cpp +++ b/test/style/paint_property.test.cpp @@ -43,12 +43,12 @@ PossiblyEvaluatedPropertyValue evaluate(TransitioningProperty> property; ASSERT_EQ(0.0f, evaluate(property)); } -TEST(TransitioningProperty, EvaluateUntransitionedConstant) { +TEST(TransitioningProperty, EvaluateUntransitionedConstant) { // NOLINT TransitioningProperty> property { PropertyValue(1.0f), TransitioningProperty>(), @@ -59,7 +59,7 @@ TEST(TransitioningProperty, EvaluateUntransitionedConstant) { ASSERT_EQ(1.0f, evaluate(property)); } -TEST(TransitioningProperty, EvaluateTransitionedConstantWithoutDelay) { +TEST(TransitioningProperty, EvaluateTransitionedConstantWithoutDelay) { // NOLINT TransitionOptions transition; transition.duration = { 1000ms }; @@ -82,7 +82,7 @@ TEST(TransitioningProperty, EvaluateTransitionedConstantWithoutDelay) { ASSERT_FLOAT_EQ(1.0f, evaluate(t1, 1500ms)); } -TEST(TransitioningProperty, EvaluateTransitionedConstantWithDelay) { +TEST(TransitioningProperty, EvaluateTransitionedConstantWithDelay) { // NOLINT TransitionOptions transition; transition.delay = { 1000ms }; transition.duration = { 1000ms }; @@ -108,7 +108,7 @@ TEST(TransitioningProperty, EvaluateTransitionedConstantWithDelay) { ASSERT_FLOAT_EQ(1.0f, evaluate(t1, 2500ms)); } -TEST(TransitioningProperty, EvaluateDataDrivenValue) { +TEST(TransitioningProperty, EvaluateDataDrivenValue) { // NOLINT TransitionOptions transition; transition.delay = { 1000ms }; transition.duration = { 1000ms }; diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index 0473286c8b..1b11b4904a 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -76,7 +76,7 @@ public: } }; -TEST(Source, LoadingFail) { +TEST(Source, LoadingFail) { // NOLINT SourceTest test; test.fileSource.sourceResponse = [&] (const Resource& resource) { @@ -101,7 +101,7 @@ TEST(Source, LoadingFail) { test.run(); } -TEST(Source, LoadingCorrupt) { +TEST(Source, LoadingCorrupt) { // NOLINT SourceTest test; test.fileSource.sourceResponse = [&] (const Resource& resource) { @@ -124,7 +124,7 @@ TEST(Source, LoadingCorrupt) { test.run(); } -TEST(Source, RasterTileEmpty) { +TEST(Source, RasterTileEmpty) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -155,7 +155,7 @@ TEST(Source, RasterTileEmpty) { test.run(); } -TEST(Source, VectorTileEmpty) { +TEST(Source, VectorTileEmpty) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -186,7 +186,7 @@ TEST(Source, VectorTileEmpty) { test.run(); } -TEST(Source, RasterTileFail) { +TEST(Source, RasterTileFail) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -217,7 +217,7 @@ TEST(Source, RasterTileFail) { test.run(); } -TEST(Source, VectorTileFail) { +TEST(Source, VectorTileFail) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -248,7 +248,7 @@ TEST(Source, VectorTileFail) { test.run(); } -TEST(Source, RasterTileCorrupt) { +TEST(Source, RasterTileCorrupt) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -278,7 +278,7 @@ TEST(Source, RasterTileCorrupt) { test.run(); } -TEST(Source, VectorTileCorrupt) { +TEST(Source, VectorTileCorrupt) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -312,7 +312,7 @@ TEST(Source, VectorTileCorrupt) { test.run(); } -TEST(Source, RasterTileCancel) { +TEST(Source, RasterTileCancel) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -341,7 +341,7 @@ TEST(Source, RasterTileCancel) { test.run(); } -TEST(Source, VectorTileCancel) { +TEST(Source, VectorTileCancel) { // NOLINT SourceTest test; test.fileSource.tileResponse = [&] (const Resource&) { @@ -370,7 +370,7 @@ TEST(Source, VectorTileCancel) { test.run(); } -TEST(Source, RasterTileAttribution) { +TEST(Source, RasterTileAttribution) { // NOLINT SourceTest test; std::string mapboxOSM = ("© Mapbox " @@ -407,7 +407,7 @@ TEST(Source, RasterTileAttribution) { test.run(); } -TEST(Source, GeoJSonSourceUrlUpdate) { +TEST(Source, GeoJSonSourceUrlUpdate) { // NOLINT SourceTest test; test.fileSource.sourceResponse = [&] (const Resource& resource) { diff --git a/test/style/style.test.cpp b/test/style/style.test.cpp index b529abad4a..33ca02d05b 100644 --- a/test/style/style.test.cpp +++ b/test/style/style.test.cpp @@ -14,7 +14,7 @@ using namespace mbgl; using namespace mbgl::style; -TEST(Style, Properties) { +TEST(Style, Properties) { // NOLINT util::RunLoop loop; ThreadPool threadPool{ 1 }; @@ -49,7 +49,7 @@ TEST(Style, Properties) { ASSERT_EQ(0, style.getDefaultPitch()); } -TEST(Style, DuplicateSource) { +TEST(Style, DuplicateSource) { // NOLINT util::RunLoop loop; ThreadPool threadPool{ 1 }; diff --git a/test/style/style_image.test.cpp b/test/style/style_image.test.cpp index 34814bee88..43e7ed0292 100644 --- a/test/style/style_image.test.cpp +++ b/test/style/style_image.test.cpp @@ -6,7 +6,7 @@ using namespace mbgl; -TEST(StyleImage, ZeroWidth) { +TEST(StyleImage, ZeroWidth) { // NOLINT try { style::Image(PremultipliedImage({ 0, 16 }), 2.0); FAIL() << "Expected exception"; @@ -15,7 +15,7 @@ TEST(StyleImage, ZeroWidth) { } } -TEST(StyleImage, ZeroHeight) { +TEST(StyleImage, ZeroHeight) { // NOLINT try { style::Image(PremultipliedImage({ 16, 0 }), 2.0); FAIL() << "Expected exception"; @@ -24,7 +24,7 @@ TEST(StyleImage, ZeroHeight) { } } -TEST(StyleImage, ZeroRatio) { +TEST(StyleImage, ZeroRatio) { // NOLINT try { style::Image(PremultipliedImage({ 16, 16 }), 0.0); FAIL() << "Expected exception"; @@ -33,7 +33,7 @@ TEST(StyleImage, ZeroRatio) { } } -TEST(StyleImage, Retina) { +TEST(StyleImage, Retina) { // NOLINT style::Image image(PremultipliedImage({ 32, 24 }), 2.0); EXPECT_EQ(16, image.getWidth()); EXPECT_EQ(32u, image.getImage().size.width); @@ -42,7 +42,7 @@ TEST(StyleImage, Retina) { EXPECT_EQ(2, image.getPixelRatio()); } -TEST(StyleImage, FractionalRatio) { +TEST(StyleImage, FractionalRatio) { // NOLINT style::Image image(PremultipliedImage({ 20, 12 }), 1.5); EXPECT_EQ(float(20.0 / 1.5), image.getWidth()); EXPECT_EQ(20u, image.getImage().size.width); diff --git a/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp index 2a8379bf20..b0b7ebecb1 100644 --- a/test/style/style_layer.test.cpp +++ b/test/style/style_layer.test.cpp @@ -52,7 +52,7 @@ const auto duration = 1.0f; } // namespace -TEST(Layer, BackgroundProperties) { +TEST(Layer, BackgroundProperties) { // NOLINT auto layer = std::make_unique("background"); EXPECT_TRUE(layer->is()); @@ -68,7 +68,7 @@ TEST(Layer, BackgroundProperties) { EXPECT_EQ(layer->getBackgroundPattern(), pattern); } -TEST(Layer, CircleProperties) { +TEST(Layer, CircleProperties) { // NOLINT auto layer = std::make_unique("circle", "source"); EXPECT_TRUE(layer->is()); @@ -93,7 +93,7 @@ TEST(Layer, CircleProperties) { EXPECT_EQ(layer->getCircleTranslateAnchor(), translateAnchor); } -TEST(Layer, FillProperties) { +TEST(Layer, FillProperties) { // NOLINT auto layer = std::make_unique("fill", "source"); EXPECT_TRUE(layer->is()); @@ -121,7 +121,7 @@ TEST(Layer, FillProperties) { EXPECT_EQ(layer->getFillTranslateAnchor(), translateAnchor); } -TEST(Layer, LineProperties) { +TEST(Layer, LineProperties) { // NOLINT auto layer = std::make_unique("line", "source"); EXPECT_TRUE(layer->is()); @@ -172,7 +172,7 @@ TEST(Layer, LineProperties) { EXPECT_EQ(layer->getLinePattern(), pattern); } -TEST(Layer, RasterProperties) { +TEST(Layer, RasterProperties) { // NOLINT auto layer = std::make_unique("raster", "source"); EXPECT_TRUE(layer->is()); @@ -200,7 +200,7 @@ TEST(Layer, RasterProperties) { EXPECT_EQ(layer->getRasterFadeDuration(), duration); } -TEST(Layer, Observer) { +TEST(Layer, Observer) { // NOLINT auto layer = std::make_unique("line", "source"); StubLayerObserver observer; layer->setObserver(&observer); @@ -257,7 +257,7 @@ TEST(Layer, Observer) { EXPECT_FALSE(layoutPropertyChanged); } -TEST(Layer, DuplicateLayer) { +TEST(Layer, DuplicateLayer) { // NOLINT util::RunLoop loop; // Setup style diff --git a/test/style/style_parser.test.cpp b/test/style/style_parser.test.cpp index 5fa81b47e9..8bdd10f9be 100644 --- a/test/style/style_parser.test.cpp +++ b/test/style/style_parser.test.cpp @@ -21,7 +21,7 @@ using Messages = std::vector; class StyleParserTest : public ::testing::TestWithParam {}; -TEST_P(StyleParserTest, ParseStyle) { +TEST_P(StyleParserTest, ParseStyle) { // NOLINT const std::string base = std::string("test/fixtures/style_parser/") + GetParam(); rapidjson::GenericDocument, rapidjson::CrtAllocator> infoDoc; @@ -73,7 +73,7 @@ TEST_P(StyleParserTest, ParseStyle) { } } -INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] { +INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] { // NOLINT std::vector names; const std::string ending = ".info.json"; @@ -93,7 +93,7 @@ INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] { return names; }())); -TEST(StyleParser, FontStacks) { +TEST(StyleParser, FontStacks) { // NOLINT style::Parser parser; parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json")); auto result = parser.fontStacks(); diff --git a/test/text/glyph_atlas.test.cpp b/test/text/glyph_atlas.test.cpp index 01e0f115c0..5bff5a9a79 100644 --- a/test/text/glyph_atlas.test.cpp +++ b/test/text/glyph_atlas.test.cpp @@ -56,7 +56,7 @@ public: } }; -TEST(GlyphAtlas, LoadingSuccess) { +TEST(GlyphAtlas, LoadingSuccess) { // NOLINT GlyphAtlasTest test; test.fileSource.glyphsResponse = [&] (const Resource& resource) { @@ -95,7 +95,7 @@ TEST(GlyphAtlas, LoadingSuccess) { }); } -TEST(GlyphAtlas, LoadingFail) { +TEST(GlyphAtlas, LoadingFail) { // NOLINT GlyphAtlasTest test; test.fileSource.glyphsResponse = [&] (const Resource&) { @@ -128,7 +128,7 @@ TEST(GlyphAtlas, LoadingFail) { }); } -TEST(GlyphAtlas, LoadingCorrupted) { +TEST(GlyphAtlas, LoadingCorrupted) { // NOLINT GlyphAtlasTest test; test.fileSource.glyphsResponse = [&] (const Resource&) { @@ -159,7 +159,7 @@ TEST(GlyphAtlas, LoadingCorrupted) { }); } -TEST(GlyphAtlas, LoadingCancel) { +TEST(GlyphAtlas, LoadingCancel) { // NOLINT GlyphAtlasTest test; test.fileSource.glyphsResponse = [&] (const Resource&) { @@ -178,7 +178,7 @@ TEST(GlyphAtlas, LoadingCancel) { }); } -TEST(GlyphAtlas, LoadingInvalid) { +TEST(GlyphAtlas, LoadingInvalid) { // NOLINT GlyphAtlasTest test; test.fileSource.glyphsResponse = [&] (const Resource& resource) { diff --git a/test/text/glyph_pbf.test.cpp b/test/text/glyph_pbf.test.cpp index c222ec1dd9..42018d6708 100644 --- a/test/text/glyph_pbf.test.cpp +++ b/test/text/glyph_pbf.test.cpp @@ -5,7 +5,7 @@ using namespace mbgl; -TEST(GlyphPBF, Parsing) { +TEST(GlyphPBF, Parsing) { // NOLINT // The fake glyphs contain a number of invalid glyphs, which should be skipped by the parser. auto sdfs = parseGlyphPBF(GlyphRange { 0, 255 }, util::read_file("test/fixtures/resources/fake_glyphs-0-255.pbf")); EXPECT_TRUE(sdfs.size() == 1); diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp index 83fd249535..f363781dfe 100644 --- a/test/text/quads.test.cpp +++ b/test/text/quads.test.cpp @@ -9,7 +9,7 @@ using namespace mbgl; using namespace mbgl::style; -TEST(getIconQuads, normal) { +TEST(getIconQuads, normal) { // NOLINT SymbolLayoutProperties::Evaluated layout; Anchor anchor(2.0, 3.0, 0.0, 0.5f, 0); SpriteAtlasElement image = { @@ -43,7 +43,7 @@ TEST(getIconQuads, normal) { ASSERT_EQ(quad.minScale, 0.5f); } -TEST(getIconQuads, style) { +TEST(getIconQuads, style) { // NOLINT Anchor anchor(0.0, 0.0, 0.0, 0.5f, 0); SpriteAtlasElement image = { Rect( 0, 0, 20, 20 ), diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp index 607a8cca17..bbf9abd58d 100644 --- a/test/tile/annotation_tile.test.cpp +++ b/test/tile/annotation_tile.test.cpp @@ -39,7 +39,7 @@ public: }; // Don't query stale collision tile -TEST(AnnotationTile, Issue8289) { +TEST(AnnotationTile, Issue8289) { // NOLINT AnnotationTileTest test; AnnotationTile tile(OverscaledTileID(0, 0, 0), test.tileParameters); diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp index 8669c02dfd..c4e76849e0 100644 --- a/test/tile/geojson_tile.test.cpp +++ b/test/tile/geojson_tile.test.cpp @@ -39,7 +39,7 @@ public: }; }; -TEST(GeoJSONTile, Issue7648) { +TEST(GeoJSONTile, Issue7648) { // NOLINT GeoJSONTileTest test; test.style.addLayer(std::make_unique("circle", "source")); diff --git a/test/tile/geometry_tile_data.test.cpp b/test/tile/geometry_tile_data.test.cpp index f7fe5816ea..8a93f4f27b 100644 --- a/test/tile/geometry_tile_data.test.cpp +++ b/test/tile/geometry_tile_data.test.cpp @@ -15,7 +15,7 @@ static double _signedArea(const GeometryCoordinates& ring) { return sum; } -TEST(GeometryTileData, classifyRings1) { +TEST(GeometryTileData, classifyRings1) { // NOLINT std::vector polygons = classifyRings({ { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} } }); @@ -26,7 +26,7 @@ TEST(GeometryTileData, classifyRings1) { ASSERT_EQ(polygons[0].size(), 1u); } -TEST(GeometryTileData, classifyRings2) { +TEST(GeometryTileData, classifyRings2) { // NOLINT std::vector polygons = classifyRings({ { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} }, { {10, 10}, {20, 10}, {20, 20}, {10, 10} } @@ -38,7 +38,7 @@ TEST(GeometryTileData, classifyRings2) { ASSERT_EQ(polygons[0].size(), 2u); } -TEST(GeometryTileData, limitHoles1) { +TEST(GeometryTileData, limitHoles1) { // NOLINT GeometryCollection polygon = { { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} }, { {30, 30}, {32, 30}, {32, 32}, {30, 30} }, @@ -55,7 +55,7 @@ TEST(GeometryTileData, limitHoles1) { ASSERT_EQ(polygon[1][0].x, 10); } -TEST(GeometryTileData, limitHoles2) { +TEST(GeometryTileData, limitHoles2) { // NOLINT GeometryCollection polygon = { { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} }, { {10, 10}, {20, 10}, {20, 20}, {10, 10} }, @@ -72,7 +72,7 @@ TEST(GeometryTileData, limitHoles2) { ASSERT_EQ(polygon[1][0].x, 10); } -TEST(GeometryTileData, limitHoles3) { +TEST(GeometryTileData, limitHoles3) { // NOLINT // real world polygon with interior rings with negative areas // that need to be sorted in `limitHoles` by comparing absolute // area not signed diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp index e363b73609..e3b884a3bf 100644 --- a/test/tile/raster_tile.test.cpp +++ b/test/tile/raster_tile.test.cpp @@ -35,7 +35,7 @@ public: }; }; -TEST(RasterTile, setError) { +TEST(RasterTile, setError) { // NOLINT RasterTileTest test; RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.setError(std::make_exception_ptr(std::runtime_error("test"))); @@ -44,7 +44,7 @@ TEST(RasterTile, setError) { EXPECT_TRUE(tile.isComplete()); } -TEST(RasterTile, onError) { +TEST(RasterTile, onError) { // NOLINT RasterTileTest test; RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.onError(std::make_exception_ptr(std::runtime_error("test"))); @@ -53,7 +53,7 @@ TEST(RasterTile, onError) { EXPECT_TRUE(tile.isComplete()); } -TEST(RasterTile, onParsed) { +TEST(RasterTile, onParsed) { // NOLINT RasterTileTest test; RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.onParsed(std::make_unique(UnassociatedImage{})); @@ -62,7 +62,7 @@ TEST(RasterTile, onParsed) { EXPECT_TRUE(tile.isComplete()); } -TEST(RasterTile, onParsedEmpty) { +TEST(RasterTile, onParsedEmpty) { // NOLINT RasterTileTest test; RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset); tile.onParsed(nullptr); diff --git a/test/tile/tile_coordinate.test.cpp b/test/tile/tile_coordinate.test.cpp index 8b1048fe16..a7e6922406 100644 --- a/test/tile/tile_coordinate.test.cpp +++ b/test/tile/tile_coordinate.test.cpp @@ -11,7 +11,7 @@ using namespace mbgl; -TEST(TileCoordinate, FromLatLng) { +TEST(TileCoordinate, FromLatLng) { // NOLINT size_t changeCount = 0; struct TransformObserver : public mbgl::MapObserver { @@ -86,7 +86,7 @@ TEST(TileCoordinate, FromLatLng) { } } -TEST(TileCoordinate, ToGeometryCoordinate) { +TEST(TileCoordinate, ToGeometryCoordinate) { // NOLINT std::vector> edges { { 0.5, 0.5 }, { 0, 0 }, { 1, 0 }, { 1, 1 }, { 0, 1 } }; diff --git a/test/tile/tile_id.test.cpp b/test/tile/tile_id.test.cpp index 1ef19fea0e..2822dda9d3 100644 --- a/test/tile/tile_id.test.cpp +++ b/test/tile/tile_id.test.cpp @@ -4,7 +4,7 @@ using namespace mbgl; -TEST(TileID, Canonical) { +TEST(TileID, Canonical) { // NOLINT CanonicalTileID id_0_0_0(0, 0, 0); EXPECT_EQ(0u, id_0_0_0.z); EXPECT_EQ(0u, id_0_0_0.x); @@ -124,7 +124,7 @@ TEST(TileID, Canonical) { CanonicalTileID(0, 0, 0).children()); } -TEST(TileID, Overscaled) { +TEST(TileID, Overscaled) { // NOLINT EXPECT_TRUE(OverscaledTileID(4, 2, 3) == OverscaledTileID(4, 2, 3)); EXPECT_FALSE(OverscaledTileID(4, 2, 3) != OverscaledTileID(4, 2, 3)); EXPECT_TRUE(OverscaledTileID(4, { 4, 2, 3 }) == OverscaledTileID(4, 2, 3)); @@ -212,7 +212,7 @@ TEST(TileID, Overscaled) { EXPECT_FALSE(OverscaledTileID(4, { 4, 2, 3 }).isChildOf(OverscaledTileID(5, { 3, 1, 1 }))); } -TEST(TileID, Unwrapped) { +TEST(TileID, Unwrapped) { // NOLINT UnwrappedTileID id_0_0_0(0, 0, 0); EXPECT_EQ(0u, id_0_0_0.canonical.z); EXPECT_EQ(0u, id_0_0_0.canonical.x); diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index 2eafa4699e..fc248c3368 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -41,7 +41,7 @@ public: }; }; -TEST(VectorTile, setError) { +TEST(VectorTile, setError) { // NOLINT VectorTileTest test; VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); tile.setError(std::make_exception_ptr(std::runtime_error("test"))); @@ -50,7 +50,7 @@ TEST(VectorTile, setError) { EXPECT_TRUE(tile.isComplete()); } -TEST(VectorTile, onError) { +TEST(VectorTile, onError) { // NOLINT VectorTileTest test; VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); tile.onError(std::make_exception_ptr(std::runtime_error("test"))); @@ -59,7 +59,7 @@ TEST(VectorTile, onError) { EXPECT_TRUE(tile.isComplete()); } -TEST(VectorTile, Issue7615) { +TEST(VectorTile, Issue7615) { // NOLINT VectorTileTest test; VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); @@ -92,7 +92,7 @@ TEST(VectorTile, Issue7615) { EXPECT_EQ(symbolBucket.get(), tile.getBucket(*symbolLayer.baseImpl)); } -TEST(VectorTile, Issue8542) { +TEST(VectorTile, Issue8542) { // NOLINT VectorTileTest test; VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); diff --git a/test/util/async_task.test.cpp b/test/util/async_task.test.cpp index 78dc79dd19..dd84492f39 100644 --- a/test/util/async_task.test.cpp +++ b/test/util/async_task.test.cpp @@ -35,7 +35,7 @@ private: } // namespace -TEST(AsyncTask, RequestCoalescing) { +TEST(AsyncTask, RequestCoalescing) { // NOLINT RunLoop loop; unsigned count = 0; @@ -52,7 +52,7 @@ TEST(AsyncTask, RequestCoalescing) { EXPECT_EQ(count, 1u); } -TEST(AsyncTask, DestroyShouldNotRunQueue) { +TEST(AsyncTask, DestroyShouldNotRunQueue) { // NOLINT RunLoop loop; unsigned count = 0; @@ -64,7 +64,7 @@ TEST(AsyncTask, DestroyShouldNotRunQueue) { EXPECT_EQ(count, 0u); } -TEST(AsyncTask, DestroyAfterSignaling) { +TEST(AsyncTask, DestroyAfterSignaling) { // NOLINT RunLoop loop; // We're creating two tasks and signal both of them; the one that gets fired first destroys @@ -91,7 +91,7 @@ TEST(AsyncTask, DestroyAfterSignaling) { loop.runOnce(); } -TEST(AsyncTask, RequestCoalescingMultithreaded) { +TEST(AsyncTask, RequestCoalescingMultithreaded) { // NOLINT RunLoop loop; unsigned count = 0; @@ -117,7 +117,7 @@ TEST(AsyncTask, RequestCoalescingMultithreaded) { EXPECT_EQ(count, 1u); } -TEST(AsyncTask, ThreadSafety) { +TEST(AsyncTask, ThreadSafety) { // NOLINT RunLoop loop; unsigned count = 0; diff --git a/test/util/geo.test.cpp b/test/util/geo.test.cpp index d0d01b6f88..98d540f042 100644 --- a/test/util/geo.test.cpp +++ b/test/util/geo.test.cpp @@ -6,7 +6,7 @@ using namespace mbgl; -TEST(LatLng, InvalidLatLng) { +TEST(LatLng, InvalidLatLng) { // NOLINT try { LatLng { NAN }; ASSERT_TRUE(false) << "should throw"; @@ -33,7 +33,7 @@ TEST(LatLng, InvalidLatLng) { } } -TEST(EdgeInsets, InvalidEdgeInsets) { +TEST(EdgeInsets, InvalidEdgeInsets) { // NOLINT try { EdgeInsets { NAN }; ASSERT_TRUE(false) << "should throw"; @@ -60,7 +60,7 @@ TEST(EdgeInsets, InvalidEdgeInsets) { } } -TEST(LatLngBounds, World) { +TEST(LatLngBounds, World) { // NOLINT auto result = LatLngBounds::world(); ASSERT_DOUBLE_EQ(-90, result.south()); ASSERT_DOUBLE_EQ( 90, result.north()); @@ -68,7 +68,7 @@ TEST(LatLngBounds, World) { ASSERT_DOUBLE_EQ( 180, result.east()); } -TEST(LatLngBounds, Singleton) { +TEST(LatLngBounds, Singleton) { // NOLINT auto result = LatLngBounds::singleton({1, 2}); ASSERT_DOUBLE_EQ(1, result.south()); ASSERT_DOUBLE_EQ(1, result.north()); @@ -76,7 +76,7 @@ TEST(LatLngBounds, Singleton) { ASSERT_DOUBLE_EQ(2, result.east()); } -TEST(LatLngBounds, Hull) { +TEST(LatLngBounds, Hull) { // NOLINT double s = 1, w = 2, n = 3, e = 4; auto swne = LatLngBounds::hull({s, w}, {n, e}); @@ -104,42 +104,42 @@ TEST(LatLngBounds, Hull) { ASSERT_DOUBLE_EQ(e, nwse.east()); } -TEST(LatLngBounds, Empty) { +TEST(LatLngBounds, Empty) { // NOLINT ASSERT_TRUE(LatLngBounds::empty().isEmpty()); ASSERT_FALSE(LatLngBounds::world().isEmpty()); } -TEST(LatLngBounds, Center) { +TEST(LatLngBounds, Center) { // NOLINT auto result = LatLngBounds::hull({1, 2}, {3, 4}).center(); ASSERT_DOUBLE_EQ(2, result.latitude()); ASSERT_DOUBLE_EQ(3, result.longitude()); } -TEST(LatLngBounds, Southwest) { +TEST(LatLngBounds, Southwest) { // NOLINT auto result = LatLngBounds::hull({1, 2}, {3, 4}).southwest(); ASSERT_DOUBLE_EQ(1, result.latitude()); ASSERT_DOUBLE_EQ(2, result.longitude()); } -TEST(LatLngBounds, Northeast) { +TEST(LatLngBounds, Northeast) { // NOLINT auto result = LatLngBounds::hull({1, 2}, {3, 4}).northeast(); ASSERT_DOUBLE_EQ(3, result.latitude()); ASSERT_DOUBLE_EQ(4, result.longitude()); } -TEST(LatLngBounds, Southeast) { +TEST(LatLngBounds, Southeast) { // NOLINT auto result = LatLngBounds::hull({1, 2}, {3, 4}).southeast(); ASSERT_DOUBLE_EQ(1, result.latitude()); ASSERT_DOUBLE_EQ(4, result.longitude()); } -TEST(LatLngBounds, Northwest) { +TEST(LatLngBounds, Northwest) { // NOLINT auto result = LatLngBounds::hull({1, 2}, {3, 4}).northwest(); ASSERT_DOUBLE_EQ(3, result.latitude()); ASSERT_DOUBLE_EQ(2, result.longitude()); } -TEST(LatLng, FromTileID) { +TEST(LatLng, FromTileID) { // NOLINT for (int i = 0; i < 20; i++) { const LatLng ll{ CanonicalTileID(i, 0, 0) }; ASSERT_DOUBLE_EQ(-util::LONGITUDE_MAX, ll.longitude()); @@ -159,7 +159,7 @@ TEST(LatLng, FromTileID) { } } -TEST(LatLng, Boundaries) { +TEST(LatLng, Boundaries) { // NOLINT LatLng coordinate; ASSERT_DOUBLE_EQ(0, coordinate.latitude()); ASSERT_DOUBLE_EQ(0, coordinate.longitude()); @@ -187,7 +187,7 @@ TEST(LatLng, Boundaries) { ASSERT_DOUBLE_EQ(0.5, coordinate.longitude()); } -TEST(LatLngBounds, FromTileID) { +TEST(LatLngBounds, FromTileID) { // NOLINT { const LatLngBounds bounds{ CanonicalTileID(0, 0, 0) }; ASSERT_DOUBLE_EQ(-util::LONGITUDE_MAX, bounds.west()); diff --git a/test/util/http_timeout.test.cpp b/test/util/http_timeout.test.cpp index c9373d955d..c4f000ba68 100644 --- a/test/util/http_timeout.test.cpp +++ b/test/util/http_timeout.test.cpp @@ -6,17 +6,17 @@ using namespace mbgl; using namespace mbgl::http; -TEST(HttpRetry, OtherError) { +TEST(HttpRetry, OtherError) { // NOLINT // Non-retryable ASSERT_EQ(Duration::max(), errorRetryTimeout(Response::Error::Reason::Other, 1)); } -TEST(HttpRetry, NotFound) { +TEST(HttpRetry, NotFound) { // NOLINT // Non-retryable ASSERT_EQ(Duration::max(), errorRetryTimeout(Response::Error::Reason::NotFound, 1)); } -TEST(HttpRetry, ServerError) { +TEST(HttpRetry, ServerError) { // NOLINT // 1-3 failures -> 1 sec ASSERT_EQ(Seconds(1), errorRetryTimeout(Response::Error::Reason::Server, 1)); ASSERT_EQ(Seconds(1), errorRetryTimeout(Response::Error::Reason::Server, 3)); @@ -26,13 +26,13 @@ TEST(HttpRetry, ServerError) { ASSERT_EQ(Seconds(1u << 31), errorRetryTimeout(Response::Error::Reason::Server, 50)); } -TEST(HttpRetry, ConnectionError) { +TEST(HttpRetry, ConnectionError) { // NOLINT // Exponential backoff ASSERT_EQ(Seconds(1), errorRetryTimeout(Response::Error::Reason::Server, 1)); ASSERT_EQ(Seconds(1u << 31), errorRetryTimeout(Response::Error::Reason::Connection, 50)); } -TEST(HttpRetry, RateLimit) { +TEST(HttpRetry, RateLimit) { // NOLINT // Pre-set value from header ASSERT_EQ(Seconds(1), errorRetryTimeout(Response::Error::Reason::Server, 1, { util::now() + Seconds(1) })); @@ -40,18 +40,18 @@ TEST(HttpRetry, RateLimit) { ASSERT_EQ(Seconds(5), errorRetryTimeout(Response::Error::Reason::RateLimit, 1, {})); } -TEST(HttpRetry, ExpiredInitial) { +TEST(HttpRetry, ExpiredInitial) { // NOLINT // 1 sec timeout ASSERT_EQ(Seconds(1), expirationTimeout({ util::now() + Seconds(1) }, 0)); } -TEST(HttpRetry, ExpiredSubsequent) { +TEST(HttpRetry, ExpiredSubsequent) { // NOLINT // exponential backoff ASSERT_EQ(Seconds(1), expirationTimeout({}, 1)); ASSERT_EQ(Seconds(1u << 31), expirationTimeout({}, 50)); } -TEST(HttpRetry, ExpiredNotSet) { +TEST(HttpRetry, ExpiredNotSet) { // NOLINT // No expires header set ASSERT_EQ(Duration::max(), expirationTimeout({}, 0)); } diff --git a/test/util/image.test.cpp b/test/util/image.test.cpp index 4cacf89253..a7114e65ec 100644 --- a/test/util/image.test.cpp +++ b/test/util/image.test.cpp @@ -6,7 +6,7 @@ using namespace mbgl; -TEST(Image, PNGRoundTrip) { +TEST(Image, PNGRoundTrip) { // NOLINT PremultipliedImage rgba({ 1, 1 }); rgba.data[0] = 128; rgba.data[1] = 0; @@ -20,7 +20,7 @@ TEST(Image, PNGRoundTrip) { EXPECT_EQ(255, image.data[3]); } -TEST(Image, PNGRoundTripAlpha) { +TEST(Image, PNGRoundTripAlpha) { // NOLINT PremultipliedImage rgba({ 1, 1 }); rgba.data[0] = 128; rgba.data[1] = 0; @@ -34,7 +34,7 @@ TEST(Image, PNGRoundTripAlpha) { EXPECT_EQ(128, image.data[3]); } -TEST(Image, PNGReadNoProfile) { +TEST(Image, PNGReadNoProfile) { // NOLINT PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/no_profile.png")); EXPECT_EQ(128, image.data[0]); EXPECT_EQ(0, image.data[1]); @@ -42,7 +42,7 @@ TEST(Image, PNGReadNoProfile) { EXPECT_EQ(255, image.data[3]); } -TEST(Image, PNGReadNoProfileAlpha) { +TEST(Image, PNGReadNoProfileAlpha) { // NOLINT PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/no_profile_alpha.png")); EXPECT_EQ(64, image.data[0]); EXPECT_EQ(0, image.data[1]); @@ -50,7 +50,7 @@ TEST(Image, PNGReadNoProfileAlpha) { EXPECT_EQ(128, image.data[3]); } -TEST(Image, PNGReadProfile) { +TEST(Image, PNGReadProfile) { // NOLINT PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/profile.png")); EXPECT_EQ(128, image.data[0]); EXPECT_EQ(0, image.data[1]); @@ -58,7 +58,7 @@ TEST(Image, PNGReadProfile) { EXPECT_EQ(255, image.data[3]); } -TEST(Image, PNGReadProfileAlpha) { +TEST(Image, PNGReadProfileAlpha) { // NOLINT PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/profile_alpha.png")); EXPECT_EQ(64, image.data[0]); EXPECT_EQ(0, image.data[1]); @@ -66,27 +66,27 @@ TEST(Image, PNGReadProfileAlpha) { EXPECT_EQ(128, image.data[3]); } -TEST(Image, PNGTile) { +TEST(Image, PNGTile) { // NOLINT PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/tile.png")); EXPECT_EQ(256u, image.size.width); EXPECT_EQ(256u, image.size.height); } -TEST(Image, JPEGTile) { +TEST(Image, JPEGTile) { // NOLINT PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/tile.jpeg")); EXPECT_EQ(256u, image.size.width); EXPECT_EQ(256u, image.size.height); } #if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS) -TEST(Image, WebPTile) { +TEST(Image, WebPTile) { // NOLINT PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/tile.webp")); EXPECT_EQ(256u, image.size.width); EXPECT_EQ(256u, image.size.height); } #endif // !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS) -TEST(Image, Copy) { +TEST(Image, Copy) { // NOLINT PremultipliedImage src5({5, 5}); PremultipliedImage dst5({5, 5}); PremultipliedImage src10({10, 10}); @@ -115,7 +115,7 @@ TEST(Image, Copy) { EXPECT_THROW(PremultipliedImage::copy(src10, dst10, {0, 0}, {0, 1}, {0, max}), std::out_of_range); } -TEST(Image, Move) { +TEST(Image, Move) { // NOLINT UnassociatedImage rgba({ 1, 1 }); rgba.data[0] = 255; rgba.data[1] = 254; @@ -130,7 +130,7 @@ TEST(Image, Move) { EXPECT_EQ(1u, moved.size.width); } -TEST(Image, Premultiply) { +TEST(Image, Premultiply) { // NOLINT UnassociatedImage rgba({ 1, 1 }); rgba.data[0] = 255; rgba.data[1] = 254; diff --git a/test/util/mapbox.test.cpp b/test/util/mapbox.test.cpp index cdbd85118f..fb773ceb20 100644 --- a/test/util/mapbox.test.cpp +++ b/test/util/mapbox.test.cpp @@ -8,7 +8,7 @@ using namespace mbgl; -TEST(Mapbox, SourceURL) { +TEST(Mapbox, SourceURL) { // NOLINT EXPECT_EQ( "https://api.mapbox.com/v4/user.map.json?access_token=key&secure", mbgl::util::mapbox::normalizeSourceURL(util::API_BASE_URL, "mapbox://user.map", "key")); @@ -29,7 +29,7 @@ TEST(Mapbox, SourceURL) { std::runtime_error); } -TEST(Mapbox, GlyphsURL) { +TEST(Mapbox, GlyphsURL) { // NOLINT EXPECT_EQ( "https://api.mapbox.com/fonts/v1/boxmap/Comic%20Sans/0-255.pbf?access_token=key", mbgl::util::mapbox::normalizeGlyphsURL(util::API_BASE_URL, "mapbox://fonts/boxmap/Comic%20Sans/0-255.pbf", "key")); @@ -47,7 +47,7 @@ TEST(Mapbox, GlyphsURL) { mbgl::util::mapbox::normalizeGlyphsURL(util::API_BASE_URL, "mapbox://path", "key")); } -TEST(Mapbox, StyleURL) { +TEST(Mapbox, StyleURL) { // NOLINT EXPECT_EQ( "mapbox://foo", mbgl::util::mapbox::normalizeStyleURL(util::API_BASE_URL, "mapbox://foo", "key")); @@ -71,7 +71,7 @@ TEST(Mapbox, StyleURL) { mbgl::util::mapbox::normalizeStyleURL(util::API_BASE_URL, "http://path", "key")); } -TEST(Mapbox, SpriteURL) { +TEST(Mapbox, SpriteURL) { // NOLINT EXPECT_EQ( "map/box/sprites@2x.json", mbgl::util::mapbox::normalizeSpriteURL(util::API_BASE_URL, "map/box/sprites@2x.json", "key")); @@ -98,7 +98,7 @@ TEST(Mapbox, SpriteURL) { EXPECT_EQ("mapbox://////", mbgl::util::mapbox::normalizeSpriteURL(util::API_BASE_URL, "mapbox://////", "key")); } -TEST(Mapbox, TileURL) { +TEST(Mapbox, TileURL) { // NOLINT EXPECT_EQ( "https://api.mapbox.com/v4/a.b/0/0/0.pbf?access_token=key", mbgl::util::mapbox::normalizeTileURL(util::API_BASE_URL, "mapbox://tiles/a.b/0/0/0.pbf", "key")); @@ -125,7 +125,7 @@ TEST(Mapbox, TileURL) { mbgl::util::mapbox::normalizeSpriteURL(util::API_BASE_URL, "http://path", "key")); } -TEST(Mapbox, CanonicalURL) { +TEST(Mapbox, CanonicalURL) { // NOLINT EXPECT_EQ( "mapbox://tiles/a.b/{z}/{x}/{y}.vector.pbf", mbgl::util::mapbox::canonicalizeTileURL("http://a.tiles.mapbox.com/v4/a.b/{z}/{x}/{y}.vector.pbf", SourceType::Vector, 512)); @@ -212,7 +212,7 @@ TEST(Mapbox, CanonicalURL) { mbgl::util::mapbox::canonicalizeTileURL("http://api.mapbox.com/v4/a.b/{z}/{x}/{y}/.", SourceType::Raster, 256)); } -TEST(Mapbox, CanonicalizeRasterTileset) { +TEST(Mapbox, CanonicalizeRasterTileset) { // NOLINT mbgl::Tileset tileset; tileset.tiles = { "http://a.tiles.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.png?access_token=key" @@ -227,7 +227,7 @@ TEST(Mapbox, CanonicalizeRasterTileset) { #endif } -TEST(Mapbox, CanonicalizeVectorTileset) { +TEST(Mapbox, CanonicalizeVectorTileset) { // NOLINT mbgl::Tileset tileset; tileset.tiles = { "http://a.tiles.mapbox.com/v4/mapbox.streets/{z}/{x}/{y}.vector.pbf?access_token=key" diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp index f824ba30ca..07df857c89 100644 --- a/test/util/memory.test.cpp +++ b/test/util/memory.test.cpp @@ -70,7 +70,7 @@ private: std::unordered_map> cache; }; -TEST(Memory, Vector) { +TEST(Memory, Vector) { // NOLINT MemoryTest test; Map map(test.backend, { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still); @@ -80,7 +80,7 @@ TEST(Memory, Vector) { test::render(map, test.view); } -TEST(Memory, Raster) { +TEST(Memory, Raster) { // NOLINT MemoryTest test; Map map(test.backend, { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still); @@ -109,7 +109,7 @@ bool shouldRunFootprint() { // idea is to try to keep the memory footprint within // reasonable limits, so this test acts more like a // safeguard. -TEST(Memory, Footprint) { +TEST(Memory, Footprint) { // NOLINT if (!shouldRunFootprint()) { return; } diff --git a/test/util/merge_lines.test.cpp b/test/util/merge_lines.test.cpp index 6c8387c451..56b1e5ff1f 100644 --- a/test/util/merge_lines.test.cpp +++ b/test/util/merge_lines.test.cpp @@ -50,7 +50,7 @@ public: } }; -TEST(MergeLines, SameText) { +TEST(MergeLines, SameText) { // NOLINT // merges lines with the same text std::vector input1; input1.push_back(SymbolFeatureStub({}, FeatureType::LineString, {{{0, 0}, {1, 0}, {2, 0}}}, {}, aaa, {}, 0)); @@ -76,7 +76,7 @@ TEST(MergeLines, SameText) { } } -TEST(MergeLines, BothEnds) { +TEST(MergeLines, BothEnds) { // NOLINT // mergeLines handles merge from both ends std::vector input2; input2.push_back(SymbolFeatureStub { {}, FeatureType::LineString, {{{0, 0}, {1, 0}, {2, 0}}}, {}, aaa, {}, 0 }); @@ -96,7 +96,7 @@ TEST(MergeLines, BothEnds) { } } -TEST(MergeLines, CircularLines) { +TEST(MergeLines, CircularLines) { // NOLINT // mergeLines handles circular lines std::vector input3; input3.push_back(SymbolFeatureStub { {}, FeatureType::LineString, {{{0, 0}, {1, 0}, {2, 0}}}, {}, aaa, {}, 0 }); @@ -116,7 +116,7 @@ TEST(MergeLines, CircularLines) { } } -TEST(MergeLines, EmptyOuterGeometry) { +TEST(MergeLines, EmptyOuterGeometry) { // NOLINT std::vector input; input.push_back(SymbolFeatureStub { {}, FeatureType::LineString, {}, {}, aaa, {}, 0 }); @@ -127,7 +127,7 @@ TEST(MergeLines, EmptyOuterGeometry) { EXPECT_EQ(input[0].geometry, expected[0].getGeometries()); } -TEST(MergeLines, EmptyInnerGeometry) { +TEST(MergeLines, EmptyInnerGeometry) { // NOLINT std::vector input; input.push_back(SymbolFeatureStub { {}, FeatureType::LineString, {{}}, {}, aaa, {}, 0 }); diff --git a/test/util/number_conversions.test.cpp b/test/util/number_conversions.test.cpp index cfeda3eec7..bfd20f85c1 100644 --- a/test/util/number_conversions.test.cpp +++ b/test/util/number_conversions.test.cpp @@ -5,7 +5,7 @@ using namespace mbgl; -TEST(NumberConversions, number_to_string) { +TEST(NumberConversions, number_to_string) { // NOLINT EXPECT_EQ("0", util::toString(0)); EXPECT_EQ("10", util::toString(10)); EXPECT_EQ("-10", util::toString(-10)); diff --git a/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp index feaabf2630..6c9f5e6d5e 100644 --- a/test/util/offscreen_texture.test.cpp +++ b/test/util/offscreen_texture.test.cpp @@ -10,7 +10,7 @@ using namespace mbgl; -TEST(OffscreenTexture, EmptyRed) { +TEST(OffscreenTexture, EmptyRed) { // NOLINT HeadlessBackend backend { test::sharedDisplay() }; BackendScope scope { backend }; OffscreenView view(backend.getContext(), { 512, 256 }); @@ -68,7 +68,7 @@ struct Buffer { }; -TEST(OffscreenTexture, RenderToTexture) { +TEST(OffscreenTexture, RenderToTexture) { // NOLINT HeadlessBackend backend { test::sharedDisplay() }; BackendScope scope { backend }; auto& context = backend.getContext(); diff --git a/test/util/position.test.cpp b/test/util/position.test.cpp index 938a08dded..27f01f6434 100644 --- a/test/util/position.test.cpp +++ b/test/util/position.test.cpp @@ -27,7 +27,7 @@ Position createPosition(std::array pos) { return Position(pos); } -TEST(Position, Calculations) { +TEST(Position, Calculations) { // NOLINT std::array spherical{{ 2, 10, 270 }}; Position position(spherical); diff --git a/test/util/projection.test.cpp b/test/util/projection.test.cpp index a489320dde..e6129f44e3 100644 --- a/test/util/projection.test.cpp +++ b/test/util/projection.test.cpp @@ -7,7 +7,7 @@ using namespace mbgl; -TEST(Projection, MetersPerPixelAtLatitude) { +TEST(Projection, MetersPerPixelAtLatitude) { // NOLINT double zoom = 0; EXPECT_DOUBLE_EQ(Projection::getMetersPerPixelAtLatitude(0, zoom), 78271.516964020484); EXPECT_DOUBLE_EQ(Projection::getMetersPerPixelAtLatitude(-util::LATITUDE_MAX, zoom), 6752.2284729446501); @@ -34,7 +34,7 @@ TEST(Projection, MetersPerPixelAtLatitude) { Projection::getMetersPerPixelAtLatitude(0, util::MAX_ZOOM)); } -TEST(Projection, ProjectedMeters) { +TEST(Projection, ProjectedMeters) { // NOLINT auto latLng = LatLng {}; auto projectedMeters = Projection::projectedMetersForLatLng(latLng); EXPECT_EQ(projectedMeters.northing(), projectedMeters.easting()); @@ -61,7 +61,7 @@ TEST(Projection, ProjectedMeters) { EXPECT_EQ(latLng.longitude(), util::LONGITUDE_MAX); } -TEST(Projection, InvalidProjectedMeters) { +TEST(Projection, InvalidProjectedMeters) { // NOLINT try { ProjectedMeters { NAN }; ASSERT_TRUE(false) << "should throw"; diff --git a/test/util/run_loop.test.cpp b/test/util/run_loop.test.cpp index 57bc613f9e..18cad3a189 100644 --- a/test/util/run_loop.test.cpp +++ b/test/util/run_loop.test.cpp @@ -5,7 +5,7 @@ using namespace mbgl::util; -TEST(RunLoop, Stop) { +TEST(RunLoop, Stop) { // NOLINT RunLoop loop(RunLoop::Type::New); Timer timer; @@ -16,7 +16,7 @@ TEST(RunLoop, Stop) { loop.run(); } -TEST(RunLoop, MultipleStop) { +TEST(RunLoop, MultipleStop) { // NOLINT RunLoop loop(RunLoop::Type::New); Timer timer; @@ -30,7 +30,7 @@ TEST(RunLoop, MultipleStop) { loop.run(); } -TEST(RunLoop, MultipleRun) { +TEST(RunLoop, MultipleRun) { // NOLINT RunLoop loop(RunLoop::Type::New); Timer timer; diff --git a/test/util/text_conversions.test.cpp b/test/util/text_conversions.test.cpp index 442a49fa0c..d29086f486 100644 --- a/test/util/text_conversions.test.cpp +++ b/test/util/text_conversions.test.cpp @@ -6,7 +6,7 @@ using namespace mbgl; -TEST(TextConversions, to_upper) { +TEST(TextConversions, to_upper) { // NOLINT EXPECT_EQ(std::string("STREET"), platform::uppercase("strEEt")); // EN EXPECT_EQ(std::string("ROAD"), platform::uppercase("rOAd")); // EN @@ -20,7 +20,7 @@ TEST(TextConversions, to_upper) { } -TEST(TextConversions, to_lower) { +TEST(TextConversions, to_lower) { // NOLINT EXPECT_EQ(std::string("street"), platform::lowercase("strEEt")); // EN EXPECT_EQ(std::string("road"), platform::lowercase("rOAd")); // EN diff --git a/test/util/thread.test.cpp b/test/util/thread.test.cpp index 972bddf383..0cbf333123 100644 --- a/test/util/thread.test.cpp +++ b/test/util/thread.test.cpp @@ -63,7 +63,7 @@ public: const std::thread::id tid; }; -TEST(Thread, invoke) { +TEST(Thread, invoke) { // NOLINT const std::thread::id tid = std::this_thread::get_id(); RunLoop loop; @@ -113,7 +113,7 @@ TEST(Thread, invoke) { loop.run(); } -TEST(Thread, context) { +TEST(Thread, context) { // NOLINT const std::thread::id tid = std::this_thread::get_id(); RunLoop loop; @@ -141,7 +141,7 @@ public: } }; -TEST(Thread, ExecutesAfter) { +TEST(Thread, ExecutesAfter) { // NOLINT RunLoop loop; Thread thread({"Test"}); @@ -161,7 +161,7 @@ TEST(Thread, ExecutesAfter) { EXPECT_TRUE(didAfter); } -TEST(Thread, WorkRequestDeletionWaitsForWorkToComplete) { +TEST(Thread, WorkRequestDeletionWaitsForWorkToComplete) { // NOLINT RunLoop loop; Thread thread({"Test"}); @@ -180,7 +180,7 @@ TEST(Thread, WorkRequestDeletionWaitsForWorkToComplete) { EXPECT_TRUE(didWork); } -TEST(Thread, WorkRequestDeletionCancelsAfter) { +TEST(Thread, WorkRequestDeletionCancelsAfter) { // NOLINT RunLoop loop; Thread thread({"Test"}); @@ -199,7 +199,7 @@ TEST(Thread, WorkRequestDeletionCancelsAfter) { EXPECT_FALSE(didAfter); } -TEST(Thread, WorkRequestDeletionCancelsImmediately) { +TEST(Thread, WorkRequestDeletionCancelsImmediately) { // NOLINT RunLoop loop; Thread thread({"Test"}); @@ -219,7 +219,7 @@ TEST(Thread, WorkRequestDeletionCancelsImmediately) { request1.reset(); } -TEST(Thread, DeletePausedThread) { +TEST(Thread, DeletePausedThread) { // NOLINT RunLoop loop; std::atomic_bool flag(false); @@ -235,7 +235,7 @@ TEST(Thread, DeletePausedThread) { ASSERT_TRUE(flag); } -TEST(Thread, Pause) { +TEST(Thread, Pause) { // NOLINT RunLoop loop; std::atomic_bool flag(false); @@ -255,7 +255,7 @@ TEST(Thread, Pause) { loop.run(); } -TEST(Thread, Resume) { +TEST(Thread, Resume) { // NOLINT RunLoop loop; std::atomic_bool flag(false); @@ -280,7 +280,7 @@ TEST(Thread, Resume) { ASSERT_TRUE(flag); } -TEST(Thread, PauseResume) { +TEST(Thread, PauseResume) { // NOLINT RunLoop loop; Thread thread({"Test"}); diff --git a/test/util/thread_local.test.cpp b/test/util/thread_local.test.cpp index 4ee7042580..a685f3c3d3 100644 --- a/test/util/thread_local.test.cpp +++ b/test/util/thread_local.test.cpp @@ -30,7 +30,7 @@ ThreadLocal TestThread::number; } // namespace -TEST(ThreadLocalStorage, Basic) { +TEST(ThreadLocalStorage, Basic) { // NOLINT RunLoop loop; int number1 = 1; @@ -48,7 +48,7 @@ TEST(ThreadLocalStorage, Basic) { EXPECT_EQ(number3, thread3.invokeSync(&TestThread::getNumber)); } -TEST(ThreadLocalStorage, NotSetReturnsNull) { +TEST(ThreadLocalStorage, NotSetReturnsNull) { // NOLINT static ThreadLocal number; EXPECT_EQ(nullptr, number.get()); @@ -75,7 +75,7 @@ ThreadLocal TestThreadReclaim::counter; } // namespace -TEST(ThreadLocalStorage, AutoReclaim) { +TEST(ThreadLocalStorage, AutoReclaim) { // NOLINT RunLoop loop; unsigned counter = 0; diff --git a/test/util/tile_cover.test.cpp b/test/util/tile_cover.test.cpp index c746e6dab5..2cb5623803 100644 --- a/test/util/tile_cover.test.cpp +++ b/test/util/tile_cover.test.cpp @@ -6,28 +6,28 @@ using namespace mbgl; -TEST(TileCover, Empty) { +TEST(TileCover, Empty) { // NOLINT EXPECT_EQ((std::vector{}), util::tileCover(LatLngBounds::empty(), 0)); } -TEST(TileCover, Arctic) { +TEST(TileCover, Arctic) { // NOLINT EXPECT_EQ((std::vector{}), util::tileCover(LatLngBounds::hull({ 86, -180 }, { 90, 180 }), 0)); } -TEST(TileCover, Antarctic) { +TEST(TileCover, Antarctic) { // NOLINT EXPECT_EQ((std::vector{}), util::tileCover(LatLngBounds::hull({ -86, -180 }, { -90, 180 }), 0)); } -TEST(TileCover, WorldZ0) { +TEST(TileCover, WorldZ0) { // NOLINT EXPECT_EQ((std::vector{ { 0, 0, 0 }, }), util::tileCover(LatLngBounds::world(), 0)); } -TEST(TileCover, Pitch) { +TEST(TileCover, Pitch) { // NOLINT Transform transform; transform.resize({ 512, 512 }); // slightly offset center so that tile order is better defined @@ -42,19 +42,19 @@ TEST(TileCover, Pitch) { util::tileCover(transform.getState(), 2)); } -TEST(TileCover, WorldZ1) { +TEST(TileCover, WorldZ1) { // NOLINT EXPECT_EQ((std::vector{ { 1, 0, 0 }, { 1, 0, 1 }, { 1, 1, 0 }, { 1, 1, 1 }, }), util::tileCover(LatLngBounds::world(), 1)); } -TEST(TileCover, SingletonZ0) { +TEST(TileCover, SingletonZ0) { // NOLINT EXPECT_EQ((std::vector{}), util::tileCover(LatLngBounds::singleton({ 0, 0 }), 0)); } -TEST(TileCover, SingletonZ1) { +TEST(TileCover, SingletonZ1) { // NOLINT EXPECT_EQ((std::vector{}), util::tileCover(LatLngBounds::singleton({ 0, 0 }), 1)); } @@ -62,14 +62,14 @@ TEST(TileCover, SingletonZ1) { static const LatLngBounds sanFrancisco = LatLngBounds::hull({ 37.6609, -122.5744 }, { 37.8271, -122.3204 }); -TEST(TileCover, SanFranciscoZ0) { +TEST(TileCover, SanFranciscoZ0) { // NOLINT EXPECT_EQ((std::vector{ { 0, 0, 0 }, }), util::tileCover(sanFrancisco, 0)); } -TEST(TileCover, SanFranciscoZ10) { +TEST(TileCover, SanFranciscoZ10) { // NOLINT EXPECT_EQ((std::vector{ { 10, 163, 395 }, { 10, 163, 396 }, { 10, 164, 395 }, { 10, 164, 396 }, @@ -80,7 +80,7 @@ TEST(TileCover, SanFranciscoZ10) { static const LatLngBounds sanFranciscoWrapped = LatLngBounds::hull({ 37.6609, 238.5744 }, { 37.8271, 238.3204 }); -TEST(TileCover, SanFranciscoZ0Wrapped) { +TEST(TileCover, SanFranciscoZ0Wrapped) { // NOLINT EXPECT_EQ((std::vector{ { 0, 1, 0 } }), util::tileCover(sanFranciscoWrapped, 0)); } diff --git a/test/util/timer.test.cpp b/test/util/timer.test.cpp index f6253ab6d3..c0c15e8977 100644 --- a/test/util/timer.test.cpp +++ b/test/util/timer.test.cpp @@ -9,7 +9,7 @@ using namespace mbgl::util; -TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Basic)) { +TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Basic)) { // NOLINT RunLoop loop; Timer timer; @@ -33,7 +33,7 @@ TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Basic)) { EXPECT_LE(totalTime, expectedTotalTime * 1.2); } -TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Repeat)) { +TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Repeat)) { // NOLINT RunLoop loop; Timer timer; @@ -59,7 +59,7 @@ TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Repeat)) { EXPECT_LE(totalTime, expectedTotalTime * 1.2); } -TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Stop)) { +TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Stop)) { // NOLINT RunLoop loop; Timer timer1; @@ -95,7 +95,7 @@ TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(Stop)) { EXPECT_LE(totalTime, expectedTotalTime * 1.2); } -TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(DestroyShouldStop)) { +TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(DestroyShouldStop)) { // NOLINT RunLoop loop; auto timer1 = std::make_unique(); @@ -131,7 +131,7 @@ TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(DestroyShouldStop)) { EXPECT_LE(totalTime, expectedTotalTime * 1.2); } -TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(StartOverrides)) { +TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(StartOverrides)) { // NOLINT RunLoop loop; Timer timer; @@ -165,7 +165,7 @@ TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(StartOverrides)) { EXPECT_LE(totalTime, expectedTotalTime * 1.2); } -TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(CanStopNonStartedTimer)) { +TEST(Timer, TEST_REQUIRES_ACCURATE_TIMING(CanStopNonStartedTimer)) { // NOLINT RunLoop loop; Timer timer; diff --git a/test/util/token.test.cpp b/test/util/token.test.cpp index a2885dc8dd..2d34b8cd8e 100644 --- a/test/util/token.test.cpp +++ b/test/util/token.test.cpp @@ -5,7 +5,7 @@ using namespace mbgl; -TEST(Token, replaceTokens) { +TEST(Token, replaceTokens) { // NOLINT EXPECT_EQ("literal", mbgl::util::replaceTokens("literal", [](const std::string& token) -> std::string { if (token == "name") return "14th St NW"; return ""; diff --git a/test/util/url.test.cpp b/test/util/url.test.cpp index 55d8af2811..a7481efce4 100644 --- a/test/util/url.test.cpp +++ b/test/util/url.test.cpp @@ -6,7 +6,7 @@ using namespace mbgl::util; -TEST(URL, Scheme) { +TEST(URL, Scheme) { // NOLINT EXPECT_EQ(URL::Segment({ 0, 4 }), URL("http://example.com/test?query=foo").scheme); EXPECT_EQ(URL::Segment({ 0, 4 }), URL("http://127.0.0.1:8080/test?query=foo").scheme); EXPECT_EQ(URL::Segment({ 0, 4 }), URL("http://[2a01:4f8:c17:3680::386a:6f3d]:8080/test?query=foo").scheme); @@ -24,7 +24,7 @@ TEST(URL, Scheme) { EXPECT_EQ(URL::Segment({ 0, 4 }), URL("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D").scheme); } -TEST(URL, Query) { +TEST(URL, Query) { // NOLINT EXPECT_EQ(URL::Segment({ 23, 10 }), URL("http://example.com/test?query=foo").query); EXPECT_EQ(URL::Segment({ 26, 10 }), URL("http://127.0.0.1:8080/test?query=foo").query); EXPECT_EQ(URL::Segment({ 47, 10 }), URL("http://[2a01:4f8:c17:3680::386a:6f3d]:8080/test?query=foo").query); @@ -45,7 +45,7 @@ TEST(URL, Query) { EXPECT_EQ(URL::Segment({ 47, 0 }), URL("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D").query); } -TEST(URL, Domain) { +TEST(URL, Domain) { // NOLINT EXPECT_EQ(URL::Segment({ 7, 11 }), URL("http://example.com/test?query=foo").domain); EXPECT_EQ(URL::Segment({ 7, 14 }), URL("http://127.0.0.1:8080/test?query=foo").domain); EXPECT_EQ(URL::Segment({ 7, 35 }), URL("http://[2a01:4f8:c17:3680::386a:6f3d]:8080/test?query=foo").domain); @@ -72,7 +72,7 @@ TEST(URL, Domain) { EXPECT_EQ(URL::Segment({ 5, 17 }), URL("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D").domain); } -TEST(URL, Path) { +TEST(URL, Path) { // NOLINT EXPECT_EQ(URL::Segment({ 18, 5 }), URL("http://example.com/test?query=foo").path); EXPECT_EQ(URL::Segment({ 21, 5 }), URL("http://127.0.0.1:8080/test?query=foo").path); EXPECT_EQ(URL::Segment({ 42, 5 }), URL("http://[2a01:4f8:c17:3680::386a:6f3d]:8080/test?query=foo").path); @@ -93,7 +93,7 @@ TEST(URL, Path) { auto URLPath = [](const char* str) { const URL url(str); return Path(str, url.path.first, url.path.second); }; -TEST(Path, Directory) { +TEST(Path, Directory) { // NOLINT EXPECT_EQ(Path::Segment({ 0, 8 }), Path("foo/bar/baz.ext").directory); EXPECT_EQ(Path::Segment({ 0, 8 }), Path("foo.bar/baz.ext").directory); EXPECT_EQ(Path::Segment({ 0, 8 }), Path("foo.bar/baz").directory); @@ -117,7 +117,7 @@ TEST(Path, Directory) { EXPECT_EQ(Path::Segment({ 0, 1 }), Path("/").directory); } -TEST(Path, URLDirectory) { +TEST(Path, URLDirectory) { // NOLINT EXPECT_EQ(Path::Segment({ 18, 9 }), URLPath("http://example.com/foo/bar/baz.ext").directory); EXPECT_EQ(Path::Segment({ 18, 9 }), URLPath("http://example.com/foo/bar/baz.ext?query=foo.bar").directory); EXPECT_EQ(Path::Segment({ 18, 9 }), URLPath("http://example.com/foo.bar/baz.ext").directory); @@ -142,7 +142,7 @@ TEST(Path, URLDirectory) { EXPECT_EQ(Path::Segment({ 18, 0 }), URLPath("http://example.com?query=foo.bar").directory); } -TEST(Path, Extension) { +TEST(Path, Extension) { // NOLINT EXPECT_EQ(Path::Segment({ 11, 4 }), Path("foo/bar/baz.ext").extension); EXPECT_EQ(Path::Segment({ 11, 4 }), Path("foo.bar/baz.ext").extension); EXPECT_EQ(Path::Segment({ 18, 4 }), Path("foo.bar/baz.vector.pbf").extension); @@ -168,7 +168,7 @@ TEST(Path, Extension) { EXPECT_EQ(Path::Segment({ 1, 0 }), Path("/").extension); } -TEST(Path, URLExtension) { +TEST(Path, URLExtension) { // NOLINT EXPECT_EQ(Path::Segment({ 30, 4 }), URLPath("http://example.com/foo/bar/baz.ext").extension); EXPECT_EQ(Path::Segment({ 30, 4 }), URLPath("http://example.com/foo/bar/baz.ext?query=foo.bar").extension); EXPECT_EQ(Path::Segment({ 30, 4 }), URLPath("http://example.com/foo.bar/baz.ext").extension); @@ -193,7 +193,7 @@ TEST(Path, URLExtension) { EXPECT_EQ(Path::Segment({ 18, 0 }), URLPath("http://example.com?query=foo.bar").extension); } -TEST(Path, Filename) { +TEST(Path, Filename) { // NOLINT EXPECT_EQ(Path::Segment({ 8, 3 }), Path("foo/bar/baz.ext").filename); EXPECT_EQ(Path::Segment({ 8, 3 }), Path("foo.bar/baz.ext").filename); EXPECT_EQ(Path::Segment({ 8, 3 }), Path("foo.bar/baz").filename); @@ -217,7 +217,7 @@ TEST(Path, Filename) { EXPECT_EQ(Path::Segment({ 1, 0 }), Path("/").filename); } -TEST(Path, URLFilename) { +TEST(Path, URLFilename) { // NOLINT EXPECT_EQ(Path::Segment({ 27, 3 }), URLPath("http://example.com/foo/bar/baz.ext").filename); EXPECT_EQ(Path::Segment({ 27, 3 }), URLPath("http://example.com/foo/bar/baz.ext?query=foo.bar").filename); EXPECT_EQ(Path::Segment({ 27, 3 }), URLPath("http://example.com/foo.bar/baz.ext").filename); diff --git a/test/util/work_queue.test.cpp b/test/util/work_queue.test.cpp index 60c72f7358..027e68d6c7 100644 --- a/test/util/work_queue.test.cpp +++ b/test/util/work_queue.test.cpp @@ -20,7 +20,7 @@ private: WorkQueue* queue; }; -TEST(WorkQueue, push) { +TEST(WorkQueue, push) { // NOLINT RunLoop loop; WorkQueue queue; @@ -42,7 +42,7 @@ TEST(WorkQueue, push) { loop.run(); } -TEST(WorkQueue, cancel) { +TEST(WorkQueue, cancel) { // NOLINT RunLoop loop; WorkQueue queue; -- cgit v1.2.1