Created test cases for format_kb()

- 2nd step to merge nice_unit_format() and format_kb()

diff --git a/test/stringfunc.cpp b/test/stringfunc.cpp
index 9c61423..b792f2c 100644 (file)
--- a/test/stringfunc.cpp
+++ b/test/stringfunc.cpp
@@ -85,6 +85,8 @@ BOOST_AUTO_TEST_CASE(strip_html_tags2)
     BOOST_CHECK_EQUAL(string("Was für ein schöner Tag, finden Sie nicht?"), output);
 }
 
+
+
 BOOST_AUTO_TEST_CASE(html_entities1)
 {
     string output = html_entities("\xC3\xA4\xC3\xB6\xC3\xBC");
@@ -103,79 +105,139 @@ BOOST_AUTO_TEST_CASE(html_entities3)
     BOOST_CHECK_EQUAL(string("Ď ༱ 肈"), output);
 }
 
+
+
 BOOST_AUTO_TEST_CASE(nice_unit_format1)
 {
     const int64_t two_bytes = 2;
+
     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);
+    BOOST_CHECK_EQUAL(string("2.0 B"), output);
 }
 
 BOOST_AUTO_TEST_CASE(nice_unit_format2)
 {
     const int64_t two_kilobytes = 2000;
+
     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);
+    BOOST_CHECK_EQUAL(string("2.0 KB"), output);
+
     const int64_t two_and_half_kilobytes = 2500;
+
     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);
+    BOOST_CHECK_EQUAL(string("2.4 KB"), output);
 }
 
 BOOST_AUTO_TEST_CASE(nice_unit_format3)
 {
     const int64_t two_megabytes = 2000000;
+
     string output = nice_unit_format(two_megabytes);
     BOOST_CHECK_EQUAL(string("2.00 MBytes"), output);
 
+    output = format_kb(two_megabytes);
+    BOOST_CHECK_EQUAL(string("1.9 MB"), output);
+
     const int64_t two_and_half_megabytes = 2500000;
+
     output = nice_unit_format(two_and_half_megabytes);
     BOOST_CHECK_EQUAL(string("2.50 MBytes"), output);
+
+    output = format_kb(two_and_half_megabytes);
+    BOOST_CHECK_EQUAL(string("2.4 MB"), output);
+
 }
 
 BOOST_AUTO_TEST_CASE(nice_unit_format4)
 {
     const int64_t two_gigabytes = 2000000000LL;
+
     string output = nice_unit_format(two_gigabytes);
     BOOST_CHECK_EQUAL(string("2.00 GBytes"), output);
 
+    output = format_kb(two_gigabytes);
+    BOOST_CHECK_EQUAL(string("1.9 GB"), output);
+
     const int64_t two_and_half_gigabytes = 2500000000LL;
+
     output = nice_unit_format(two_and_half_gigabytes);
     BOOST_CHECK_EQUAL(string("2.50 GBytes"), output);
+
+    output = format_kb(two_and_half_gigabytes);
+    BOOST_CHECK_EQUAL(string("2.3 GB"), output);
 }
 
 BOOST_AUTO_TEST_CASE(nice_unit_format5)
 {
     const int64_t two_terabytes = 2000000000000LL;
+
     string output = nice_unit_format(two_terabytes);
     BOOST_CHECK_EQUAL(string("2.00 TBytes"), output);
 
+    output = format_kb(two_terabytes);
+    BOOST_CHECK_EQUAL(string("1.8 TB"), output);
+
     const int64_t two_and_half_terabytes = 2500000000000LL;
+
     output = nice_unit_format(two_and_half_terabytes);
     BOOST_CHECK_EQUAL(string("2.50 TBytes"), output);
+
+    output = format_kb(two_and_half_terabytes);
+    BOOST_CHECK_EQUAL(string("2.3 TB"), output);
 }
 
 BOOST_AUTO_TEST_CASE(nice_unit_format6)
 {
     const int64_t two_petabytes = 2000000000000000LL;
+
     string output = nice_unit_format(two_petabytes);
     BOOST_CHECK_EQUAL(string("2.00 PBytes"), output);
 
+    output = format_kb(two_petabytes);
+    BOOST_CHECK_EQUAL(string("1.8 PB"), output);
+
     const int64_t two_and_half_petabytes = 2500000000000000LL;
+
     output = nice_unit_format(two_and_half_petabytes);
     BOOST_CHECK_EQUAL(string("2.50 PBytes"), output);
+
+    output = format_kb(two_and_half_petabytes);
+    BOOST_CHECK_EQUAL(string("2.2 PB"), output);
 }
 
 BOOST_AUTO_TEST_CASE(nice_unit_format7)
 {
     const int64_t two_exabytes = 2000000000000000000LL;
+
     string output = nice_unit_format(two_exabytes);
     BOOST_CHECK_EQUAL(string("2.00 EBytes"), output);
 
+    output = format_kb(two_exabytes);
+    BOOST_CHECK_EQUAL(string("1.7 EB"), output);
+
     const int64_t two_and_half_exabytes = 2500000000000000000LL;
+
     output = nice_unit_format(two_and_half_exabytes);
     BOOST_CHECK_EQUAL(string("2.50 EBytes"), output);
+
+    output = format_kb(two_and_half_exabytes);
+    BOOST_CHECK_EQUAL(string("2.2 EB"), output);
 }
 
+
+
 BOOST_AUTO_TEST_CASE(imaputf7_to_utf8)
 {
     string output = utf7imap_to_utf8("Sp&AOQ-m");