WIP - test ospanstream inherited stream ops

Author: H-G-Hristov

libcxx/test/std/input.output/span.streams/helper_macros.h

@@ -13,19 +13,12 @@
 
 #include "make_string.h"
 
+// Helper macros for creating strings and string views
+
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-#  define CH(C)                                                                                                        \
-    (std::is_same_v<CharT, wchar_t>    ? L##C                                                                          \
-     : std::is_same_v<CharT, char8_t>  ? u8##C                                                                         \
-     : std::is_same_v<CharT, char16_t> ? u##C                                                                          \
-     : std::is_same_v<CharT, char32_t> ? U##C                                                                          \
-                                       : C)
+#  define CH(C) (std::is_same_v<CharT, wchar_t> ? L##C : C)
 #else
-#  define CH(C)                                                                                                        \
-    (std::is_same_v<CharT, char8_t>    ? u8##C                                                                         \
-     : std::is_same_v<CharT, char16_t> ? u##C                                                                          \
-     : std::is_same_v<CharT, char32_t> ? U##C                                                                          \
-                                       : C)
+#  define CH(C) C
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 #define CS(S) MAKE_CSTRING(CharT, S)
 #define ST(S, a) std::basic_string<CharT, TraitsT, AllocT>(MAKE_CSTRING(CharT, S), MKSTR_LEN(CharT, S), a)

libcxx/test/std/input.output/span.streams/ospanstream/inherited.stream.ops.pass.cpp

@@ -14,7 +14,7 @@
 //   class basic_spanstream
 //     : public basic_iostream<charT, traits> {
 
-//   Test stream operations inherited from `basic_istream` and `basic_ostream`
+//   Test stream operations inherited from `basic_ostream`
 
 #include <cassert>
 #include <span>
@@ -37,13 +37,17 @@ void test() {
   constexpr auto arrSize{30UZ};
   assert(sv.size() < arrSize);
 
+  constexpr std::basic_string_view<CharT, TraitsT> sv2{SV("This string should overflow! This string should overflow!")};
+  assert(sv2.size() >= arrSize);
+
   // Create a std::span test value
   CharT arr[arrSize]{};
   initialize_array_from_string_view(arr, sv);
   std::span<CharT> sp{arr};
 
   // `std::span` + Mode: default (`out`)
   {
+    // Construct stream
     SpStream spSt(sp);
 
     assert(spSt);
@@ -52,20 +56,20 @@ void test() {
     assert(spSt.good());
     assert(spSt.span().size() == 0);
 
-    // Check underlying buffer
-    assert(arr[0] == CH('z'));
+    assert(arr[0] == CH('z')); // Check underlying buffer
     assert(arr[1] == CH('m'));
     assert(arr[2] == CH('t'));
 
+    // Write to stream
     spSt << SV("snt");
 
     assert(spSt.span().size() == 3);
 
     assert(spSt.span()[0] == CH('s'));
     assert(spSt.span()[1] == CH('n'));
     assert(spSt.span()[2] == CH('t'));
-    // Check underlying buffer
-    assert(arr[0] == CH('s'));
+
+    assert(arr[0] == CH('s')); // Check underlying buffer
     assert(arr[1] == CH('n'));
     assert(arr[2] == CH('t'));
 
@@ -80,17 +84,49 @@ void test() {
 
     assert(spSt.span()[3] == CH('7'));
     assert(spSt.span()[4] == CH('1'));
-    // Check underlying buffer
-    assert(arr[3] == CH('7'));
+
+    assert(arr[3] == CH('7')); // Check underlying buffer
     assert(arr[4] == CH('1'));
 
     assert(spSt);
     assert(!spSt.bad());
     assert(!spSt.fail());
     assert(spSt.good());
 
+    spSt.put(CH('!'));
+
+    assert(spSt.span().size() == 6);
+
+    assert(spSt.span()[5] == CH('!'));
+
+    assert(arr[5] == CH('!')); // Check underlying buffer
+
+    spSt.write(CS("?#?"), 1);
+
+    assert(spSt.span().size() == 7);
+
+    assert(spSt.span()[6] == CH('?'));
+
+    assert(arr[6] == CH('?')); // Check underlying buffer
+
+    // Write to stream with overflow
+    spSt << sv2;
+
+    assert(spSt.span().size() == 30);
+
+    assert(!spSt);
+    assert(spSt.bad());
+    assert(spSt.fail());
+    assert(!spSt.good());
+
+    assert(spSt.tellp() == 30);
+
+    // Clear stream
+    spSt.seekp(0);
     spSt.clear();
 
+    assert(spSt.span().size() == 0);
+
     assert(spSt);
     assert(!spSt.bad());
     assert(!spSt.fail());