feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Don't use deprecated API.

Browse Source
This commit is contained in:
Victor Zverovich
2014-06-28 19:59:44 -07:00
parent 0914c91284
commit c649007ed8
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/format-test.cc
View File

@ -301,7 +301,7 @@ TEST(WriterTest, MoveCtor) {
std::string s; std::string s;
for (int i = 0; i < fmt::internal::INLINE_BUFFER_SIZE; ++i) for (int i = 0; i < fmt::internal::INLINE_BUFFER_SIZE; ++i)
s += '*'; s += '*';
w.Clear(); w.clear();
w << s; w << s;
CheckMoveWriter(s, w); CheckMoveWriter(s, w);
const char *inline_buffer_ptr = w.data(); const char *inline_buffer_ptr = w.data();
@ -330,7 +330,7 @@ TEST(WriterTest, MoveAssignment) {
std::string s; std::string s;
for (int i = 0; i < fmt::internal::INLINE_BUFFER_SIZE; ++i) for (int i = 0; i < fmt::internal::INLINE_BUFFER_SIZE; ++i)
s += '*'; s += '*';
w.Clear(); w.clear();
w << s; w << s;
CheckMoveAssignWriter(s, w); CheckMoveAssignWriter(s, w);
const char *inline_buffer_ptr = w.data(); const char *inline_buffer_ptr = w.data();
@ -519,16 +519,16 @@ TEST(WriterTest, pad) {
EXPECT_EQ(" 33", str(Writer() << pad(33ll, 7))); EXPECT_EQ(" 33", str(Writer() << pad(33ll, 7)));
EXPECT_EQ(" 44", str(Writer() << pad(44ull, 7))); EXPECT_EQ(" 44", str(Writer() << pad(44ull, 7)));
BasicWriter<char> f; BasicWriter<char> w;
f.Clear(); w.clear();
f << pad(42, 5, '0'); w << pad(42, 5, '0');
EXPECT_EQ("00042", f.str()); EXPECT_EQ("00042", w.str());
f.Clear(); w.clear();
f << Date(2012, 12, 9); w << Date(2012, 12, 9);
EXPECT_EQ("2012-12-9", f.str()); EXPECT_EQ("2012-12-9", w.str());
f.Clear(); w.clear();
f << iso8601(Date(2012, 1, 9)); w << iso8601(Date(2012, 1, 9));
EXPECT_EQ("2012-01-09", f.str()); EXPECT_EQ("2012-01-09", w.str());
} }
TEST(WriterTest, PadString) { TEST(WriterTest, PadString) {
@ -1538,10 +1538,8 @@ TEST(FormatterTest, Examples) {
EXPECT_EQ(L"Cyrillic letter \x42e", EXPECT_EQ(L"Cyrillic letter \x42e",
str(format(L"Cyrillic letter {}", L'\x42e'))); str(format(L"Cyrillic letter {}", L'\x42e')));
#if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES
EXPECT_WRITE(stdout, EXPECT_WRITE(stdout,
fmt::Print("{}", std::numeric_limits<double>::infinity()), "inf"); fmt::print("{}", std::numeric_limits<double>::infinity()), "inf");
#endif
} }
TEST(FormatIntTest, Data) { TEST(FormatIntTest, Data) {
@ -1590,14 +1588,13 @@ TEST(FormatIntTest, FormatDec) {
#if FMT_USE_FILE_DESCRIPTORS #if FMT_USE_FILE_DESCRIPTORS
TEST(FormatTest, Print) { TEST(FormatTest, Print) {
EXPECT_WRITE(stdout, fmt::Print("Don't {}!") << "panic", "Don't panic!"); EXPECT_WRITE(stdout, fmt::print("Don't {}!", "panic"), "Don't panic!");
EXPECT_WRITE(stderr, EXPECT_WRITE(stderr,
fmt::Print(stderr, "Don't {}!") << "panic", "Don't panic!"); fmt::Print(stderr, "Don't {}!") << "panic", "Don't panic!");
} }
#if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES #if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES
TEST(FormatTest, PrintVariadic) { TEST(FormatTest, PrintVariadic) {
EXPECT_WRITE(stdout, fmt::Print("Don't {}!", "panic"), "Don't panic!");
EXPECT_WRITE(stderr, EXPECT_WRITE(stderr,
fmt::Print(stderr, "Don't {}!", "panic"), "Don't panic!"); fmt::Print(stderr, "Don't {}!", "panic"), "Don't panic!");
} }