From 9851b94d7e28113af9e41576f065b993f13e2d7c Mon Sep 17 00:00:00 2001
From: Werner Henze <34543625+beinhaerter@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:05:40 +0100
Subject: [PATCH] add some span test for constructor from other span (#1093)

More combinations with dynamic_extent or fixed extent for higher coverage.
---
 tests/span_tests.cpp | 108 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 82 insertions(+), 26 deletions(-)

diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp
index 41ac3ae..ebff22e 100644
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@@ -646,37 +646,93 @@ TEST(span_test, from_container_constructor)
     }
 }
 
-TEST(span_test, from_convertible_span_constructor){{span<DerivedClass> avd;
-span<const DerivedClass> avcd = avd;
-static_cast<void>(avcd);
-}
-
+TEST(span_test, from_convertible_span_constructor)
 {
-#ifdef CONFIRM_COMPILATION_ERRORS
-    span<DerivedClass> avd;
-    span<BaseClass> avb = avd;
-    static_cast<void>(avb);
-#endif
-}
+    const auto terminateHandler = std::set_terminate([] {
+        std::cerr << "Expected Death. from_convertible_span_constructor";
+        std::abort();
+    });
+    const auto expected = GetExpectedDeathString(terminateHandler);
+
+    {
+        span<DerivedClass> avd;
+        span<const DerivedClass> avcd = avd;
+        static_cast<void>(avcd);
+    }
+
+    {
+        std::array<DerivedClass, 2> arr{};
+        span<DerivedClass, 2> avd{arr};
+        span<const DerivedClass, 2> avcd = avd;
+        static_cast<void>(avcd);
+    }
+
+    {
+        std::array<DerivedClass, 2> arr{};
+        span<DerivedClass, 2> avd{arr};
+        span<const DerivedClass> avcd = avd;
+        static_cast<void>(avcd);
+    }
+
+    {
+        std::array<DerivedClass, 2> arr{};
+        span<DerivedClass> avd{arr};
+        span<const DerivedClass, 2> avcd{avd};
+        static_cast<void>(avcd);
+    }
+
+    {
+        std::array<DerivedClass, 1> arr{};
+        span<DerivedClass> avd{arr};
+        using T = span<const DerivedClass, 2>;
+        EXPECT_DEATH(T{avd}, expected);
+    }
 
 #ifdef CONFIRM_COMPILATION_ERRORS
-{
-    span<int> s;
-    span<unsigned int> s2 = s;
-    static_cast<void>(s2);
-}
+    {
+        std::array<DerivedClass, 2> arr{};
+        span<DerivedClass> avd{arr};
+        span<const DerivedClass, 2> avcd = avd;
+        static_cast<void>(avcd);
+    }
 
-{
-    span<int> s;
-    span<const unsigned int> s2 = s;
-    static_cast<void>(s2);
-}
+    {
+        std::array<DerivedClass, 2> arr{};
+        span<DerivedClass, 2> avd{arr};
+        span<const DerivedClass, 1> avcd = avd;
+        static_cast<void>(avcd);
+    }
 
-{
-    span<int> s;
-    span<short> s2 = s;
-    static_cast<void>(s2);
-}
+    {
+        std::array<DerivedClass, 2> arr{};
+        span<DerivedClass, 2> avd{arr};
+        span<const DerivedClass, 3> avcd = avd;
+        static_cast<void>(avcd);
+    }
+
+    {
+        span<DerivedClass> avd;
+        span<BaseClass> avb = avd;
+        static_cast<void>(avb);
+    }
+
+    {
+        span<int> s;
+        span<unsigned int> s2 = s;
+        static_cast<void>(s2);
+    }
+
+    {
+        span<int> s;
+        span<const unsigned int> s2 = s;
+        static_cast<void>(s2);
+    }
+
+    {
+        span<int> s;
+        span<short> s2 = s;
+        static_cast<void>(s2);
+    }
 #endif
 }