External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use deprecated API.

Browse Source
This commit is contained in:
Victor Zverovich 2014-06-28 20:03:46 -07:00
parent c649007ed8
commit 856e129cc6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/gtest-extra-test.cc
View File

@ -305,12 +305,12 @@ TEST(ExpectTest, EXPECT_SYSTEM_ERROR) {
" Actual: it throws nothing.");
EXPECT_NONFATAL_FAILURE(
EXPECT_SYSTEM_ERROR(ThrowSystemError(), EDOM, "other"),
str(fmt::Format(
str(fmt::format(
"ThrowSystemError() throws an exception with a different message.\n"
"Expected: {}\n"
" Actual: {}")
<< FormatSystemErrorMessage(EDOM, "other")
<< FormatSystemErrorMessage(EDOM, "test")));
" Actual: {}",
FormatSystemErrorMessage(EDOM, "other"),
FormatSystemErrorMessage(EDOM, "test"))));
}
// Tests EXPECT_WRITE.
@ -687,7 +687,7 @@ TEST(FileTest, Dup2) {
TEST(FileTest, Dup2Error) {
File f = OpenFile();
EXPECT_SYSTEM_ERROR_NOASSERT(f.dup2(-1), EBADF,
fmt::Format("cannot duplicate file descriptor {} to -1") << f.descriptor());
str(fmt::format("cannot duplicate file descriptor {} to -1", f.descriptor())));
}
TEST(FileTest, Dup2NoExcept) {
@ -756,7 +756,7 @@ TEST(OutputRedirectTest, FlushErrorInCtor) {
FMT_POSIX(close(write_fd));
OutputRedirect *redir = 0;
EXPECT_SYSTEM_ERROR_NOASSERT(redir = new OutputRedirect(f.get()),
EBADF, fmt::Format("cannot flush stream"));
EBADF, "cannot flush stream");
delete redir;
write_copy.dup2(write_fd); // "undo" close or dtor will fail
}
@ -768,7 +768,7 @@ TEST(OutputRedirectTest, DupErrorInCtor) {
FMT_POSIX(close(fd));
OutputRedirect *redir = 0;
EXPECT_SYSTEM_ERROR_NOASSERT(redir = new OutputRedirect(f.get()),
EBADF, fmt::Format("cannot duplicate file descriptor {}") << fd);
EBADF, str(fmt::format("cannot duplicate file descriptor {}", fd)));
copy.dup2(fd); // "undo" close or dtor will fail
delete redir;
}
@ -799,7 +799,7 @@ TEST(OutputRedirectTest, FlushErrorInRestoreAndRead) {
EXPECT_EQ('x', fputc('x', f.get()));
FMT_POSIX(close(write_fd));
EXPECT_SYSTEM_ERROR_NOASSERT(redir.RestoreAndRead(),
EBADF, fmt::Format("cannot flush stream"));
EBADF, "cannot flush stream");
write_copy.dup2(write_fd); // "undo" close or dtor will fail
}