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

Replace CharWriteChecker and WCharWriteChecker with a single WriteChecker template.

Browse Source
This commit is contained in:
Victor Zverovich 2013-11-08 09:48:45 -07:00
parent eded10cf31
commit 00c9fcf1fe
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
format_test.cc
View File

@ -113,26 +113,20 @@ struct AnyWriteChecker {
} }
}; };
struct CharWriteChecker { template <typename Char>
struct WriteChecker {
template <typename T> template <typename T>
::testing::AssertionResult operator()(const char *, const T &value) const { ::testing::AssertionResult operator()(const char *, const T &value) const {
return CheckWrite<char>(value, "char"); return CheckWrite<Char>(value, "char");
}
};
struct WCharWriteChecker {
template <typename T>
::testing::AssertionResult operator()(const char *, const T &value) const {
return CheckWrite<wchar_t>(value, "char");
} }
}; };
// Checks if writing value to BasicWriter produces the same result // Checks if writing value to BasicWriter produces the same result
// as writing it to std::ostringstream both for char and wchar_t. // as writing it to std::ostringstream both for char and wchar_t.
#define CHECK_WRITE(value) ASSERT_PRED_FORMAT1(AnyWriteChecker(), value) #define CHECK_WRITE(value) EXPECT_PRED_FORMAT1(AnyWriteChecker(), value)
#define CHECK_WRITE_CHAR(value) ASSERT_PRED_FORMAT1(CharWriteChecker(), value) #define CHECK_WRITE_CHAR(value) EXPECT_PRED_FORMAT1(WriteChecker<char>(), value)
#define CHECK_WRITE_WCHAR(value) ASSERT_PRED_FORMAT1(WCharWriteChecker(), value) #define CHECK_WRITE_WCHAR(value) EXPECT_PRED_FORMAT1(WriteChecker<wchar_t>(), value)
// Increment a number in a string. // Increment a number in a string.
void Increment(char *s) { void Increment(char *s) {
@ -167,7 +161,6 @@ TEST(UtilTest, Increment) {
EXPECT_STREQ("129", s); EXPECT_STREQ("129", s);
Increment(s); Increment(s);
EXPECT_STREQ("130", s); EXPECT_STREQ("130", s);
EXPECT_STREQ("130", s);
s[1] = s[2] = '9'; s[1] = s[2] = '9';
Increment(s); Increment(s);
EXPECT_STREQ("200", s); EXPECT_STREQ("200", s);