summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/api/annotations.cpp2
-rw-r--r--test/fixtures/mock_file_source.cpp2
-rw-r--r--test/fixtures/util.cpp4
-rw-r--r--test/miscellaneous/async_task.cpp2
-rw-r--r--test/miscellaneous/binpack.cpp2
-rw-r--r--test/miscellaneous/thread_local.cpp4
-rw-r--r--test/storage/file_reading.cpp2
-rw-r--r--test/style/resource_loading.cpp2
8 files changed, 10 insertions, 10 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index d944887f20..d3299443f8 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -24,7 +24,7 @@ std::string getFileSourceRoot() {
#endif
}
-}
+} // namespace
std::shared_ptr<SpriteImage> defaultMarker() {
PremultipliedImage image = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
diff --git a/test/fixtures/mock_file_source.cpp b/test/fixtures/mock_file_source.cpp
index 7b4ca82e04..b0d7018873 100644
--- a/test/fixtures/mock_file_source.cpp
+++ b/test/fixtures/mock_file_source.cpp
@@ -158,4 +158,4 @@ void MockFileSource::cancel(FileRequest* req) {
thread_->invoke(&Impl::cancelRequest, req);
}
-}
+} // namespace mbgl
diff --git a/test/fixtures/util.cpp b/test/fixtures/util.cpp
index ebd530eaac..c3ce1b7efb 100644
--- a/test/fixtures/util.cpp
+++ b/test/fixtures/util.cpp
@@ -113,5 +113,5 @@ void checkImage(const std::string& base,
util::write_file(base + "/diff.png", encodePNG(diff));
}
-}
-}
+} // namespace test
+} // namespace mbgl
diff --git a/test/miscellaneous/async_task.cpp b/test/miscellaneous/async_task.cpp
index 4873ec5afc..c1a2bd82e0 100644
--- a/test/miscellaneous/async_task.cpp
+++ b/test/miscellaneous/async_task.cpp
@@ -33,7 +33,7 @@ private:
AsyncTask *async;
};
-}
+} // namespace
TEST(AsyncTask, RequestCoalescing) {
RunLoop loop;
diff --git a/test/miscellaneous/binpack.cpp b/test/miscellaneous/binpack.cpp
index a597f0a299..54f410a0be 100644
--- a/test/miscellaneous/binpack.cpp
+++ b/test/miscellaneous/binpack.cpp
@@ -9,7 +9,7 @@ namespace mbgl {
template <typename T> ::std::ostream& operator<<(::std::ostream& os, const Rect<T>& t) {
return os << "Rect { " << t.x << ", " << t.y << ", " << t.w << ", " << t.h << " }";
}
-}
+} // namespace mbgl
TEST(BinPack, Allocating) {
mbgl::BinPack<uint16_t> bin(128, 128);
diff --git a/test/miscellaneous/thread_local.cpp b/test/miscellaneous/thread_local.cpp
index 6f9523f6ef..aeaf187540 100644
--- a/test/miscellaneous/thread_local.cpp
+++ b/test/miscellaneous/thread_local.cpp
@@ -28,7 +28,7 @@ private:
ThreadLocal<int> TestThread::number;
-}
+} // namespace
TEST(ThreadLocalStorage, Basic) {
RunLoop loop;
@@ -73,7 +73,7 @@ private:
ThreadLocal<DtorCounter> TestThreadReclaim::counter;
-}
+} // namespace
TEST(ThreadLocalStorage, AutoReclaim) {
RunLoop loop;
diff --git a/test/storage/file_reading.cpp b/test/storage/file_reading.cpp
index 1b1b1b2888..7565ad3d66 100644
--- a/test/storage/file_reading.cpp
+++ b/test/storage/file_reading.cpp
@@ -52,7 +52,7 @@ private:
std::function<void(mbgl::Response)> requestCallback;
};
-}
+} // namespace
TEST_F(Storage, AssetStress) {
SCOPED_TEST(AssetStress)
diff --git a/test/style/resource_loading.cpp b/test/style/resource_loading.cpp
index f5019cfd82..c646f0372a 100644
--- a/test/style/resource_loading.cpp
+++ b/test/style/resource_loading.cpp
@@ -141,7 +141,7 @@ void runTestCase(MockFileSource::Type type,
}
}
-}
+} // namespace
class ResourceLoading : public ::testing::TestWithParam<std::pair<std::string, std::string>> {
};