1 files changed, 118 insertions, 8 deletions

diff --git a/tests/gtests/blenlib/BLI_stack_cxx_test.cc b/tests/gtests/blenlib/BLI_stack_cxx_test.cc
index e49872f8643..28d30f0ecfb 100644
--- a/tests/gtests/blenlib/BLI_stack_cxx_test.cc
+++ b/tests/gtests/blenlib/BLI_stack_cxx_test.cc
@@ -1,12 +1,13 @@
 #include "BLI_stack.hh"
+#include "BLI_strict_flags.h"
+#include "BLI_vector.hh"
 #include "testing/testing.h"
 
-using BLI::Stack;
-using IntStack = Stack<int>;
+using namespace BLI;
 
 TEST(stack, DefaultConstructor)
 {
-  IntStack stack;
+  Stack<int> stack;
   EXPECT_EQ(stack.size(), 0);
   EXPECT_TRUE(stack.is_empty());
 }
@@ -14,7 +15,7 @@ TEST(stack, DefaultConstructor)
 TEST(stack, ArrayRefConstructor)
 {
   std::array<int, 3> array = {4, 7, 2};
-  IntStack stack(array);
+  Stack<int> stack(array);
   EXPECT_EQ(stack.size(), 3);
   EXPECT_EQ(stack.pop(), 2);
   EXPECT_EQ(stack.pop(), 7);
@@ -22,9 +23,66 @@ TEST(stack, ArrayRefConstructor)
   EXPECT_TRUE(stack.is_empty());
 }
 
+TEST(stack, CopyConstructor)
+{
+  Stack<int> stack1 = {1, 2, 3, 4, 5, 6, 7};
+  Stack<int> stack2 = stack1;
+  EXPECT_EQ(stack1.size(), 7);
+  EXPECT_EQ(stack2.size(), 7);
+  for (int i = 7; i >= 1; i--) {
+    EXPECT_FALSE(stack1.is_empty());
+    EXPECT_FALSE(stack2.is_empty());
+    EXPECT_EQ(stack1.pop(), i);
+    EXPECT_EQ(stack2.pop(), i);
+  }
+  EXPECT_TRUE(stack1.is_empty());
+  EXPECT_TRUE(stack2.is_empty());
+}
+
+TEST(stack, MoveConstructor)
+{
+  Stack<int> stack1 = {1, 2, 3, 4, 5, 6, 7};
+  Stack<int> stack2 = std::move(stack1);
+  EXPECT_EQ(stack1.size(), 0);
+  EXPECT_EQ(stack2.size(), 7);
+  for (int i = 7; i >= 1; i--) {
+    EXPECT_EQ(stack2.pop(), i);
+  }
+}
+
+TEST(stack, CopyAssignment)
+{
+  Stack<int> stack1 = {1, 2, 3, 4, 5, 6, 7};
+  Stack<int> stack2 = {2, 3, 4, 5, 6, 7};
+  stack2 = stack1;
+
+  EXPECT_EQ(stack1.size(), 7);
+  EXPECT_EQ(stack2.size(), 7);
+  for (int i = 7; i >= 1; i--) {
+    EXPECT_FALSE(stack1.is_empty());
+    EXPECT_FALSE(stack2.is_empty());
+    EXPECT_EQ(stack1.pop(), i);
+    EXPECT_EQ(stack2.pop(), i);
+  }
+  EXPECT_TRUE(stack1.is_empty());
+  EXPECT_TRUE(stack2.is_empty());
+}
+
+TEST(stack, MoveAssignment)
+{
+  Stack<int> stack1 = {1, 2, 3, 4, 5, 6, 7};
+  Stack<int> stack2 = {5, 3, 7, 2, 2};
+  stack2 = std::move(stack1);
+  EXPECT_EQ(stack1.size(), 0);
+  EXPECT_EQ(stack2.size(), 7);
+  for (int i = 7; i >= 1; i--) {
+    EXPECT_EQ(stack2.pop(), i);
+  }
+}
+
 TEST(stack, Push)
 {
-  IntStack stack;
+  Stack<int> stack;
   EXPECT_EQ(stack.size(), 0);
   stack.push(3);
   EXPECT_EQ(stack.size(), 1);
@@ -34,7 +92,7 @@ TEST(stack, Push)
 
 TEST(stack, PushMultiple)
 {
-  IntStack stack;
+  Stack<int> stack;
   EXPECT_EQ(stack.size(), 0);
   stack.push_multiple({1, 2, 3});
   EXPECT_EQ(stack.size(), 3);
@@ -43,9 +101,52 @@ TEST(stack, PushMultiple)
   EXPECT_EQ(stack.pop(), 1);
 }
 
+TEST(stack, PushPopMany)
+{
+  Stack<int> stack;
+  for (int i = 0; i < 1000; i++) {
+    stack.push(i);
+    EXPECT_EQ(stack.size(), i + 1);
+  }
+  for (int i = 999; i > 50; i--) {
+    EXPECT_EQ(stack.pop(), i);
+    EXPECT_EQ(stack.size(), i);
+  }
+  for (int i = 51; i < 5000; i++) {
+    stack.push(i);
+    EXPECT_EQ(stack.size(), i + 1);
+  }
+  for (int i = 4999; i >= 0; i--) {
+    EXPECT_EQ(stack.pop(), i);
+    EXPECT_EQ(stack.size(), i);
+  }
+}
+
+TEST(stack, PushMultipleAfterPop)
+{
+  Stack<int> stack;
+  for (int i = 0; i < 1000; i++) {
+    stack.push(i);
+  }
+  for (int i = 999; i >= 0; i--) {
+    EXPECT_EQ(stack.pop(), i);
+  }
+
+  Vector<int> values;
+  for (int i = 0; i < 5000; i++) {
+    values.append(i);
+  }
+  stack.push_multiple(values);
+  EXPECT_EQ(stack.size(), 5000);
+
+  for (int i = 4999; i >= 0; i--) {
+    EXPECT_EQ(stack.pop(), i);
+  }
+}
+
 TEST(stack, Pop)
 {
-  IntStack stack;
+  Stack<int> stack;
   stack.push(4);
   stack.push(6);
   EXPECT_EQ(stack.pop(), 6);
@@ -54,7 +155,7 @@ TEST(stack, Pop)
 
 TEST(stack, Peek)
 {
-  IntStack stack;
+  Stack<int> stack;
   stack.push(3);
   stack.push(4);
   EXPECT_EQ(stack.peek(), 4);
@@ -72,3 +173,12 @@ TEST(stack, UniquePtrValues)
   std::unique_ptr<int> &b = stack.peek();
   UNUSED_VARS(a, b);
 }
+
+TEST(stack, OveralignedValues)
+{
+  Stack<AlignedBuffer<1, 512>, 2> stack;
+  for (int i = 0; i < 100; i++) {
+    stack.push({});
+    EXPECT_EQ((uintptr_t)&stack.peek() % 512, 0);
+  }
+}