X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2Futil.cpp;h=163bc7ac0ef6471a7f9e5403361161fbb1f6959f;hb=0f5e2c7db1dc3e86ac741e8c1c89cce6202b43cc;hp=ce9b64d27f324cf3f6cc561fe76b2db3c90dc1cc;hpb=af95045e903a0d2ac5aac63095eb124038be40c9;p=pulseview.git
diff --git a/test/util.cpp b/test/util.cpp
index ce9b64d..163bc7a 100644
--- a/test/util.cpp
+++ b/test/util.cpp
@@ -14,179 +14,228 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
#include "pv/util.hpp"
+#include "test/test.hpp"
using namespace pv::util;
using ts = pv::util::Timestamp;
+using std::bind;
+
namespace {
QChar mu = QChar(0x03BC);
-}
-std::ostream& operator<<(std::ostream& stream, const QString& str)
-{
- return stream << str.toUtf8().data();
-}
+ pv::util::SIPrefix unspecified = pv::util::SIPrefix::unspecified;
+ pv::util::SIPrefix yocto = pv::util::SIPrefix::yocto;
+ pv::util::SIPrefix nano = pv::util::SIPrefix::nano;
+/* pv::util::SIPrefix micro = pv::util::SIPrefix::micro; // Not currently used */
+ pv::util::SIPrefix milli = pv::util::SIPrefix::milli;
+ pv::util::SIPrefix none = pv::util::SIPrefix::none;
+ pv::util::SIPrefix kilo = pv::util::SIPrefix::kilo;
+ pv::util::SIPrefix yotta = pv::util::SIPrefix::yotta;
+
+/* pv::util::TimeUnit Time = pv::util::TimeUnit::Time; // Not currently used */
+} // namespace
BOOST_AUTO_TEST_SUITE(UtilTest)
-BOOST_AUTO_TEST_CASE(format_si_value_test)
+BOOST_AUTO_TEST_CASE(exponent_test)
+{
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::yocto), -24);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::zepto), -21);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::atto), -18);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::femto), -15);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::pico), -12);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::nano), -9);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::micro), -6);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::milli), -3);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::none), 0);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::kilo), 3);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::mega), 6);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::giga), 9);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::tera), 12);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::peta), 15);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::exa), 18);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::zetta), 21);
+ BOOST_CHECK_EQUAL(exponent(SIPrefix::yotta), 24);
+}
+
+BOOST_AUTO_TEST_CASE(format_time_si_test)
{
// check prefix calculation
- BOOST_CHECK_EQUAL(format_si_value(ts("0"), "V"), "0 V");
-
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-24"), "V"), "+1 yV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-23"), "V"), "+10 yV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-22"), "V"), "+100 yV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-21"), "V"), "+1 zV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-20"), "V"), "+10 zV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-19"), "V"), "+100 zV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-18"), "V"), "+1 aV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-17"), "V"), "+10 aV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-16"), "V"), "+100 aV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-15"), "V"), "+1 fV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-14"), "V"), "+10 fV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-13"), "V"), "+100 fV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-12"), "V"), "+1 pV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-11"), "V"), "+10 pV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-10"), "V"), "+100 pV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-9"), "V"), "+1 nV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-8"), "V"), "+10 nV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-7"), "V"), "+100 nV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-6"), "V"), QString("+1 ") + mu + "V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-5"), "V"), QString("+10 ") + mu + "V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-4"), "V"), QString("+100 ") + mu + "V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-3"), "V"), "+1 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-2"), "V"), "+10 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-1"), "V"), "+100 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e0"), "V"), "+1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e1"), "V"), "+10 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e2"), "V"), "+100 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e3"), "V"), "+1 kV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e4"), "V"), "+10 kV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e5"), "V"), "+100 kV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e6"), "V"), "+1 MV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e7"), "V"), "+10 MV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e8"), "V"), "+100 MV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e9"), "V"), "+1 GV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e10"), "V"), "+10 GV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e11"), "V"), "+100 GV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e12"), "V"), "+1 TV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e13"), "V"), "+10 TV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e14"), "V"), "+100 TV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e15"), "V"), "+1 PV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e16"), "V"), "+10 PV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e17"), "V"), "+100 PV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e18"), "V"), "+1 EV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e19"), "V"), "+10 EV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e20"), "V"), "+100 EV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e21"), "V"), "+1 ZV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e22"), "V"), "+10 ZV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e23"), "V"), "+100 ZV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e24"), "V"), "+1 YV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e25"), "V"), "+10 YV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e26"), "V"), "+100 YV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e27"), "V"), "+1000 YV");
-
- BOOST_CHECK_EQUAL(format_si_value(ts("1234"), "V"), "+1 kV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1234"), "V", 9, 3), "+1.234 kV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1234.5678"), "V"), "+1 kV");
-
- // check if a given prefix is honored
-
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-24"), "V", 0), "+1 yV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-21"), "V", 0), "+1000 yV");
- BOOST_CHECK_EQUAL(format_si_value(ts("0"), "V", 0), "0 yV");
-
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-4"), "V", 7), "+0 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-4"), "V", 7, 1), "+0.1 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1000"), "V", 7), "+1000000 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("0"), "V", 7), "0 mV");
-
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-1"), "V", 8), "+0 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-1"), "V", 8, 1), "+0.1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e-1"), "V", 8, 2), "+0.10 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1"), "V", 8), "+1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e1"), "V", 8), "+10 V");
-
- BOOST_CHECK_EQUAL(format_si_value(ts("1e23"), "V", 16), "+0 YV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e23"), "V", 16, 1), "+0.1 YV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1e27"), "V", 16), "+1000 YV");
- BOOST_CHECK_EQUAL(format_si_value(ts("0"), "V", 16), "0 YV");
-
- // check precision
-
- BOOST_CHECK_EQUAL(format_si_value(ts("1.2345678"), "V"), "+1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.4"), "V"), "+1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.5"), "V"), "+2 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.9"), "V"), "+2 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.2345678"), "V", -1, 2), "+1.23 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.2345678"), "V", -1, 3), "+1.235 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.2345678"), "V", 7, 3), "+1234.568 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.2345678"), "V", 7, 0), "+1235 mV");
- BOOST_CHECK_EQUAL(format_si_value(ts("1.2"), "V", -1, 3), "+1.200 V");
-
- // check sign
-
- BOOST_CHECK_EQUAL(format_si_value(ts("-1"), "V", 8, 0, true), "-1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("-1"), "V", 8, 0, false), "-1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1"), "V", 8, 0, true), "+1 V");
- BOOST_CHECK_EQUAL(format_si_value(ts("1"), "V", 8, 0, false), "1 V");
+ BOOST_CHECK_EQUAL(format_time_si(ts("0")), "0 s");
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-24")), "+1 ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-23")), "+10 ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-22")), "+100 ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-21")), "+1 zs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-20")), "+10 zs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-19")), "+100 zs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-18")), "+1 as");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-17")), "+10 as");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-16")), "+100 as");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-15")), "+1 fs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-14")), "+10 fs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-13")), "+100 fs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-12")), "+1 ps");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-11")), "+10 ps");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-10")), "+100 ps");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-9")), "+1 ns");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-8")), "+10 ns");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-7")), "+100 ns");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-6")), QString("+1 ") + mu + "s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-5")), QString("+10 ") + mu + "s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-4")), QString("+100 ") + mu + "s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-3")), "+1 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-2")), "+10 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-1")), "+100 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e0")), "+1 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e1")), "+10 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e2")), "+100 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e3")), "+1 ks");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e4")), "+10 ks");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e5")), "+100 ks");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e6")), "+1 Ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e7")), "+10 Ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e8")), "+100 Ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e9")), "+1 Gs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e10")), "+10 Gs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e11")), "+100 Gs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e12")), "+1 Ts");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e13")), "+10 Ts");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e14")), "+100 Ts");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e15")), "+1 Ps");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e16")), "+10 Ps");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e17")), "+100 Ps");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e18")), "+1 Es");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e19")), "+10 Es");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e20")), "+100 Es");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e21")), "+1 Zs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e22")), "+10 Zs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e23")), "+100 Zs");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e24")), "+1 Ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e25")), "+10 Ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e26")), "+100 Ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e27")), "+1000 Ys");
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("1234")), "+1 ks");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1234"), kilo, 3), "+1.234 ks");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1234.5678")), "+1 ks");
+
+ // check prefix
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-24"), yocto), "+1 ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-21"), yocto), "+1000 ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("0"), yocto), "0 ys");
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-4"), milli), "+0 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-4"), milli, 1), "+0.1 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1000"), milli), "+1000000 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("0"), milli), "0 ms");
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-1"), none), "+0 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-1"), none, 1), "+0.1 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e-1"), none, 2), "+0.10 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1"), none), "+1 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e1"), none), "+10 s");
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e23"), yotta), "+0 Ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e23"), yotta, 1), "+0.1 Ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1e27"), yotta), "+1000 Ys");
+ BOOST_CHECK_EQUAL(format_time_si(ts("0"), yotta), "0 Ys");
+
+ // check precision, rounding
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.2345678")), "+1 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.4")), "+1 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.5")), "+2 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.9")), "+2 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.2345678"), unspecified, 2), "+1.23 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.2345678"), unspecified, 3), "+1.235 s");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.2345678"), milli, 3), "+1234.568 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.2345678"), milli, 0), "+1235 ms");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1.2"), unspecified, 3), "+1.200 s");
+
+ // check unit and sign
+
+ BOOST_CHECK_EQUAL(format_time_si(ts("-1"), none, 0, "V", true), "-1 V");
+ BOOST_CHECK_EQUAL(format_time_si(ts("-1"), none, 0, "V", false), "-1 V");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1"), none, 0, "V", true), "+1 V");
+ BOOST_CHECK_EQUAL(format_time_si(ts("1"), none, 0, "V", false), "1 V");
+}
+
+BOOST_AUTO_TEST_CASE(format_time_si_adjusted_test)
+{
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts("-1.5"), milli), "-1500 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts("-1.0"), milli), "-1000 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts("-0.2"), milli), "-200 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts("-0.1"), milli), "-100 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.0"), milli), "0 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.1"), milli), "+100 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.2"), milli), "+200 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.3"), milli), "+300 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.4"), milli), "+400 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.5"), milli), "+500 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.6"), milli), "+600 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.7"), milli), "+700 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.8"), milli), "+800 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "0.9"), milli), "+900 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.0"), milli), "+1000 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.1"), milli), "+1100 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.2"), milli), "+1200 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.3"), milli), "+1300 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.4"), milli), "+1400 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.5"), milli), "+1500 ms");
+
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.5"), milli, 6), "+1500.000 ms");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.5"), nano, 6), "+1500000000 ns");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.5"), nano, 8), "+1500000000 ns");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.5"), nano, 9), "+1500000000 ns");
+ BOOST_CHECK_EQUAL(format_time_si_adjusted(ts( "1.5"), nano, 10), "+1500000000.0 ns");
}
-BOOST_AUTO_TEST_CASE(format_time_test)
+BOOST_AUTO_TEST_CASE(format_time_minutes_test)
{
- BOOST_CHECK_EQUAL(format_time(ts("-0.00005"), 6, Time, 5), QString("-50 ") + mu + "s");
- BOOST_CHECK_EQUAL(format_time(ts( "0.00005"), 6, Time, 5), QString("+50 ") + mu + "s");
- BOOST_CHECK_EQUAL(format_time(ts( "1")), "+1 s");
- BOOST_CHECK_EQUAL(format_time(ts("-1")), "-1 s");
- BOOST_CHECK_EQUAL(format_time(ts( "100")), "+1:40");
- BOOST_CHECK_EQUAL(format_time(ts("-100")), "-1:40");
- BOOST_CHECK_EQUAL(format_time(ts( "4000")), "+1:06:40");
- BOOST_CHECK_EQUAL(format_time(ts("-4000")), "-1:06:40");
- BOOST_CHECK_EQUAL(format_time(ts("12000"), 9, Time, 0), "+3:20:00");
- BOOST_CHECK_EQUAL(format_time(ts("15000"), 9, Time, 0), "+4:10:00");
- BOOST_CHECK_EQUAL(format_time(ts("20000"), 9, Time, 0), "+5:33:20");
- BOOST_CHECK_EQUAL(format_time(ts("25000"), 9, Time, 0), "+6:56:40");
-
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 0), "+123:04:05:06");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 1), "+123:04:05:06.0");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 2), "+123:04:05:06.00");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 3), "+123:04:05:06.007");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 4), "+123:04:05:06.007 0");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 5), "+123:04:05:06.007 00");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 6), "+123:04:05:06.007 008");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 7), "+123:04:05:06.007 008 0");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 8), "+123:04:05:06.007 008 00");
- BOOST_CHECK_EQUAL(format_time(ts("10641906.007008009"), 0, Time, 9), "+123:04:05:06.007 008 009");
-
- BOOST_CHECK_EQUAL(format_time(ts("-1.5"), 7), "-1500 ms");
- BOOST_CHECK_EQUAL(format_time(ts("-1.0"), 7), "-1000 ms");
- BOOST_CHECK_EQUAL(format_time(ts("-0.2")), "-200 ms");
- BOOST_CHECK_EQUAL(format_time(ts("-0.1")), "-100 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.0")), "0");
- BOOST_CHECK_EQUAL(format_time(ts("0.1")), "+100 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.2")), "+200 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.3")), "+300 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.4")), "+400 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.5")), "+500 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.6")), "+600 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.7")), "+700 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.8")), "+800 ms");
- BOOST_CHECK_EQUAL(format_time(ts("0.9")), "+900 ms");
- BOOST_CHECK_EQUAL(format_time(ts("1.0"), 7), "+1000 ms");
- BOOST_CHECK_EQUAL(format_time(ts("1.1"), 7), "+1100 ms");
- BOOST_CHECK_EQUAL(format_time(ts("1.2"), 7), "+1200 ms");
- BOOST_CHECK_EQUAL(format_time(ts("1.3"), 7), "+1300 ms");
- BOOST_CHECK_EQUAL(format_time(ts("1.4"), 7), "+1400 ms");
- BOOST_CHECK_EQUAL(format_time(ts("1.5"), 7), "+1500 ms");
+ using namespace std::placeholders;
+
+ auto fmt = bind(format_time_minutes, _1, _2, true);
+
+ BOOST_CHECK_EQUAL(fmt(ts( 0), 0), "+0:00");
+ BOOST_CHECK_EQUAL(fmt(ts( 1), 0), "+0:01");
+ BOOST_CHECK_EQUAL(fmt(ts( 59), 0), "+0:59");
+ BOOST_CHECK_EQUAL(fmt(ts( 60), 0), "+1:00");
+ BOOST_CHECK_EQUAL(fmt(ts( -1), 0), "-0:01");
+ BOOST_CHECK_EQUAL(fmt(ts( -59), 0), "-0:59");
+ BOOST_CHECK_EQUAL(fmt(ts( -60), 0), "-1:00");
+ BOOST_CHECK_EQUAL(fmt(ts( 100), 0), "+1:40");
+ BOOST_CHECK_EQUAL(fmt(ts( -100), 0), "-1:40");
+ BOOST_CHECK_EQUAL(fmt(ts( 4000), 0), "+1:06:40");
+ BOOST_CHECK_EQUAL(fmt(ts(-4000), 0), "-1:06:40");
+ BOOST_CHECK_EQUAL(fmt(ts(12000), 0), "+3:20:00");
+ BOOST_CHECK_EQUAL(fmt(ts(15000), 0), "+4:10:00");
+ BOOST_CHECK_EQUAL(fmt(ts(20000), 0), "+5:33:20");
+ BOOST_CHECK_EQUAL(fmt(ts(25000), 0), "+6:56:40");
+
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 0), "+123:04:05:06");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 1), "+123:04:05:06.0");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 2), "+123:04:05:06.01");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 3), "+123:04:05:06.007");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 4), "+123:04:05:06.007 0");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 5), "+123:04:05:06.007 01");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 6), "+123:04:05:06.007 008");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 7), "+123:04:05:06.007 008 0");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 8), "+123:04:05:06.007 008 01");
+ BOOST_CHECK_EQUAL(fmt(ts("10641906.007008009"), 9), "+123:04:05:06.007 008 009");
+
+ BOOST_CHECK_EQUAL(format_time_minutes(ts( 0), 0, false), "0:00");
+ BOOST_CHECK_EQUAL(format_time_minutes(ts( 100), 0, false), "1:40");
+ BOOST_CHECK_EQUAL(format_time_minutes(ts(-100), 0, false), "-1:40");
}
BOOST_AUTO_TEST_SUITE_END()