2 files changed, 60 insertions, 4 deletions
diff --git a/source/blender/blenlib/tests/BLI_span_test.cc b/source/blender/blenlib/tests/BLI_span_test.cc
index d1c9f312b97..002c97b0c7d 100644
--- a/source/blender/blenlib/tests/BLI_span_test.cc
+++ b/source/blender/blenlib/tests/BLI_span_test.cc
@@ -62,6 +62,15 @@ TEST(span, DropFront)
   EXPECT_EQ(slice[2], 7);
 }
 
+TEST(span, DropFrontLargeN)
+{
+  Vector<int> a = {1, 2, 3, 4, 5};
+  Span<int> slice1 = Span<int>(a).drop_front(100);
+  MutableSpan<int> slice2 = MutableSpan<int>(a).drop_front(100);
+  EXPECT_TRUE(slice1.is_empty());
+  EXPECT_TRUE(slice2.is_empty());
+}
+
 TEST(span, DropFrontAll)
 {
   Vector<int> a = {4, 5, 6, 7};
@@ -78,6 +87,15 @@ TEST(span, TakeFront)
   EXPECT_EQ(slice[1], 5);
 }
 
+TEST(span, TakeFrontLargeN)
+{
+  Vector<int> a = {4, 5, 6, 7};
+  Span<int> slice1 = Span<int>(a).take_front(100);
+  MutableSpan<int> slice2 = MutableSpan<int>(a).take_front(100);
+  EXPECT_EQ(slice1.size(), 4);
+  EXPECT_EQ(slice2.size(), 4);
+}
+
 TEST(span, TakeBack)
 {
   Vector<int> a = {5, 6, 7, 8};
@@ -87,6 +105,15 @@ TEST(span, TakeBack)
   EXPECT_EQ(slice[1], 8);
 }
 
+TEST(span, TakeBackLargeN)
+{
+  Vector<int> a = {3, 4, 5, 6};
+  Span<int> slice1 = Span<int>(a).take_back(100);
+  MutableSpan<int> slice2 = MutableSpan<int>(a).take_back(100);
+  EXPECT_EQ(slice1.size(), 4);
+  EXPECT_EQ(slice2.size(), 4);
+}
+
 TEST(span, Slice)
 {
   Vector<int> a = {4, 5, 6, 7};
@@ -112,6 +139,19 @@ TEST(span, SliceRange)
   EXPECT_EQ(slice[1], 4);
 }
 
+TEST(span, SliceLargeN)
+{
+  Vector<int> a = {1, 2, 3, 4, 5};
+  Span<int> slice1 = Span<int>(a).slice(3, 100);
+  MutableSpan<int> slice2 = MutableSpan<int>(a).slice(3, 100);
+  EXPECT_EQ(slice1.size(), 2);
+  EXPECT_EQ(slice2.size(), 2);
+  EXPECT_EQ(slice1[0], 4);
+  EXPECT_EQ(slice2[0], 4);
+  EXPECT_EQ(slice1[1], 5);
+  EXPECT_EQ(slice2[1], 5);
+}
+
 TEST(span, Contains)
 {
   Vector<int> a = {4, 5, 6, 7};
@@ -337,7 +377,7 @@ TEST(span, MutableReverseIterator)
   EXPECT_EQ_ARRAY(src.data(), Span({14, 15, 16, 17}).data(), 4);
 }
 
-TEST(span, constexpr_)
+TEST(span, Constexpr)
 {
   static constexpr std::array<int, 3> src = {3, 2, 1};
   constexpr Span<int> span(src);
diff --git a/source/blender/blenlib/tests/BLI_string_ref_test.cc b/source/blender/blenlib/tests/BLI_string_ref_test.cc
index 401a7bc1118..fb8b894bfd5 100644
--- a/source/blender/blenlib/tests/BLI_string_ref_test.cc
+++ b/source/blender/blenlib/tests/BLI_string_ref_test.cc
@@ -246,10 +246,18 @@ TEST(string_ref, DropPrefixN)
   EXPECT_EQ(ref3, "");
 }
 
-TEST(string_ref, DropPrefix)
+TEST(string_ref, DropPrefixLargeN)
 {
   StringRef ref("test");
-  StringRef ref2 = ref.drop_prefix("tes");
+  StringRef ref2 = ref.drop_prefix(100);
+  EXPECT_EQ(ref2.size(), 0);
+  EXPECT_EQ(ref2, "");
+}
+
+TEST(string_ref, DropKnownPrefix)
+{
+  StringRef ref("test");
+  StringRef ref2 = ref.drop_known_prefix("tes");
   EXPECT_EQ(ref2.size(), 1);
   EXPECT_EQ(ref2, "t");
 }
@@ -262,6 +270,14 @@ TEST(string_ref, DropSuffix)
   EXPECT_EQ(ref2, "tes");
 }
 
+TEST(string_ref, DropSuffixLargeN)
+{
+  StringRef ref("test");
+  StringRef ref2 = ref.drop_suffix(100);
+  EXPECT_EQ(ref2.size(), 0);
+  EXPECT_EQ(ref2, "");
+}
+
 TEST(string_ref, Substr)
 {
   StringRef ref("hello world");
@@ -298,7 +314,7 @@ TEST(string_ref, ToStringView)
   EXPECT_EQ(view, "hello");
 }
 
-TEST(string_ref, constexpr_)
+TEST(string_ref, Constexpr)
 {
   constexpr StringRef sref("World");
   BLI_STATIC_ASSERT(sref[2] == 'r', "");