From 98412c72a1233dda15a74fd2fe2099f5fd40e37e Mon Sep 17 00:00:00 2001 From: Guilherme Maciel Ferreira Date: Tue, 1 Feb 2011 11:21:59 +0100 Subject: [PATCH] Replaced format_kb() by nice_unit_format() in the test cases - 3rd step to merge nice_unit_format() and format_kb() --- test/stringfunc.cpp | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/test/stringfunc.cpp b/test/stringfunc.cpp index b792f2c..3fcbeab 100644 --- a/test/stringfunc.cpp +++ b/test/stringfunc.cpp @@ -114,8 +114,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format1) string output = nice_unit_format(two_bytes); BOOST_CHECK_EQUAL(string("2.00 Bytes"), output); -// output = nice_unit_format(two_bytes, US_IEC, SHORT); - output = format_kb(two_bytes); + output = nice_unit_format(two_bytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.0 B"), output); } @@ -126,8 +125,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format2) string output = nice_unit_format(two_kilobytes); BOOST_CHECK_EQUAL(string("2.00 KBytes"), output); - // output = nice_unit_format(two_kilobytes, US_IEC); - output = format_kb(two_kilobytes); + output = nice_unit_format(two_kilobytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.0 KB"), output); const int64_t two_and_half_kilobytes = 2500; @@ -135,8 +133,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format2) output = nice_unit_format(two_and_half_kilobytes); BOOST_CHECK_EQUAL(string("2.50 KBytes"), output); - // output = nice_unit_format(two_and_half_kilobytes, US_IEC); - output = format_kb(two_and_half_kilobytes); + output = nice_unit_format(two_and_half_kilobytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.4 KB"), output); } @@ -147,7 +144,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format3) string output = nice_unit_format(two_megabytes); BOOST_CHECK_EQUAL(string("2.00 MBytes"), output); - output = format_kb(two_megabytes); + output = nice_unit_format(two_megabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("1.9 MB"), output); const int64_t two_and_half_megabytes = 2500000; @@ -155,7 +152,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format3) output = nice_unit_format(two_and_half_megabytes); BOOST_CHECK_EQUAL(string("2.50 MBytes"), output); - output = format_kb(two_and_half_megabytes); + output = nice_unit_format(two_and_half_megabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.4 MB"), output); } @@ -167,7 +164,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format4) string output = nice_unit_format(two_gigabytes); BOOST_CHECK_EQUAL(string("2.00 GBytes"), output); - output = format_kb(two_gigabytes); + output = nice_unit_format(two_gigabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("1.9 GB"), output); const int64_t two_and_half_gigabytes = 2500000000LL; @@ -175,7 +172,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format4) output = nice_unit_format(two_and_half_gigabytes); BOOST_CHECK_EQUAL(string("2.50 GBytes"), output); - output = format_kb(two_and_half_gigabytes); + output = nice_unit_format(two_and_half_gigabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.3 GB"), output); } @@ -186,7 +183,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format5) string output = nice_unit_format(two_terabytes); BOOST_CHECK_EQUAL(string("2.00 TBytes"), output); - output = format_kb(two_terabytes); + output = nice_unit_format(two_terabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("1.8 TB"), output); const int64_t two_and_half_terabytes = 2500000000000LL; @@ -194,7 +191,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format5) output = nice_unit_format(two_and_half_terabytes); BOOST_CHECK_EQUAL(string("2.50 TBytes"), output); - output = format_kb(two_and_half_terabytes); + output = nice_unit_format(two_and_half_terabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.3 TB"), output); } @@ -205,7 +202,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format6) string output = nice_unit_format(two_petabytes); BOOST_CHECK_EQUAL(string("2.00 PBytes"), output); - output = format_kb(two_petabytes); + output = nice_unit_format(two_petabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("1.8 PB"), output); const int64_t two_and_half_petabytes = 2500000000000000LL; @@ -213,7 +210,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format6) output = nice_unit_format(two_and_half_petabytes); BOOST_CHECK_EQUAL(string("2.50 PBytes"), output); - output = format_kb(two_and_half_petabytes); + output = nice_unit_format(two_and_half_petabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.2 PB"), output); } @@ -224,7 +221,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format7) string output = nice_unit_format(two_exabytes); BOOST_CHECK_EQUAL(string("2.00 EBytes"), output); - output = format_kb(two_exabytes); + output = nice_unit_format(two_exabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("1.7 EB"), output); const int64_t two_and_half_exabytes = 2500000000000000000LL; @@ -232,7 +229,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format7) output = nice_unit_format(two_and_half_exabytes); BOOST_CHECK_EQUAL(string("2.50 EBytes"), output); - output = format_kb(two_and_half_exabytes); + output = nice_unit_format(two_and_half_exabytes, US_IEC, USF_SHORT); BOOST_CHECK_EQUAL(string("2.2 EB"), output); } -- 1.7.1