Skip to content

Commit 748dabf

Browse files
mborlandmborland
committed
Fix {fmt} testing
1 parent 2495fd6 commit 748dabf

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎test/test_format_fmtlib.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ void test_general()
3131

3232
BOOST_DECIMAL_IF_CONSTEXPR (std::numeric_limits<T>::digits10 <= 7)
3333
{
34-
BOOST_TEST_EQ(fmt::format("{}", T {21, 6}), "2.1e+07");
35-
BOOST_TEST_EQ(fmt::format("{}", T {211, 6}), "2.11e+08");
36-
BOOST_TEST_EQ(fmt::format("{}", T {2111, 6}), "2.111e+09");
34+
BOOST_TEST_EQ(fmt::format("{}", T {21u, 6}), "2.1e+07");
35+
BOOST_TEST_EQ(fmt::format("{}", T {211u, 6}), "2.11e+08");
36+
BOOST_TEST_EQ(fmt::format("{}", T {2111u, 6}), "2.111e+09");
3737
}
3838
else
3939
{
40-
BOOST_TEST_EQ(fmt::format("{}", T {21, 6}), "21000000");
41-
BOOST_TEST_EQ(fmt::format("{}", T {211, 6}), "211000000");
42-
BOOST_TEST_EQ(fmt::format("{}", T {2111, 6}), "2111000000");
40+
BOOST_TEST_EQ(fmt::format("{}", T {21u, 6}), "21000000");
41+
BOOST_TEST_EQ(fmt::format("{}", T {211u, 6}), "211000000");
42+
BOOST_TEST_EQ(fmt::format("{}", T {2111u, 6}), "2111000000");
4343
}
4444

4545
BOOST_TEST_EQ(fmt::format("{}", std::numeric_limits<T>::infinity()), "inf");
@@ -59,18 +59,18 @@ void test_general()
5959

6060
BOOST_DECIMAL_IF_CONSTEXPR (std::numeric_limits<T>::digits10 <= 7)
6161
{
62-
BOOST_TEST_EQ(fmt::format("{:g}", T {21, 6, true}), "-2.1e+07");
63-
BOOST_TEST_EQ(fmt::format("{:g}", T {211, 6, true}), "-2.11e+08");
64-
BOOST_TEST_EQ(fmt::format("{:g}", T {2111, 6, true}), "-2.111e+09");
65-
BOOST_TEST_EQ(fmt::format("{:G}", T {21, 6, true}), "-2.1E+07");
66-
BOOST_TEST_EQ(fmt::format("{:G}", T {211, 6, true}), "-2.11E+08");
67-
BOOST_TEST_EQ(fmt::format("{:G}", T {2111, 6, true}), "-2.111E+09");
62+
BOOST_TEST_EQ(fmt::format("{:g}", T {21u, 6, true}), "-2.1e+07");
63+
BOOST_TEST_EQ(fmt::format("{:g}", T {211u, 6, true}), "-2.11e+08");
64+
BOOST_TEST_EQ(fmt::format("{:g}", T {2111u, 6, true}), "-2.111e+09");
65+
BOOST_TEST_EQ(fmt::format("{:G}", T {21u, 6, true}), "-2.1E+07");
66+
BOOST_TEST_EQ(fmt::format("{:G}", T {211u, 6, true}), "-2.11E+08");
67+
BOOST_TEST_EQ(fmt::format("{:G}", T {2111u, 6, true}), "-2.111E+09");
6868
}
6969
else
7070
{
71-
BOOST_TEST_EQ(fmt::format("{:g}", T {21, 6, true}), "-21000000");
72-
BOOST_TEST_EQ(fmt::format("{:g}", T {211, 6, true}), "-211000000");
73-
BOOST_TEST_EQ(fmt::format("{:g}", T {2111, 6, true}), "-2111000000");
71+
BOOST_TEST_EQ(fmt::format("{:g}", T {21u, 6, true}), "-21000000");
72+
BOOST_TEST_EQ(fmt::format("{:g}", T {211u, 6, true}), "-211000000");
73+
BOOST_TEST_EQ(fmt::format("{:g}", T {2111u, 6, true}), "-2111000000");
7474
}
7575

