Rewrite tests

Author: bugdea1er

tests/file.cpp

@@ -25,6 +25,8 @@
 namespace tmp {
 namespace {
 
+using namespace testing;
+
 /// Returns whether the underlying raw file device object is open
 template<class charT, class traits>
 bool is_open(const basic_file<charT, traits>& file) {
@@ -45,47 +47,50 @@ bool is_open(file::native_handle_type handle) {
 }
 
 template<typename charT>
-constexpr std::basic_string<charT> convert_string(const char* string) {
-  if constexpr (std::is_same_v<charT, char>) {
-    return std::basic_string<charT>(string);
+constexpr std::basic_string<charT> convert_string(std::string_view string) {
+  std::basic_string<charT> result;
+
+  for (char character : string) {
+    result += static_cast<charT>(character);
   }
 
-  if constexpr (std::is_same_v<charT, wchar_t>) {
-    std::mbstate_t state = std::mbstate_t();
+  return result;
+}
 
-    std::basic_string<charT> result;
-    result.resize(std::mbsrtowcs(nullptr, &string, 0, &state));
+template<typename charT> class file : public Test {
+public:
+  using file_t = basic_file<charT>;
+};
 
-    std::size_t ret =
-        std::mbsrtowcs(result.data(), &string, result.size(), &state);
-    assert(ret == result.size());
-    return result;
-  }
+class name_generator {
+public:
+  template<typename T> static std::string GetName(int) {
+    if constexpr (std::is_same_v<T, char>) {
+      return "char";
+    }
 
-  throw std::invalid_argument("Unknown character type");
-}
+    if constexpr (std::is_same_v<T, wchar_t>) {
+      return "wchar_t";
+    }
 
-template<typename charT> class file : public testing::Test {};
+    throw std::invalid_argument("Unknown character type");
+  }
+};
 
-using char_types = testing::Types<char, wchar_t>;
-TYPED_TEST_SUITE(file, char_types, testing::internal::DefaultNameGenerator);
+using char_types = Types<char, wchar_t>;
+TYPED_TEST_SUITE(file, char_types, name_generator);
 
 /// Tests file type traits and member types
 TYPED_TEST(file, type_traits) {
   using traits = std::char_traits<TypeParam>;
-
-  static_assert(
-      std::is_base_of_v<std::basic_iostream<TypeParam>, basic_file<TypeParam>>);
-  static_assert(
-      std::is_same_v<typename basic_file<TypeParam>::char_type, TypeParam>);
-  static_assert(
-      std::is_same_v<typename basic_file<TypeParam>::traits_type, traits>);
-  static_assert(std::is_same_v<typename basic_file<TypeParam>::int_type,
-                               typename traits::int_type>);
-  static_assert(std::is_same_v<typename basic_file<TypeParam>::pos_type,
-                               typename traits::pos_type>);
-  static_assert(std::is_same_v<typename basic_file<TypeParam>::off_type,
-                               typename traits::off_type>);
+  using file_t = basic_file<TypeParam>;
+
+  static_assert(std::is_base_of_v<std::basic_iostream<TypeParam>, file_t>);
+  StaticAssertTypeEq<typename file_t::char_type, TypeParam>();
+  StaticAssertTypeEq<typename file_t::traits_type, traits>();
+  StaticAssertTypeEq<typename file_t::int_type, typename traits::int_type>();
+  StaticAssertTypeEq<typename file_t::pos_type, typename traits::pos_type>();
+  StaticAssertTypeEq<typename file_t::off_type, typename traits::off_type>();
 }
 
 /// Tests file creation
@@ -150,10 +155,8 @@ TYPED_TEST(file, move_assignment) {
     basic_file<TypeParam> snd = basic_file<TypeParam>();
     snd << "Hello!";
 
-    typename basic_file<TypeParam>::native_handle_type fst_handle =
-        fst.native_handle();
-    typename basic_file<TypeParam>::native_handle_type snd_handle =
-        snd.native_handle();
+    typename decltype(fst)::native_handle_type fst_handle = fst.native_handle();
+    typename decltype(snd)::native_handle_type snd_handle = snd.native_handle();
 
     fst = std::move(snd);
 
@@ -175,10 +178,8 @@ TYPED_TEST(file, swap) {
   basic_file<TypeParam> fst = basic_file<TypeParam>();
   basic_file<TypeParam> snd = basic_file<TypeParam>();
 
-  typename basic_file<TypeParam>::native_handle_type fst_handle =
-      fst.native_handle();
-  typename basic_file<TypeParam>::native_handle_type snd_handle =
-      snd.native_handle();
+  typename decltype(fst)::native_handle_type fst_handle = fst.native_handle();
+  typename decltype(snd)::native_handle_type snd_handle = snd.native_handle();
 
   std::swap(fst, snd);