fix vercmp bugs

[zpackage] / t / vercmp.t

diff --git a/t/vercmp.t b/t/vercmp.t
index a877c08e2824d3c8fb3dab79381c66454f4741ed..205f9502ec8f8f0c768c824c68d2a5167cca1cd2 100755 (executable)
--- a/t/vercmp.t
+++ b/t/vercmp.t
@@ -4,13 +4,29 @@
 
 . tap.sh
 
+# 17 vtests, 3 least, 3 greatest, 2 other, 3 temp handling
+# 17 * 6 + 3 + 3
+plan 111
+
+require rm -rf tmp
+require mkdir tmp
+
 vtest() {
        res=$(zpm-vercmp "$1" "$2")
        okstreq "$res" -1 "$1 < $2"
+
        res=$(zpm-vercmp "$2" "$1")
        okstreq "$res" 1 "$2 > $1"
+
        res=$(zpm-vercmp "$1" "$1")
        okstreq "$res" 0 "$1 == $1"
+
+       res=$(zpm shell vercmp.db "select '$1' < '$2' collate vercmp")
+       okstreq "$res" 1 "zpm shell $1 < $2"
+       res=$(zpm shell vercmp.db "select '$1' > '$2' collate vercmp")
+       okstreq "$res" 0 "zpm shell not $1 > $2"
+       res=$(zpm shell vercmp.db "select '$1' = '$1' collate vercmp")
+       okstreq "$res" 1 "zpm shell $1 = $1"
 }
 
 least() {
@@ -27,8 +43,6 @@ greatest() {
        okstreq "$g" "$want" "greatest $*"
 }
 
-plan 53
-
 least 1.0a 1.0a 1.0b
 least 1.0a 1.0b 1.0a
 greatest z a b z
@@ -36,11 +50,11 @@ greatest z a z b
 least abc abc
 greatest abc abc
  
-zpm vercmp -gq 'gnupg-1.0-1' "gnupg-2.0-1"
-exitwith 1 vercmp -g not gt
+#zpm vercmp -gq 'gnupg-1.0-1' "gnupg-2.0-1"
+#exitwith 1 vercmp -g not gt
 
-zpm vercmp -gq 'gnupg-2.0-1' "gnupg-1.0-1"
-exitwith 0 vercmp -g is gt
+#zpm vercmp -gq 'gnupg-2.0-1' "gnupg-1.0-1"
+#exitwith 0 vercmp -g is gt
 
 # alpha
 vtest 1.0a 1.0b
@@ -48,12 +62,14 @@ vtest 1.0b 1.0beta
 vtest 1.0beta 1.0p
 vtest 1.0p 1.0pre
 vtest 1.0pre 1.0rc
-vtest 1.0rc 1.0
+
+vtest 1.0 1.0rc
 vtest 1.0 1.0.a
 vtest 1.0.a 1.0.1
 
 vtest 1 1.0
 vtest 1.0 1.1
+
 vtest 1.1 1.1.1
 vtest 1.2 2.0
 vtest 2.0 3.0.0
@@ -62,4 +78,9 @@ vtest 2.0 3.0.0
 vtest 1.0-1 1.0-2
 vtest 1.0-2 2.0-1
 
+# full
+vtest ffmpeg-4.1-3 ffmpeg-4.1.1-1
+vtest 4.1-3 4.1.1-1
+
+require rm -rf tmp
 finish