Removed ShortUnitFormat and UnitBase1024 from nice_unit_format() calls, as they are...

diff --git a/test/stringfunc.cpp b/test/stringfunc.cpp
index b40f7e7..749db12 100644 (file)
--- a/test/stringfunc.cpp
+++ b/test/stringfunc.cpp
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format1)
     string output = nice_unit_format(two_bytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 Bytes"), output);
 
-    output = nice_unit_format(two_bytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_bytes);
     BOOST_CHECK_EQUAL(string("2.0 B"), output);
 }
 
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format2)
     string output = nice_unit_format(two_kilobytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 KBytes"), output);
 
-    output = nice_unit_format(two_kilobytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_kilobytes);
     BOOST_CHECK_EQUAL(string("2.0 KB"), output);
 
     const int64_t two_and_half_kilobytes = 2500;
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format2)
     output = nice_unit_format(two_and_half_kilobytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 KBytes"), output);
 
-    output = nice_unit_format(two_and_half_kilobytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_and_half_kilobytes);
     BOOST_CHECK_EQUAL(string("2.4 KB"), output);
 }
 
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format3)
     string output = nice_unit_format(two_megabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 MBytes"), output);
 
-    output = nice_unit_format(two_megabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_megabytes);
     BOOST_CHECK_EQUAL(string("1.9 MB"), output);
 
     const int64_t two_and_half_megabytes = 2500000;
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format3)
     output = nice_unit_format(two_and_half_megabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 MBytes"), output);
 
-    output = nice_unit_format(two_and_half_megabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_and_half_megabytes);
     BOOST_CHECK_EQUAL(string("2.4 MB"), output);
 
 }
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format4)
     string output = nice_unit_format(two_gigabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 GBytes"), output);
 
-    output = nice_unit_format(two_gigabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_gigabytes);
     BOOST_CHECK_EQUAL(string("1.9 GB"), output);
 
     const int64_t two_and_half_gigabytes = 2500000000LL;
@@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format4)
     output = nice_unit_format(two_and_half_gigabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 GBytes"), output);
 
-    output = nice_unit_format(two_and_half_gigabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_and_half_gigabytes);
     BOOST_CHECK_EQUAL(string("2.3 GB"), output);
 }
 
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format5)
     string output = nice_unit_format(two_terabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 TBytes"), output);
 
-    output = nice_unit_format(two_terabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_terabytes);
     BOOST_CHECK_EQUAL(string("1.8 TB"), output);
 
     const int64_t two_and_half_terabytes = 2500000000000LL;
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format5)
     output = nice_unit_format(two_and_half_terabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 TBytes"), output);
 
-    output = nice_unit_format(two_and_half_terabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_and_half_terabytes);
     BOOST_CHECK_EQUAL(string("2.3 TB"), output);
 }
 
@@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format6)
     string output = nice_unit_format(two_petabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 PBytes"), output);
 
-    output = nice_unit_format(two_petabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_petabytes);
     BOOST_CHECK_EQUAL(string("1.8 PB"), output);
 
     const int64_t two_and_half_petabytes = 2500000000000000LL;
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format6)
     output = nice_unit_format(two_and_half_petabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 PBytes"), output);
 
-    output = nice_unit_format(two_and_half_petabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_and_half_petabytes);
     BOOST_CHECK_EQUAL(string("2.2 PB"), output);
 }
 
@@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format7)
     string output = nice_unit_format(two_exabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2000.00 PBytes"), output);
 
-    output = nice_unit_format(two_exabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_exabytes);
     BOOST_CHECK_EQUAL(string("1776.4 PB"), output);
 
     const int64_t two_and_half_exabytes = 2500000000000000000LL;
@@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format7)
     output = nice_unit_format(two_and_half_exabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2500.00 PBytes"), output);
 
-    output = nice_unit_format(two_and_half_exabytes, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(two_and_half_exabytes);
     BOOST_CHECK_EQUAL(string("2220.4 PB"), output);
 }
 
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(nice_unit_format8)
     string output = nice_unit_format(max_representable_64bits_number, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("9223.40 PBytes"), output);
 
-    output = nice_unit_format(max_representable_64bits_number, ShortUnitFormat, UnitBase1024);
+    output = nice_unit_format(max_representable_64bits_number);
     BOOST_CHECK_EQUAL(string("8192.0 PB"), output);
 }