[Bf-blender-cvs] [c8b24af1b25] master: BLI: move some tests into blenlib/tests
Jacques Lucke
noreply at git.blender.org
Thu Jul 23 15:29:02 CEST 2020
Commit: c8b24af1b2504ca674728b503294d19451eb7408
Author: Jacques Lucke
Date: Thu Jul 23 15:23:55 2020 +0200
Branches: master
https://developer.blender.org/rBc8b24af1b2504ca674728b503294d19451eb7408
BLI: move some tests into blenlib/tests
Reviewers: sybren
Differential Revision: https://developer.blender.org/D8315
===================================================================
M source/blender/blenlib/CMakeLists.txt
R093 tests/gtests/blenlib/BLI_array_test.cc source/blender/blenlib/tests/BLI_array_test.cc
R093 tests/gtests/blenlib/BLI_disjoint_set_test.cc source/blender/blenlib/tests/BLI_disjoint_set_test.cc
R099 tests/gtests/blenlib/BLI_edgehash_test.cc source/blender/blenlib/tests/BLI_edgehash_test.cc
R094 tests/gtests/blenlib/BLI_index_mask_test.cc source/blender/blenlib/tests/BLI_index_mask_test.cc
R097 tests/gtests/blenlib/BLI_index_range_test.cc source/blender/blenlib/tests/BLI_index_range_test.cc
R098 tests/gtests/blenlib/BLI_linear_allocator_test.cc source/blender/blenlib/tests/BLI_linear_allocator_test.cc
R098 tests/gtests/blenlib/BLI_map_test.cc source/blender/blenlib/tests/BLI_map_test.cc
R100 tests/gtests/blenlib/BLI_math_base_safe_test.cc source/blender/blenlib/tests/BLI_math_base_safe_test.cc
R097 tests/gtests/blenlib/BLI_memory_utils_test.cc source/blender/blenlib/tests/BLI_memory_utils_test.cc
R095 tests/gtests/blenlib/BLI_set_test.cc source/blender/blenlib/tests/BLI_set_test.cc
R099 tests/gtests/blenlib/BLI_span_test.cc source/blender/blenlib/tests/BLI_span_test.cc
R095 tests/gtests/blenlib/BLI_stack_cxx_test.cc source/blender/blenlib/tests/BLI_stack_cxx_test.cc
R098 tests/gtests/blenlib/BLI_string_ref_test.cc source/blender/blenlib/tests/BLI_string_ref_test.cc
R094 tests/gtests/blenlib/BLI_vector_set_test.cc source/blender/blenlib/tests/BLI_vector_set_test.cc
R096 tests/gtests/blenlib/BLI_vector_test.cc source/blender/blenlib/tests/BLI_vector_test.cc
M tests/gtests/blenlib/CMakeLists.txt
===================================================================
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index c6e04d4147a..d7d1d701bc8 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -340,3 +340,28 @@ set_source_files_properties(
)
blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+
+if(WITH_GTESTS)
+ set(TEST_SRC
+ tests/BLI_array_test.cc
+ tests/BLI_disjoint_set_test.cc
+ tests/BLI_edgehash_test.cc
+ tests/BLI_index_mask_test.cc
+ tests/BLI_index_range_test.cc
+ tests/BLI_linear_allocator_test.cc
+ tests/BLI_map_test.cc
+ tests/BLI_math_base_safe_test.cc
+ tests/BLI_memory_utils_test.cc
+ tests/BLI_set_test.cc
+ tests/BLI_span_test.cc
+ tests/BLI_stack_cxx_test.cc
+ tests/BLI_string_ref_test.cc
+ tests/BLI_vector_set_test.cc
+ tests/BLI_vector_test.cc
+ )
+ set(TEST_LIB
+ bf_blenlib
+ )
+ include(GTestTesting)
+ blender_add_test_lib(bf_bli_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
+endif()
diff --git a/tests/gtests/blenlib/BLI_array_test.cc b/source/blender/blenlib/tests/BLI_array_test.cc
similarity index 93%
rename from tests/gtests/blenlib/BLI_array_test.cc
rename to source/blender/blenlib/tests/BLI_array_test.cc
index c01ba26ffd7..7348a6f93f3 100644
--- a/tests/gtests/blenlib/BLI_array_test.cc
+++ b/source/blender/blenlib/tests/BLI_array_test.cc
@@ -4,7 +4,7 @@
#include "BLI_strict_flags.h"
#include "testing/testing.h"
-namespace blender {
+namespace blender::tests {
TEST(array, DefaultConstructor)
{
@@ -72,7 +72,7 @@ TEST(array, MoveConstructor)
Array<int> array = {5, 6, 7, 8};
Array<int> new_array(std::move(array));
- EXPECT_EQ(array.size(), 0);
+ EXPECT_EQ(array.size(), 0); /* NOLINT: bugprone-use-after-move */
EXPECT_EQ(new_array.size(), 4);
EXPECT_EQ(new_array[0], 5);
EXPECT_EQ(new_array[1], 6);
@@ -101,7 +101,7 @@ TEST(array, MoveAssignment)
EXPECT_EQ(new_array.size(), 1);
new_array = std::move(array);
EXPECT_EQ(new_array.size(), 3);
- EXPECT_EQ(array.size(), 0);
+ EXPECT_EQ(array.size(), 0); /* NOLINT: bugprone-use-after-move */
EXPECT_EQ(new_array[0], 1);
EXPECT_EQ(new_array[1], 2);
EXPECT_EQ(new_array[2], 3);
@@ -141,7 +141,7 @@ TEST(array, NoInitializationSizeConstructor)
using MyArray = Array<ConstructibleType>;
TypedBuffer<MyArray> buffer;
- memset(buffer, 100, sizeof(MyArray));
+ memset((void *)&buffer, 100, sizeof(MyArray));
/* Doing this to avoid some compiler optimization. */
for (int64_t i : IndexRange(sizeof(MyArray))) {
@@ -173,4 +173,4 @@ TEST(array, Fill)
EXPECT_EQ(array[4], 3);
}
-} // namespace blender
+} // namespace blender::tests
diff --git a/tests/gtests/blenlib/BLI_disjoint_set_test.cc b/source/blender/blenlib/tests/BLI_disjoint_set_test.cc
similarity index 93%
rename from tests/gtests/blenlib/BLI_disjoint_set_test.cc
rename to source/blender/blenlib/tests/BLI_disjoint_set_test.cc
index 22663b936d9..f30ee610b2a 100644
--- a/tests/gtests/blenlib/BLI_disjoint_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_disjoint_set_test.cc
@@ -5,7 +5,7 @@
#include "testing/testing.h"
-namespace blender {
+namespace blender::tests {
TEST(disjoint_set, Test)
{
@@ -33,4 +33,4 @@ TEST(disjoint_set, Test)
EXPECT_FALSE(disjoint_set.in_same_set(0, 4));
}
-} // namespace blender
+} // namespace blender::tests
diff --git a/tests/gtests/blenlib/BLI_edgehash_test.cc b/source/blender/blenlib/tests/BLI_edgehash_test.cc
similarity index 99%
rename from tests/gtests/blenlib/BLI_edgehash_test.cc
rename to source/blender/blenlib/tests/BLI_edgehash_test.cc
index 23ad618825b..7106033df36 100644
--- a/tests/gtests/blenlib/BLI_edgehash_test.cc
+++ b/source/blender/blenlib/tests/BLI_edgehash_test.cc
@@ -5,10 +5,8 @@
#include <random>
#include <vector>
-extern "C" {
#include "BLI_edgehash.h"
#include "BLI_utildefines.h"
-}
#define VALUE_1 POINTER_FROM_INT(1)
#define VALUE_2 POINTER_FROM_INT(2)
@@ -334,10 +332,12 @@ TEST(edgehash, StressTest)
/* check if the right ones have been removed */
for (int i = 0; i < shuffled.size(); i++) {
bool haskey = BLI_edgehash_haskey(eh, shuffled[i].v1, shuffled[i].v2);
- if (i < remove_until)
+ if (i < remove_until) {
ASSERT_FALSE(haskey);
- else
+ }
+ else {
ASSERT_TRUE(haskey);
+ }
}
/* reinsert all edges */
diff --git a/tests/gtests/blenlib/BLI_index_mask_test.cc b/source/blender/blenlib/tests/BLI_index_mask_test.cc
similarity index 94%
rename from tests/gtests/blenlib/BLI_index_mask_test.cc
rename to source/blender/blenlib/tests/BLI_index_mask_test.cc
index bce467cadd9..4d6060e51c9 100644
--- a/tests/gtests/blenlib/BLI_index_mask_test.cc
+++ b/source/blender/blenlib/tests/BLI_index_mask_test.cc
@@ -3,7 +3,7 @@
#include "BLI_index_mask.hh"
#include "testing/testing.h"
-namespace blender {
+namespace blender::tests {
TEST(index_mask, DefaultConstructor)
{
@@ -40,4 +40,4 @@ TEST(index_mask, RangeConstructor)
EXPECT_EQ(indices[2], 5);
}
-} // namespace blender
+} // namespace blender::tests
diff --git a/tests/gtests/blenlib/BLI_index_range_test.cc b/source/blender/blenlib/tests/BLI_index_range_test.cc
similarity index 97%
rename from tests/gtests/blenlib/BLI_index_range_test.cc
rename to source/blender/blenlib/tests/BLI_index_range_test.cc
index 1c4d4a1a1f3..d472ded0f18 100644
--- a/tests/gtests/blenlib/BLI_index_range_test.cc
+++ b/source/blender/blenlib/tests/BLI_index_range_test.cc
@@ -5,7 +5,7 @@
#include "BLI_vector.hh"
#include "testing/testing.h"
-namespace blender {
+namespace blender::tests {
TEST(index_range, DefaultConstructor)
{
@@ -140,4 +140,4 @@ TEST(index_range, AsSpan)
EXPECT_EQ(span[3], 7);
}
-} // namespace blender
+} // namespace blender::tests
diff --git a/tests/gtests/blenlib/BLI_linear_allocator_test.cc b/source/blender/blenlib/tests/BLI_linear_allocator_test.cc
similarity index 98%
rename from tests/gtests/blenlib/BLI_linear_allocator_test.cc
rename to source/blender/blenlib/tests/BLI_linear_allocator_test.cc
index 9c2dcdc7457..44b70d1f55d 100644
--- a/tests/gtests/blenlib/BLI_linear_allocator_test.cc
+++ b/source/blender/blenlib/tests/BLI_linear_allocator_test.cc
@@ -4,7 +4,7 @@
#include "BLI_strict_flags.h"
#include "testing/testing.h"
-namespace blender {
+namespace blender::tests {
static bool is_aligned(void *ptr, uint alignment)
{
@@ -115,4 +115,4 @@ TEST(linear_allocator, ConstructArrayCopy)
EXPECT_EQ(span2[2], 3);
}
-} // namespace blender
+} // namespace blender::tests
diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/source/blender/blenlib/tests/BLI_map_test.cc
similarity index 98%
rename from tests/gtests/blenlib/BLI_map_test.cc
rename to source/blender/blenlib/tests/BLI_map_test.cc
index cebce218112..fe7b0f01279 100644
--- a/tests/gtests/blenlib/BLI_map_test.cc
+++ b/source/blender/blenlib/tests/BLI_map_test.cc
@@ -8,7 +8,7 @@
#include "BLI_vector.hh"
#include "testing/testing.h"
-namespace blender {
+namespace blender::tests {
TEST(map, DefaultConstructor)
{
@@ -335,7 +335,7 @@ TEST(map, MoveConstructorSmall)
EXPECT_EQ(map2.size(), 2);
EXPECT_EQ(map2.lookup(1), 2.0f);
EXPECT_EQ(map2.lookup(4), 1.0f);
- EXPECT_EQ(map1.size(), 0);
+ EXPECT_EQ(map1.size(), 0); /* NOLINT: bugprone-use-after-move */
EXPECT_EQ(map1.lookup_ptr(4), nullptr);
}
@@ -349,7 +349,7 @@ TEST(map, MoveConstructorLarge)
EXPECT_EQ(map2.size(), 100);
EXPECT_EQ(map2.lookup(1), 1);
EXPECT_EQ(map2.lookup(4), 4);
- EXPECT_EQ(map1.size(), 0);
+ EXPECT_EQ(map1.size(), 0); /* NOLINT: bugprone-use-after-move */
EXPECT_EQ(map1.lookup_ptr(4), nullptr);
}
@@ -363,7 +363,7 @@ TEST(map, MoveAssignment)
EXPECT_EQ(map2.size(), 2);
EXPECT_EQ(map2.lookup(1), 2.0f);
EXPECT_EQ(map2.lookup(4), 1.0f);
- EXPECT_EQ(map1.size(), 0);
+ EXPECT_EQ(map1.size(), 0); /* NOLINT: bugprone-use-after-move */
EXPECT_EQ(map1.lookup_ptr(4), nullptr);
}
@@ -587,4 +587,4 @@ TEST(map, Benchmark)
#endif /* Benchmark */
-} // namespace blender
+} // namespace blender::tests
diff --git a/tests/gtests/blenlib/BLI_math_base_safe_test.cc b/source/blender/blenlib/tests/BLI_math_base_safe_test.cc
similarity index 100%
rename from tests/gtests/blenlib/BLI_math_base_safe_test.cc
rename to source/blender/blenlib/tests/BLI_math_base_safe_test.cc
diff --git a/tests/gtests/blenlib/BLI_memory_utils_test.cc b/source/blender/blenlib/tests/BLI_memory_utils_test.cc
similarity index 97%
rename from tests/gtests/blenlib/BLI_memory_utils_test.cc
rename to source/blender/blenlib/tests/BLI_memory_utils_test.cc
index b99db5c5eca..f3cb02b63d7 100644
--- a/tests/gtests/blenlib/BLI_memory_utils_test.cc
+++ b/source/blender/blenlib/tests/BLI_memory_utils_test.cc
@@ -5,7 +5,7 @@
#include "BLI_strict_flags.h"
#include "testing/testing.h"
-namespace blender {
+namespace blender::tests {
struct MyValue {
static inline int alive = 0;
@@ -19,7 +19,7 @@ struct MyValue {
alive++;
}
- MyValue(const MyValue &other)
+ MyValue(const MyValue &UNUSED(other))
{
if (alive == 15) {
throw std::exception();
@@ -156,4 +156,4 @@ static_assert(is_convertible_pointer_v<int **, int **const>);
static_assert(is_convertible_pointer_v<int **, int *const *>);
static_assert(is_convertible_pointer_v<int **, int const *const *>);
-} // namespace blender
+} // namespace blender::tests
diff --git a/tests/gtests/blenlib/BLI_set_test.cc b/source/blender/blenlib/tests/BLI_set_test.cc
similarity index 95%
rename from tests/gtests/blenlib/BLI_set_test.cc
rename to source/blender/blenlib/tests/BLI_set_test.cc
index fcd958dc2f1..7bd0b258df8 100644
--- a/tests/gtests/blenlib/BLI_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_set_test.cc
@@ -12,6 +12,7 @@
#include "testing/testing.h"
namespace blender {
+namespace tests {
TEST(set, DefaultConstructor)
{
@@ -81,7 +82,7 @@ TEST(set, MoveConstructor)
Set<int> set = {1, 2, 3};
EXPECT_EQ(set.size(), 3);
Set<int> set2(std::move(set));
- EXPECT_EQ(set.size(), 0);
+ EXPECT_EQ(set.size(), 0); /* NOLINT: bugprone-use-after-move */
EXPECT_EQ(set2.size(), 3);
}
@@ -106,7 +107,7 @@ TEST(set, MoveAssignment)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list