various small additional tests and testcases

[apt.git] / test / integration / test-apt-mark

diff --git a/test/integration/test-apt-mark b/test/integration/test-apt-mark
index 69e0f933d1463e81e933263fc553137abdb8615a..0f62a12b41b010d016d41b3c5e471202adefe0ef 100755 (executable)
--- a/test/integration/test-apt-mark
+++ b/test/integration/test-apt-mark
@@ -20,21 +20,31 @@ testdpkginstalled dpkg
 
 testnoautopkg() {
        testempty aptmark showauto
+       testempty aptcache showauto
        testequal 'bar
 dpkg
 foo' aptmark showmanual
        testequal 'bar
 foo' aptmark showmanual bar foo uninstalled
 }
-testmarkonpkgasauto() {
-       testsuccess aptmark $1 foo
+testfooisauto() {
        testequal 'foo' aptmark showauto
+       testequal 'foo' aptcache showauto
        testequal 'foo' aptmark showauto foo
+       testequal 'foo' aptcache showauto foo
        testequal 'bar
 dpkg' aptmark showmanual
        testequal 'bar' aptmark showmanual bar
+}
+testmarkonpkgasauto() {
+       testsuccess $1 $2 foo
+       testfooisauto
+       testsuccess $1 $2 foo
+       testfooisauto
 
-       testsuccess aptmark $2 foo
+       testsuccess $1 $3 foo
+       testnoautopkg
+       testsuccess $1 $3 foo
        testnoautopkg
 }
 
@@ -42,8 +52,9 @@ testequal 'E: No packages found' aptmark auto
 testequal 'E: No packages found' aptmark manual
 
 testnoautopkg
-testmarkonpkgasauto 'auto' 'manual'
-testmarkonpkgasauto 'markauto' 'unmarkauto'
+testmarkonpkgasauto 'aptmark' 'auto' 'manual'
+testmarkonpkgasauto 'aptmark' 'markauto' 'unmarkauto'
+testmarkonpkgasauto 'aptget' 'markauto' 'unmarkauto'
 
 testnoholdpkg() {
        testempty aptmark showhold
@@ -51,10 +62,19 @@ testnoholdpkg() {
        testempty aptmark showhold dpkg
        testempty aptmark showholds dpkg
 }
-testmarkonepkgashold() {
-       testsuccess aptmark hold $1
+testpkgonhold() {
        testequal "$1" aptmark showhold
        testequal "$1" aptmark showholds
+       testequal "$1" aptmark showhold $1
+       testequal "$1" aptmark showholds $1
+}
+testmarkonepkgashold() {
+       testsuccess aptmark hold $1
+       testpkgonhold $1
+       testsuccess aptmark hold $1
+       testpkgonhold $1
+       testsuccess aptmark unhold $1
+       testnoholdpkg
        testsuccess aptmark unhold $1
        testnoholdpkg
 }