From 12ed2de739eedeb8e549e20d3e1bb95b0d997257 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sun, 28 Mar 2021 20:51:36 +0100 Subject: [PATCH] Remove std::codecvt_utf8_utf16 tests It's deprecated in C++17, and causes compilation errors by default in MSVC 2019. --- src/tests/api/internals/main.cpp | 33 -------------------------------- 1 file changed, 33 deletions(-) diff --git a/src/tests/api/internals/main.cpp b/src/tests/api/internals/main.cpp index 7c419dcb..792bef68 100644 --- a/src/tests/api/internals/main.cpp +++ b/src/tests/api/internals/main.cpp @@ -102,23 +102,6 @@ TEST(Filesystem, EXPECT_NE(utf8, path.u8string()); EXPECT_NE(utf16, path.u16string()); } - -TEST(Filesystem, - pathStringAndLocaleConstructorConvertsCharacterEncodingFromUtf8ToNativeIfLocaleHasCodeCvtFacet) { - std::string utf8 = u8"Andr\u00E9_settings.toml"; - std::u16string utf16 = u"Andr\u00E9_settings.toml"; - - ASSERT_EQ('\xc3', utf8[4]); - ASSERT_EQ('\xa9', utf8[5]); - - auto locale = std::locale(std::locale::classic(), new std::codecvt_utf8_utf16()); - std::filesystem::path path(utf8, locale); - - EXPECT_NE(utf8, path.string()); - - EXPECT_EQ(utf8, path.u8string()); - EXPECT_EQ(utf16, path.u16string()); -} #else TEST(Filesystem, pathStringConstructorUsesNativeEncodingOfUtf8) { @@ -149,22 +132,6 @@ TEST(Filesystem, EXPECT_EQ(utf8, path.u8string()); EXPECT_EQ(utf16, path.u16string()); } - -TEST(Filesystem, - pathStringAndLocaleConstructorUsesNativeEncodingOfUtf8WithLocaleWithCodeCvtFacet) { - std::string utf8 = u8"Andr\u00E9_settings.toml"; - std::u16string utf16 = u"Andr\u00E9_settings.toml"; - - ASSERT_EQ('\xc3', utf8[4]); - ASSERT_EQ('\xa9', utf8[5]); - - auto locale = std::locale(std::locale::classic(), new std::codecvt_utf8_utf16()); - std::filesystem::path path(utf8, locale); - - EXPECT_EQ(utf8, path.string()); - EXPECT_EQ(utf8, path.u8string()); - EXPECT_EQ(utf16, path.u16string()); -} #endif TEST(Filesystem, u8pathConvertsCharacterEncodingFromUtf8ToNative) {