Rename demo_human_readable.c->demo_number.c and have it do atolx() too.

2 files changed, 27 insertions, 19 deletions

diff --git a/tests/demo_number.test b/tests/demo_number.test
new file mode 100755
index 00000000..0d86476f
--- /dev/null
+++ b/tests/demo_number.test
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+[ -f testing.sh ] && . testing.sh
+
+#testing "name" "command" "result" "infile" "stdin"
+
+testcmd "l 1024" "-h 123456789" "118M\n" "" ""
+testcmd "l 1000" "-d 123456789" "123M\n" "" ""
+testcmd "s 1024" "-h 5675" "5.5K\n" "" ""
+testcmd "s 1000" "-d 5675" "5.6k\n" "" ""
+
+# An example input where we give a better result than coreutils.
+# 267350/1024=261.08. We say 261K and coreutils says 262K.
+testcmd "edge case" "-h 267350" "261K\n" "" ""
+
+testcmd "-b" "-b 123" "123B\n" "" ""
+testcmd "-b" "-b 123456789" "118M\n" "" ""
+testcmd "-s" "-s 123456789" "118 M\n" "" ""
+testcmd "-bs" "-bs 123456789" "118 M\n" "" ""
+
+testcmd "units" "-b 1c 1b 1k 1kd 1m 1md 1g 1gd 1t 1td 1e 1ed" \
+  "1B\n512B\n1.0K\n0.9K\n1.0M\n977K\n1.0G\n954M\n1.0T\n931G\n1.0E\n888P\n" \
+  "" ""
+
+testcmd "decimal units" "-d 1c 1b 1k 1kd 1m 1md 1g 1gd 1t 1td 1e 1ed" \
+  "1\n512\n1.0k\n1.0k\n1.0M\n1.0M\n1.0G\n1.0G\n1.1T\n1.0T\n1.1E\n1.0E\n" \
+  "" ""
diff --git a/tests/test_human_readable.test b/tests/test_human_readable.test
deleted file mode 100755
index 0f1bfb7a..00000000
--- a/tests/test_human_readable.test
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-[ -f testing.sh ] && . testing.sh
-
-#testing "name" "command" "result" "infile" "stdin"
-
-testing "l 1024" "test_human_readable 123456789" "118M\n" "" ""
-testing "l 1000" "test_human_readable -i 123456789" "123M\n" "" ""
-testing "s 1024" "test_human_readable 5675" "5.5K\n" "" ""
-testing "s 1000" "test_human_readable -i 5675" "5.6k\n" "" ""
-
-# An example input where we give a better result than coreutils.
-# 267350/1024=261.08. We say 261K and coreutils says 262K.
-testing "test_human_readable" "test_human_readable 267350" "261K\n" "" ""
-
-testing "-b" "test_human_readable -b 123" "123B\n" "" ""
-testing "-b" "test_human_readable -b 123456789" "118M\n" "" ""
-testing "-s" "test_human_readable -s 123456789" "118 M\n" "" ""
-testing "-bs" "test_human_readable -bs 123456789" "118 M\n" "" ""