Merge pull request #19 from HRio/unit

apk: add some unit tests, called via "make check"

Author: liske

apk/Makefile

@@ -1,5 +1,8 @@
 clean:
 
+check:
+	./test-apt-dater-host
+
 install:
 	install -D -m0755 apt-dater-host \
 		$(DESTDIR)/usr/bin/apt-dater-host

apk/apt-dater-host

@@ -10,7 +10,7 @@
 #   Henrik Riomar <[email protected]>
 #
 # Copyright Holder:
-#   2016 (C) Henrik Riomar
+#   2016, 2017 (C) Henrik Riomar
 #
 # License:
 #   This program is free software; you can redistribute it and/or modify
@@ -52,7 +52,7 @@ get_prl()
 # check if a pkg is held back
 is_held()
 {
-	grep -E -q ^$1\= /etc/apk/world
+	grep -E -q -e ^$1\= -e ^$1\< /etc/apk/world
 }
 
 # check if $1 > $2
@@ -71,7 +71,7 @@ get_pkg_stat()
 	$APK_CMD info | while read -r pkg
 	do
 		line=$(grep -E "^${pkg}-[0-9]" $tmp)
-		new_ver=$(echo $line | awk '{print $NF}')
+		new_ver=$(echo $line | sed 's/ @.\+$//' | awk '{print $NF}')
 		cur_ver=$(echo $line | awk '{print $1}' | sed "s/$pkg-//")
 		if [ x"$new_ver" = x"$cur_ver" ]; then
 			echo "STATUS: $pkg|$cur_ver|i"
@@ -212,6 +212,10 @@ case "$1" in
 		get_kern
 		;;
 
+	source-only)
+		# do nothing (used for unit testing)
+		;;
+
 	*)
 		echo Invalid command \'$1\'\!
 		exit $err

apk/test-apt-dater-host

@@ -0,0 +1,36 @@
+#!/usr/bin/env bats
+
+source ./apt-dater-host source-only
+
+check_tag()
+{
+	TAG=$1
+	STR=$2
+	[ $(echo $STR | grep -E -v -c "^$TAG:") -eq 0 ]
+}
+
+@test "say_hi()" {
+	result="$(say_hi)"
+	check_tag ADPROTO $result
+	[ "$result" = "ADPROTO: 0.6" ]
+}
+
+@test "get_lsbrel()" {
+	result="$(get_lsbrel)"
+	check_tag LSBREL $result
+}
+
+@test "get_pkg_stat()" {
+	result="$(get_pkg_stat)"
+	check_tag STATUS $result
+}
+
+@test "get_virt()" {
+	result="$(get_virt)"
+	check_tag VIRT $result
+}
+
+@test "get_kern()" {
+	result="$(get_kern)"
+	check_tag KERNELINFO $result
+}