From 80aec3ad31ebb4b8a00db27594b827e47fcc3376 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Mon, 11 Sep 2023 17:36:41 -0400 Subject: [PATCH] toWstring() -> details::to_wstring() --- UnitTest/CppUnitTestAssert.cpp | 2 +- UnitTest/TestCase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UnitTest/CppUnitTestAssert.cpp b/UnitTest/CppUnitTestAssert.cpp index 73fadd0f0..d2d76d169 100644 --- a/UnitTest/CppUnitTestAssert.cpp +++ b/UnitTest/CppUnitTestAssert.cpp @@ -37,5 +37,5 @@ void test::Assert::FailOnCondition(bool condition, const unsigned short* message std::wstring GetAssertMessage(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message); // declare caller std::wstring test::Assert::GetAssertMessage(bool equality, const std::string& expected, const std::string& actual, const wchar_t *message) { - return ::GetAssertMessage(equality, str::toWString(expected), str::toWString(actual), message); // and call! + return ::GetAssertMessage(equality, str::details::to_wstring(expected), str::details::to_wstring(actual), message); // and call! } diff --git a/UnitTest/TestCase.h b/UnitTest/TestCase.h index f7e260bc5..225afd7bd 100644 --- a/UnitTest/TestCase.h +++ b/UnitTest/TestCase.h @@ -89,7 +89,7 @@ inline void assert_almost_eq(const std::string& testName, long double X1, long d #define TEST_ASSERT_EQ_MSG(msg, X1, X2) testName, Microsoft::VisualStudio::CppUnitTestFramework::Logger::WriteMessage(msg.c_str()); TEST_ASSERT_EQ(X1, X2) #undef TEST_FAIL -#define TEST_FAIL(msg) { (void)testName; const auto vw(str::toWString(msg)); Microsoft::VisualStudio::CppUnitTestFramework::Assert::Fail(vw.c_str()); } +#define TEST_FAIL(msg) { (void)testName; const auto vw(str::details::to_wstring(msg)); Microsoft::VisualStudio::CppUnitTestFramework::Assert::Fail(vw.c_str()); } #undef TEST_EXCEPTION #undef TEST_THROWS