From 26cdab02a8ca3517389468045ca84149dc20f850 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 30 Jun 2020 16:46:46 +0200 Subject: Cleanup: move tests into their corresponding namespace --- tests/gtests/blenlib/BLI_array_test.cc | 4 +++- tests/gtests/blenlib/BLI_index_mask_test.cc | 4 +++- tests/gtests/blenlib/BLI_index_range_test.cc | 4 +++- tests/gtests/blenlib/BLI_linear_allocator_test.cc | 4 +++- tests/gtests/blenlib/BLI_map_test.cc | 4 +++- tests/gtests/blenlib/BLI_span_test.cc | 4 +++- tests/gtests/blenlib/BLI_stack_cxx_test.cc | 4 +++- tests/gtests/blenlib/BLI_string_ref_test.cc | 6 +++--- tests/gtests/blenlib/BLI_vector_set_test.cc | 4 +++- tests/gtests/blenlib/BLI_vector_test.cc | 4 +++- 10 files changed, 30 insertions(+), 12 deletions(-) (limited to 'tests/gtests/blenlib') diff --git a/tests/gtests/blenlib/BLI_array_test.cc b/tests/gtests/blenlib/BLI_array_test.cc index 08f61a19900..9c77c69e296 100644 --- a/tests/gtests/blenlib/BLI_array_test.cc +++ b/tests/gtests/blenlib/BLI_array_test.cc @@ -2,7 +2,7 @@ #include "BLI_strict_flags.h" #include "testing/testing.h" -using namespace blender; +namespace blender { TEST(array, DefaultConstructor) { @@ -159,3 +159,5 @@ TEST(array, NoInitializationSizeConstructor) array.~Array(); } } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_index_mask_test.cc b/tests/gtests/blenlib/BLI_index_mask_test.cc index 63b528c91b1..50b32be6364 100644 --- a/tests/gtests/blenlib/BLI_index_mask_test.cc +++ b/tests/gtests/blenlib/BLI_index_mask_test.cc @@ -1,7 +1,7 @@ #include "BLI_index_mask.hh" #include "testing/testing.h" -using namespace blender; +namespace blender { TEST(index_mask, DefaultConstructor) { @@ -37,3 +37,5 @@ TEST(index_mask, RangeConstructor) EXPECT_EQ(indices[1], 4); EXPECT_EQ(indices[2], 5); } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_index_range_test.cc b/tests/gtests/blenlib/BLI_index_range_test.cc index 6b628909f18..e484da5ef42 100644 --- a/tests/gtests/blenlib/BLI_index_range_test.cc +++ b/tests/gtests/blenlib/BLI_index_range_test.cc @@ -3,7 +3,7 @@ #include "BLI_vector.hh" #include "testing/testing.h" -using namespace blender; +namespace blender { TEST(index_range, DefaultConstructor) { @@ -137,3 +137,5 @@ TEST(index_range, AsSpan) EXPECT_EQ(span[2], 6u); EXPECT_EQ(span[3], 7u); } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_linear_allocator_test.cc b/tests/gtests/blenlib/BLI_linear_allocator_test.cc index 9c230d404f2..bbea4c1239f 100644 --- a/tests/gtests/blenlib/BLI_linear_allocator_test.cc +++ b/tests/gtests/blenlib/BLI_linear_allocator_test.cc @@ -2,7 +2,7 @@ #include "BLI_strict_flags.h" #include "testing/testing.h" -using namespace blender; +namespace blender { static bool is_aligned(void *ptr, uint alignment) { @@ -112,3 +112,5 @@ TEST(linear_allocator, ConstructArrayCopy) EXPECT_EQ(span1[1], 2); EXPECT_EQ(span2[2], 3); } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc index 7a67255d8d3..062c9aa46bb 100644 --- a/tests/gtests/blenlib/BLI_map_test.cc +++ b/tests/gtests/blenlib/BLI_map_test.cc @@ -6,7 +6,7 @@ #include "BLI_vector.hh" #include "testing/testing.h" -using namespace blender; +namespace blender { TEST(map, DefaultConstructor) { @@ -584,3 +584,5 @@ TEST(map, Benchmark) */ #endif /* Benchmark */ + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_span_test.cc b/tests/gtests/blenlib/BLI_span_test.cc index 2662ab55584..375cb694b7b 100644 --- a/tests/gtests/blenlib/BLI_span_test.cc +++ b/tests/gtests/blenlib/BLI_span_test.cc @@ -3,7 +3,7 @@ #include "BLI_vector.hh" #include "testing/testing.h" -using namespace blender; +namespace blender { TEST(span, FromSmallVector) { @@ -282,3 +282,5 @@ TEST(span, CastLargerSize) EXPECT_EQ(a_span.size(), 4u); EXPECT_EQ(new_a_span.size(), 2u); } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_stack_cxx_test.cc b/tests/gtests/blenlib/BLI_stack_cxx_test.cc index c078c3e8991..b59ac1f7ec1 100644 --- a/tests/gtests/blenlib/BLI_stack_cxx_test.cc +++ b/tests/gtests/blenlib/BLI_stack_cxx_test.cc @@ -3,7 +3,7 @@ #include "BLI_vector.hh" #include "testing/testing.h" -using namespace blender; +namespace blender { TEST(stack, DefaultConstructor) { @@ -182,3 +182,5 @@ TEST(stack, OveralignedValues) EXPECT_EQ((uintptr_t)&stack.peek() % 512, 0); } } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_string_ref_test.cc b/tests/gtests/blenlib/BLI_string_ref_test.cc index 5a2d2463375..1f84b8577b4 100644 --- a/tests/gtests/blenlib/BLI_string_ref_test.cc +++ b/tests/gtests/blenlib/BLI_string_ref_test.cc @@ -3,9 +3,7 @@ #include "BLI_vector.hh" #include "testing/testing.h" -using blender::StringRef; -using blender::StringRefNull; -using blender::Vector; +namespace blender { TEST(string_ref_null, DefaultConstructor) { @@ -273,3 +271,5 @@ TEST(string_ref, Copy) EXPECT_EQ(dst[6], 0xFF); EXPECT_EQ(ref, dst); } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_vector_set_test.cc b/tests/gtests/blenlib/BLI_vector_set_test.cc index c0374e87cd6..982081f4b4c 100644 --- a/tests/gtests/blenlib/BLI_vector_set_test.cc +++ b/tests/gtests/blenlib/BLI_vector_set_test.cc @@ -2,7 +2,7 @@ #include "BLI_vector_set.hh" #include "testing/testing.h" -using blender::VectorSet; +namespace blender { TEST(vector_set, DefaultConstructor) { @@ -158,3 +158,5 @@ TEST(vector_set, Remove) EXPECT_FALSE(set.remove(5)); EXPECT_FALSE(set.contains(5)); } + +} // namespace blender diff --git a/tests/gtests/blenlib/BLI_vector_test.cc b/tests/gtests/blenlib/BLI_vector_test.cc index 4b42cc1b4af..ea4711ca015 100644 --- a/tests/gtests/blenlib/BLI_vector_test.cc +++ b/tests/gtests/blenlib/BLI_vector_test.cc @@ -3,7 +3,7 @@ #include "testing/testing.h" #include -using namespace blender; +namespace blender { TEST(vector, DefaultConstructor) { @@ -636,3 +636,5 @@ TEST(vector, OveralignedValues) EXPECT_EQ((uintptr_t)&vec.last() % 512, 0); } } + +} // namespace blender -- cgit v1.2.3