leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ArgInserter into TempFormatter and replace BasicFormatter::operator() with BasicWriter::Format.

Browse Source
This commit is contained in:
Victor Zverovich
2013-09-03 18:58:13 -07:00
parent 6829819b8d
commit 50cf5e17a7
2 changed files with 77 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
format_test.cc
+17 -15
View File
@@ -1015,17 +1015,17 @@ TEST(FormatterTest, FormatStringFromSpeedTest) {
<< reinterpret_cast<void*>(1000) << 'X'));
}
TEST(FormatterTest, FormatterCtor) {
Formatter format;
EXPECT_EQ(0u, format.size());
EXPECT_STREQ("", format.c_str());
EXPECT_EQ("", format.str());
format("part{0}") << 1;
format("part{0}") << 2;
EXPECT_EQ("part1part2", format.str());
TEST(WriterTest, WriterCtor) {
Writer w;
EXPECT_EQ(0u, w.size());
EXPECT_STREQ("", w.c_str());
EXPECT_EQ("", w.str());
w.Format("part{0}") << 1;
w.Format("part{0}") << 2;
EXPECT_EQ("part1part2", w.str());
}
TEST(FormatterTest, FormatterAppend) {
/*TEST(FormatterTest, FormatterAppend) {
Formatter format;
format("part{0}") << 1;
EXPECT_EQ(strlen("part1"), format.size());
@@ -1037,9 +1037,9 @@ TEST(FormatterTest, FormatterAppend) {
EXPECT_STREQ("part1part2", format.c_str());
EXPECT_STREQ("part1part2", format.data());
EXPECT_EQ("part1part2", format.str());
}
}*/
TEST(FormatterTest, FormatterExamples) {
TEST(FormatTest, FormatExamples) {
using fmt::hex;
EXPECT_EQ("0000cafe", str(BasicWriter<char>() << pad(hex(0xcafe), 8, '0')));
@@ -1050,7 +1050,8 @@ TEST(FormatterTest, FormatterExamples) {
EXPECT_EQ("42", str(Format(std::string("{}")) << 42));
EXPECT_EQ("42", str(Format(Format("{{}}")) << 42));
Formatter format;
// TODO
/*Formatter format;
format("Current point:\n");
format("({0:+f}, {1:+f})\n") << -3.14 << 3.14;
EXPECT_EQ("Current point:\n(-3.140000, +3.140000)\n", format.str());
@@ -1061,14 +1062,15 @@ TEST(FormatterTest, FormatterExamples) {
format("{0}") << i;
std::string s = format.str(); // s == 0123456789
EXPECT_EQ("0123456789", s);
}
}*/
}
TEST(FormatterTest, ArgInserter) {
// TODO
/*TEST(FormatterTest, ArgInserter) {
Formatter format;
EXPECT_EQ("1", str(format("{0}") << 1));
EXPECT_STREQ("12", c_str(format("{0}") << 2));
}
}*/
TEST(FormatterTest, StrNamespace) {
fmt::str(Format(""));