[gentoo-commits] proj/udev-gentoo-scripts:master commit in: /, test/

[Matthias Schwarzott]

commit:     07aaa67d8fb33731ef8fbe1020cbb67f19968812
Author:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 11:43:54 2011 +0000
Commit:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 13:47:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=07aaa67d

Use shtest2 for testing

Improve testcases a bit

---
 Makefile               |    3 +-
 test-kv.sh             |   55 --------------------------------
 test/test_KV_to_int.sh |   81 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/Makefile b/Makefile
index 802c764..d308682 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,7 @@ check-git-repository:
 	git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; }
 
 test:
-	@echo "Running tests"
-	@./test-kv.sh
+	@cd test; ./run_test.sh
 
 dist: check-git-repository test
 	git archive --format=tar --prefix=$(DESTNAME)/ HEAD | bzip2 > $(DESTNAME).tar.bz2

diff --git a/test-kv.sh b/test-kv.sh
deleted file mode 100755
index e58064f..0000000
--- a/test-kv.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-source helpers/shell-compat-KV.sh
-
-errcnt=0
-
-test_kv()
-{
-	local input="$1" actual= expected="$2"
-	actual=$(KV_to_int "$input" 2>/dev/null)
-	if [[ "$actual" = "$expected" ]]; then
-		echo "ok: KV_to_int $input"
-	else
-		echo "fail: KV_to_int input=$input, expected=$expected, actual=$actual"
-		errcnt=$(($errcnt+1))
-	fi
-}
-
-echo "Testing KV_to_int"
-
-# two digit ones
-test_kv 2.6	132608
-test_kv 3.0	196608
-test_kv 3.1	196864
-
-# normal three digit numbers
-test_kv 2.6.0	132608
-test_kv 2.6.1	132609
-test_kv 2.6.2	132610
-test_kv 2.6.35	132643
-test_kv 3.0.1	196609
-
-# four digit numbers
-test_kv 2.6.35.1	132643
-test_kv 2.6.35.995	132643
-
-# with suffix
-test_kv 2.6.35+1suf	132643
-test_kv 2.6.35-2suf	132643
-test_kv 2.6.35%3suf	132643
-test_kv 2.6.35x4suf	132643
-
-test_kv 3.0+1suf	196608
-test_kv 3.0-2suf	196608
-test_kv 3.0%3suf	196608
-test_kv 3.0x4suf	196608
-
-if [[ "$errcnt" = 0 ]]; then
-	echo "Test success"
-	exit 0
-else
-	echo "Tests failed: $errcnt"
-	exit 1
-fi
-

diff --git a/test/test_KV_to_int.sh b/test/test_KV_to_int.sh
new file mode 100755
index 0000000..917f243
--- /dev/null
+++ b/test/test_KV_to_int.sh
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+oneTimeSetUp()
+{
+	unset -f KV_to_int
+	. ../helpers/shell-compat-KV.sh
+}
+
+check_kv()
+{
+	local input="$1" actual= expected="$2"
+	actual=$(KV_to_int "$input" 2>/dev/null)
+	assertEquals "$?" "0"
+	assertEquals "$expected" "$actual"
+}
+
+expect_fail_kv()
+{
+	local input="$1" actual=
+	actual=$(KV_to_int "$input" 2>&1)
+	assertEquals "$?" "1"
+	assertEquals "" "$actual"
+}
+
+testTooOld()
+{
+	expect_fail_kv 2.1.0
+	expect_fail_kv 2.1.1
+	expect_fail_kv 2.1.2
+}
+
+testOneDigit()
+{
+	check_kv 3	196608
+}
+
+testTwoDigit()
+{
+	check_kv 2.6	132608
+	check_kv 3.0	196608
+	check_kv 3.1	196864
+}
+
+testThreeDigit()
+{
+	check_kv 2.6.0	132608
+	check_kv 2.6.1	132609
+	check_kv 2.6.2	132610
+	check_kv 2.6.35	132643
+	check_kv 3.0.1	196609
+}
+
+testFourDigit()
+{
+	check_kv 2.6.35.1	132643
+	check_kv 2.6.35.995	132643
+}
+
+testSuffixNormal()
+{
+	check_kv 2.6.35-2suf	132643
+	check_kv 3.0-2suf	196608
+}
+
+testSuffixSpecial()
+{
+	check_kv 2.6.35.1+1suf	132643
+	check_kv 2.6.35.1%3suf	132643
+	check_kv 2.6.35.1x4suf	132643
+
+	check_kv 2.6.35+1suf	132643
+	check_kv 2.6.35%3suf	132643
+	check_kv 2.6.35x4suf	132643
+
+	check_kv 3.0+1suf	196608
+	check_kv 3.0%3suf	196608
+	check_kv 3.0x4suf	196608
+}
+
+. ./shunit2
+