[Bf-blender-cvs] [ded8e6f0afe] functions: rename test files

Jacques Lucke noreply at git.blender.org
Thu Sep 5 19:11:43 CEST 2019


Commit: ded8e6f0afe8968440f2fa1e5e3a7cca763a0063
Author: Jacques Lucke
Date:   Thu Sep 5 12:17:47 2019 +0200
Branches: functions
https://developer.blender.org/rBded8e6f0afe8968440f2fa1e5e3a7cca763a0063

rename test files

===================================================================

A	tests/gtests/blenlib/BLI_chunked_range_test.cc
R075	tests/gtests/blenlib/BLI_range_test.cc	tests/gtests/blenlib/BLI_index_range_test.cc
M	tests/gtests/blenlib/CMakeLists.txt

===================================================================

diff --git a/tests/gtests/blenlib/BLI_chunked_range_test.cc b/tests/gtests/blenlib/BLI_chunked_range_test.cc
new file mode 100644
index 00000000000..37488592671
--- /dev/null
+++ b/tests/gtests/blenlib/BLI_chunked_range_test.cc
@@ -0,0 +1,36 @@
+#include "testing/testing.h"
+#include "BLI_index_range.hpp"
+#include "BLI_chunked_range.hpp"
+#include "BLI_vector.hpp"
+
+using BLI::ChunkedIndexRange;
+using BLI::IndexRange;
+
+TEST(chunked_range, ChunksExact)
+{
+  IndexRange range = IndexRange(10, 40);
+  ChunkedIndexRange chunked_range(range, 10);
+  EXPECT_EQ(chunked_range.chunks(), 4);
+
+  EXPECT_EQ(chunked_range.chunk_range(0), IndexRange(10, 10));
+  EXPECT_EQ(chunked_range.chunk_range(1), IndexRange(20, 10));
+  EXPECT_EQ(chunked_range.chunk_range(2), IndexRange(30, 10));
+  EXPECT_EQ(chunked_range.chunk_range(3), IndexRange(40, 10));
+}
+
+TEST(chunked_range, ChunksMore)
+{
+  IndexRange range = IndexRange(25, 15);
+  ChunkedIndexRange chunked_range(range, 10);
+  EXPECT_EQ(chunked_range.chunks(), 2);
+
+  EXPECT_EQ(chunked_range.chunk_range(0), IndexRange(25, 10));
+  EXPECT_EQ(chunked_range.chunk_range(1), IndexRange(35, 5));
+}
+
+TEST(chunked_range, ChunksZero)
+{
+  IndexRange range = IndexRange(20, 0);
+  ChunkedIndexRange chunked_range(range, 10);
+  EXPECT_EQ(chunked_range.chunks(), 0);
+}
diff --git a/tests/gtests/blenlib/BLI_range_test.cc b/tests/gtests/blenlib/BLI_index_range_test.cc
similarity index 75%
rename from tests/gtests/blenlib/BLI_range_test.cc
rename to tests/gtests/blenlib/BLI_index_range_test.cc
index 74c5522103f..7dddf2f0d34 100644
--- a/tests/gtests/blenlib/BLI_range_test.cc
+++ b/tests/gtests/blenlib/BLI_index_range_test.cc
@@ -131,32 +131,3 @@ TEST(index_range, AsArrayRef)
   EXPECT_EQ(ref[2], 6);
   EXPECT_EQ(ref[3], 7);
 }
-
-TEST(chunked_range, ChunksExact)
-{
-  IndexRange range = IndexRange(10, 40);
-  ChunkedIndexRange chunked_range(range, 10);
-  EXPECT_EQ(chunked_range.chunks(), 4);
-
-  EXPECT_EQ(chunked_range.chunk_range(0), IndexRange(10, 10));
-  EXPECT_EQ(chunked_range.chunk_range(1), IndexRange(20, 10));
-  EXPECT_EQ(chunked_range.chunk_range(2), IndexRange(30, 10));
-  EXPECT_EQ(chunked_range.chunk_range(3), IndexRange(40, 10));
-}
-
-TEST(chunked_range, ChunksMore)
-{
-  IndexRange range = IndexRange(25, 15);
-  ChunkedIndexRange chunked_range(range, 10);
-  EXPECT_EQ(chunked_range.chunks(), 2);
-
-  EXPECT_EQ(chunked_range.chunk_range(0), IndexRange(25, 10));
-  EXPECT_EQ(chunked_range.chunk_range(1), IndexRange(35, 5));
-}
-
-TEST(chunked_range, ChunksZero)
-{
-  IndexRange range = IndexRange(20, 0);
-  ChunkedIndexRange chunked_range(range, 10);
-  EXPECT_EQ(chunked_range.chunks(), 0);
-}
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index b0b072969a4..95f2281fc9d 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -42,6 +42,7 @@ BLENDER_TEST(BLI_array_store "bf_blenlib")
 BLENDER_TEST(BLI_array_utils "bf_blenlib")
 BLENDER_TEST(BLI_array_ref "bf_blenlib")
 BLENDER_TEST(BLI_chained_strings "bf_blenlib")
+BLENDER_TEST(BLI_chunked_range "bf_blenlib")
 BLENDER_TEST(BLI_delaunay_2d "bf_blenlib")
 BLENDER_TEST(BLI_expr_pylike_eval "bf_blenlib")
 BLENDER_TEST(BLI_edgehash "bf_blenlib")
@@ -49,6 +50,7 @@ BLENDER_TEST(BLI_ghash "bf_blenlib")
 BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
 BLENDER_TEST(BLI_heap "bf_blenlib")
 BLENDER_TEST(BLI_heap_simple "bf_blenlib")
+BLENDER_TEST(BLI_index_range "bf_blenlib")
 BLENDER_TEST(BLI_kdopbvh "bf_blenlib;bf_intern_numaapi")
 BLENDER_TEST(BLI_lazy_init "bf_blenlib")
 BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib;bf_intern_numaapi")
@@ -61,7 +63,6 @@ BLENDER_TEST(BLI_multi_vector "bf_blenlib")
 BLENDER_TEST(BLI_optional "bf_blenlib")
 BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
 BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
-BLENDER_TEST(BLI_range "bf_blenlib")
 BLENDER_TEST(BLI_refcount "bf_blenlib")
 BLENDER_TEST(BLI_vector "bf_blenlib")
 BLENDER_TEST(BLI_set "bf_blenlib")



More information about the Bf-blender-cvs mailing list