Tests: WIP cleanup

Author: H-G-Hristov

libcxx/test/std/input.output/span.streams/ispanstream/ispanstream.cons/ros.pass.cpp

@@ -31,14 +31,7 @@
 
 template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test_sfinae() {
-  using SpStream =
-#ifndef TEST_HAS_NO_NASTY_STRING
-      std::conditional_t<std::same_as<CharT, nasty_char>,
-                         std::basic_ispanstream<nasty_char, nasty_char_traits>,
-                         std::basic_ispanstream<CharT, TraitsT>>;
-#else
-      std::basic_ispanstream<CharT, TraitsT>;
-#endif
+  using SpStream = std::basic_ispanstream<CharT, TraitsT>;
 
   // Non-const convertible
   static_assert(std::constructible_from<SpStream, ReadOnlySpan<CharT>>);

libcxx/test/std/input.output/span.streams/ispanstream/ispanstream.cons/span.mode.pass.cpp

@@ -33,20 +33,6 @@
 #include "../../helper_macros.h"
 #include "../../helper_types.h"
 
-#ifndef TEST_HAS_NO_NASTY_STRING
-void test_sfinae_with_nasty_char() {
-  using SpStream = std::basic_ispanstream<nasty_char, nasty_char_traits>;
-
-  // Mode
-  static_assert(std::constructible_from<SpStream, const std::span<nasty_char>, std::ios_base::openmode>);
-  static_assert(!test_convertible<SpStream, std::ios_base::openmode>());
-
-  // Non-mode
-  static_assert(!std::constructible_from<SpStream, const std::span<nasty_char>, const NonMode>);
-  static_assert(!test_convertible<SpStream, const std::span<nasty_char>, const NonMode>());
-}
-#endif // TEST_HAS_NO_NASTY_STRING
-
 template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test_sfinae() {
   using SpStream = std::basic_ispanstream<CharT, TraitsT>;
@@ -123,7 +109,7 @@ void test() {
 
 int main(int, char**) {
 #ifndef TEST_HAS_NO_NASTY_STRING
-  test_sfinae_with_nasty_char();
+  test_sfinae<nasty_char, nasty_char_traits>();
 #endif
   test_sfinae<char>();
   test_sfinae<char, constexpr_char_traits<char>>();

libcxx/test/std/input.output/span.streams/ospanstream/ospanstream.cons/span.mode.pass.cpp

@@ -35,14 +35,7 @@
 
 template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test_sfinae() {
-  using SpStream =
-#ifndef TEST_HAS_NO_NASTY_STRING
-      std::conditional_t<std::same_as<CharT, nasty_char>,
-                         std::basic_ispanstream<nasty_char, nasty_char_traits>,
-                         std::basic_ispanstream<CharT, TraitsT>>;
-#else
-      std::basic_ispanstream<CharT, TraitsT>;
-#endif
+  using SpStream = std::basic_ispanstream<CharT, TraitsT>;
 
   // Mode
   static_assert(std::constructible_from<SpStream, const std::span<CharT>, std::ios_base::openmode>);

libcxx/test/std/input.output/span.streams/spanbuf/spanbuf.cons/mode.pass.cpp

@@ -32,14 +32,7 @@
 
 template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test_sfinae() {
-  using SpStream =
-#ifndef TEST_HAS_NO_NASTY_STRING
-      std::conditional_t<std::same_as<CharT, nasty_char>,
-                         std::basic_ispanstream<nasty_char, nasty_char_traits>,
-                         std::basic_ispanstream<CharT, TraitsT>>;
-#else
-      std::basic_ispanstream<CharT, TraitsT>;
-#endif
+  using SpBuf = std::basic_spanbuf<CharT, TraitsT>;
 
   // Mode
   static_assert(std::constructible_from<SpBuf, std::ios_base::openmode>);

libcxx/test/std/input.output/span.streams/spanbuf/spanbuf.cons/span.mode.pass.cpp

@@ -33,20 +33,6 @@
 #include "../../helper_macros.h"
 #include "../../helper_types.h"
 
-#ifndef TEST_HAS_NO_NASTY_STRING
-void test_sfinae_with_nasty_char() {
-  using SpBuf = std::basic_spanbuf<nasty_char, nasty_char_traits>;
-
-  // Mode
-  static_assert(std::constructible_from<SpBuf, const std::span<nasty_char>, std::ios_base::openmode>);
-  static_assert(!test_convertible<SpBuf, std::ios_base::openmode>());
-
-  // Non-mode
-  static_assert(!std::constructible_from<SpBuf, const std::span<nasty_char>, const NonMode>);
-  static_assert(!test_convertible<SpBuf, const NonMode>());
-}
-#endif // TEST_HAS_NO_NASTY_STRING
-
 template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test_sfinae() {
   using SpBuf = std::basic_spanbuf<CharT, TraitsT>;
@@ -174,7 +160,7 @@ void test() {
 
 int main(int, char**) {
 #ifndef TEST_HAS_NO_NASTY_STRING
-  test_sfinae_with_nasty_char();
+  test_sfinae<nasty_char, nasty_char_traits>();
 #endif
   test_sfinae<char>();
   test_sfinae<char, constexpr_char_traits<char>>();

libcxx/test/std/input.output/span.streams/spanstream/spanstream.cons/span.mode.pass.cpp

@@ -33,30 +33,9 @@
 #include "../../helper_macros.h"
 #include "../../helper_types.h"
 
-#ifndef TEST_HAS_NO_NASTY_STRING
-void test_sfinae_with_nasty_char() {
-  using SpStream = std::basic_spanstream<nasty_char, nasty_char_traits>;
-
-  // Mode
-  static_assert(std::constructible_from<SpStream, const std::span<nasty_char>, std::ios_base::openmode>);
-  static_assert(!test_convertible<SpStream, std::ios_base::openmode>());
-
-  // Non-mode
-  static_assert(!std::constructible_from<SpStream, const std::span<nasty_char>, const NonMode>);
-  static_assert(!test_convertible<SpStream, const std::span<nasty_char>, const NonMode>());
-}
-#endif // TEST_HAS_NO_NASTY_STRING
-
 template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test_sfinae() {
-  using SpStream =
-#ifndef TEST_HAS_NO_NASTY_STRING
-      std::conditional_t<std::same_as<CharT, nasty_char>,
-                         std::basic_ispanstream<nasty_char, nasty_char_traits>,
-                         std::basic_ispanstream<CharT, TraitsT>>;
-#else
-      std::basic_ispanstream<CharT, TraitsT>;
-#endif
+  using SpStream = std::basic_ispanstream<CharT, TraitsT>;
 
   // Mode
   static_assert(std::constructible_from<SpStream, const std::span<CharT>, std::ios_base::openmode>);
@@ -130,7 +109,7 @@ void test() {
 
 int main(int, char**) {
 #ifndef TEST_HAS_NO_NASTY_STRING
-  test_sfinae<nasty_char>();
+  test_sfinae<nasty_char, nasty_char_traits>();
 #endif
   test_sfinae<char>();
   test_sfinae<char, constexpr_char_traits<char>>();