From 7258d1b8f3a231ef02304892ba9a65c7cb4e9d23 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Wed, 8 Mar 2017 07:34:10 -0800 Subject: [PATCH] Fix tests --- test/gtest-extra-test.cc | 4 ++-- test/util-test.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/gtest-extra-test.cc b/test/gtest-extra-test.cc index ac11cf94..b86a5636 100644 --- a/test/gtest-extra-test.cc +++ b/test/gtest-extra-test.cc @@ -268,10 +268,10 @@ TEST(ExpectTest, EXPECT_SYSTEM_ERROR) { EXPECT_NONFATAL_FAILURE( EXPECT_SYSTEM_ERROR(throw_exception(), EDOM, "test"), "Expected: throw_exception() throws an exception of " - "type fmt::SystemError.\n Actual: it throws a different type."); + "type fmt::system_error.\n Actual: it throws a different type."); EXPECT_NONFATAL_FAILURE( EXPECT_SYSTEM_ERROR(do_nothing(), EDOM, "test"), - "Expected: do_nothing() throws an exception of type fmt::SystemError.\n" + "Expected: do_nothing() throws an exception of type fmt::system_error.\n" " Actual: it throws nothing."); EXPECT_NONFATAL_FAILURE( EXPECT_SYSTEM_ERROR(throw_system_error(), EDOM, "other"), diff --git a/test/util-test.cc b/test/util-test.cc index 19e960f1..e8d8ac80 100644 --- a/test/util-test.cc +++ b/test/util-test.cc @@ -670,10 +670,10 @@ void check_utf_conversion_error( fmt::basic_string_view str = fmt::basic_string_view(0, 0)) { fmt::memory_buffer out; fmt::internal::format_windows_error(out, ERROR_INVALID_PARAMETER, message); - fmt::SystemError error(0, ""); + fmt::system_error error(0, ""); try { (Converter)(str); - } catch (const fmt::SystemError &e) { + } catch (const fmt::system_error &e) { error = e; } EXPECT_EQ(ERROR_INVALID_PARAMETER, error.error_code()); @@ -788,7 +788,7 @@ TEST(UtilTest, FormatLongWindowsError) { } TEST(UtilTest, WindowsError) { - check_throw_error( + check_throw_error( ERROR_FILE_EXISTS, fmt::internal::format_windows_error); }