7676
BOOST_TEST_EQ(fmt::format("{:g}", std::numeric_limits<T>::infinity()), "inf");
@@ -91,17 +91,17 @@ void test_general()
9191
template <typename T>
9292
void test_fixed()
9393
{
94-
BOOST_TEST_EQ(fmt::format("{:f}", T {21, 6, true}), "-21000000.000000");
95-
BOOST_TEST_EQ(fmt::format("{:f}", T {211, 6, true}), "-211000000.000000");
96-
BOOST_TEST_EQ(fmt::format("{:f}", T {2111, 6, true}), "-2111000000.000000");
94+
BOOST_TEST_EQ(fmt::format("{:f}", T {21u, 6, true}), "-21000000.000000");
95+
BOOST_TEST_EQ(fmt::format("{:f}", T {211u, 6, true}), "-211000000.000000");
96+
BOOST_TEST_EQ(fmt::format("{:f}", T {2111u, 6, true}), "-2111000000.000000");
9797

98-
BOOST_TEST_EQ(fmt::format("{:.0f}", T {21, 6, true}), std::string{"-21000000"});
99-
BOOST_TEST_EQ(fmt::format("{:.0f}", T {211, 6, true}), std::string{"-211000000"});
100-
BOOST_TEST_EQ(fmt::format("{:.0f}", T {2111, 6, true}), std::string{"-2111000000"});
98+
BOOST_TEST_EQ(fmt::format("{:.0f}", T {21u, 6, true}), std::string{"-21000000"});
99+
BOOST_TEST_EQ(fmt::format("{:.0f}", T {211u, 6, true}), std::string{"-211000000"});
100+
BOOST_TEST_EQ(fmt::format("{:.0f}", T {2111u, 6, true}), std::string{"-2111000000"});
101101

102-
BOOST_TEST_EQ(fmt::format("{:.1f}", T {21, 6, true}), std::string{"-21000000.0"});
103-
BOOST_TEST_EQ(fmt::format("{:.1f}", T {211, 6, true}), std::string{"-211000000.0"});
104-
BOOST_TEST_EQ(fmt::format("{:.1f}", T {2111, 6, true}), std::string{"-2111000000.0"});
102+
BOOST_TEST_EQ(fmt::format("{:.1f}", T {21u, 6, true}), std::string{"-21000000.0"});
103+
BOOST_TEST_EQ(fmt::format("{:.1f}", T {211u, 6, true}), std::string{"-211000000.0"});
104+
BOOST_TEST_EQ(fmt::format("{:.1f}", T {2111u, 6, true}), std::string{"-2111000000.0"});
105105

106106
BOOST_TEST_EQ(fmt::format("{:.0f}", T {0}), "0");
107107
BOOST_TEST_EQ(fmt::format("{:f}", std::numeric_limits<T>::infinity()), "inf");
@@ -122,13 +122,13 @@ void test_fixed()
122122
template <typename T>
123123
void test_scientific()
124124
{
125-
BOOST_TEST_EQ(fmt::format("{:e}", T {21, 6, true}), "-2.100000e+07");
126-
BOOST_TEST_EQ(fmt::format("{:e}", T {211, 6, true}), "-2.110000e+08");
127-
BOOST_TEST_EQ(fmt::format("{:e}", T {2111, 6, true}), "-2.111000e+09");
125+
BOOST_TEST_EQ(fmt::format("{:e}", T {21u, 6, true}), "-2.100000e+07");
126+
BOOST_TEST_EQ(fmt::format("{:e}", T {211u, 6, true}), "-2.110000e+08");
127+
BOOST_TEST_EQ(fmt::format("{:e}", T {2111u, 6, true}), "-2.111000e+09");
128128

129-
BOOST_TEST_EQ(fmt::format("{:E}", T {21, 6, true}), "-2.100000E+07");
130-
BOOST_TEST_EQ(fmt::format("{:E}", T {211, 6, true}), "-2.110000E+08");
131-
BOOST_TEST_EQ(fmt::format("{:E}", T {2111, 6, true}), "-2.111000E+09");
129+
BOOST_TEST_EQ(fmt::format("{:E}", T {21u, 6, true}), "-2.100000E+07");
130+
BOOST_TEST_EQ(fmt::format("{:E}", T {211u, 6, true}), "-2.110000E+08");
131+
BOOST_TEST_EQ(fmt::format("{:E}", T {2111u, 6, true}), "-2.111000E+09");
132132

133133
BOOST_TEST_EQ(fmt::format("{:.0E}", T {0}), "0E+00");
134134
BOOST_TEST_EQ(fmt::format("{:e}", std::numeric_limits<T>::infinity()), "inf");

0 commit comments

Comments
 (0)