AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check that hex and oct don't conflict with IO manipulators.

Browse Source
This commit is contained in:
Victor Zverovich 2013-01-21 10:50:51 -08:00
parent c7354b6705
commit 1b3ac76019
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
format_test.cc
View File

@ -35,6 +35,7 @@
#include <cfloat> #include <cfloat>
#include <climits> #include <climits>
#include <cstring> #include <cstring>
#include <iomanip>
#include <memory> #include <memory>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "format.h" #include "format.h"
@ -50,9 +51,7 @@ using fmt::Formatter;
using fmt::Format; using fmt::Format;
using fmt::FormatError; using fmt::FormatError;
using fmt::StringRef; using fmt::StringRef;
using fmt::hex;
using fmt::hexu; using fmt::hexu;
using fmt::oct;
using fmt::pad; using fmt::pad;
#define FORMAT_TEST_THROW_(statement, expected_exception, message, fail) \ #define FORMAT_TEST_THROW_(statement, expected_exception, message, fail) \
@ -1065,6 +1064,7 @@ TEST(TempFormatterTest, Examples) {
} }
TEST(StrTest, oct) { TEST(StrTest, oct) {
using fmt::oct;
EXPECT_EQ("12", (BasicFormatter() << oct(static_cast<short>(012))).str()); EXPECT_EQ("12", (BasicFormatter() << oct(static_cast<short>(012))).str());
EXPECT_EQ("12", (BasicFormatter() << oct(012)).str()); EXPECT_EQ("12", (BasicFormatter() << oct(012)).str());
EXPECT_EQ("34", (BasicFormatter() << oct(034u)).str()); EXPECT_EQ("34", (BasicFormatter() << oct(034u)).str());
@ -1073,6 +1073,7 @@ TEST(StrTest, oct) {
} }
TEST(StrTest, hex) { TEST(StrTest, hex) {
using fmt::hex;
fmt::IntFormatter<int, fmt::TypeSpec<'x'> > (*phex)(int value) = hex; fmt::IntFormatter<int, fmt::TypeSpec<'x'> > (*phex)(int value) = hex;
phex(42); phex(42);
// This shouldn't compile: // This shouldn't compile:
@ -1107,6 +1108,7 @@ public:
ISO8601DateFormatter iso8601(const Date &d) { return ISO8601DateFormatter(d); } ISO8601DateFormatter iso8601(const Date &d) { return ISO8601DateFormatter(d); }
TEST(StrTest, pad) { TEST(StrTest, pad) {
using fmt::hex;
EXPECT_EQ(" cafe", (BasicFormatter() << pad(hex(0xcafe), 8)).str()); EXPECT_EQ(" cafe", (BasicFormatter() << pad(hex(0xcafe), 8)).str());
EXPECT_EQ(" babe", (BasicFormatter() << pad(hex(0xbabeu), 8)).str()); EXPECT_EQ(" babe", (BasicFormatter() << pad(hex(0xbabeu), 8)).str());
EXPECT_EQ(" dead", (BasicFormatter() << pad(hex(0xdeadl), 8)).str()); EXPECT_EQ(" dead", (BasicFormatter() << pad(hex(0xdeadl), 8)).str());
@ -1129,6 +1131,13 @@ TEST(StrTest, pad) {
EXPECT_EQ("2012-01-09", f.str()); EXPECT_EQ("2012-01-09", f.str());
} }
TEST(StrTest, NoConflictWithIOManip) {
using namespace std;
using namespace fmt;
EXPECT_EQ("cafe", (BasicFormatter() << hex(0xcafe)).str());
EXPECT_EQ("12", (BasicFormatter() << oct(012)).str());
}
template <typename T> template <typename T>
std::string str(const T &value) { std::string str(const T &value) {
return fmt::str(fmt::Format("{0}") << value); return fmt::str(fmt::Format("{0}") << value);