bunch of micro-optimizations for depcache

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

diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index f47c0e08b98318c61d2eae41b092db6b7e813058..7da2ab71ffd56c9351383f29985d45a6d4712d8f 100755 (executable)
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -42,62 +42,62 @@ testsuccess aptcache dump
 cp rootdir/tmp/testsuccess.output dump.output
 testsuccess test -s dump.output
 
-testequal 'dpkg
+testsuccessequal 'dpkg
 bar
 fancy
 foo' aptcache pkgnames
-testequal 'bar' aptcache pkgnames bar
-testequal 'fancy
+testsuccessequal 'bar' aptcache pkgnames bar
+testsuccessequal 'fancy
 foo' aptcache pkgnames f
 
-testequal "       foo |          1 | file:$(readlink -f .)/aptarchive/ unstable/main amd64 Packages" aptcache madison foo
+testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main amd64 Packages" aptcache madison foo
 
 ### depends
 
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
- |Recommends: <cool>
-  Recommends: <cooler>
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo
-testequal 'foo
+  Conflicts: <foobar:i386>
+ |Recommends: <cool>
+  Recommends: <cooler>' aptcache depends foo
+testsuccessequal 'foo
   Depends: bar
-  Recommends: <cool>
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
-testequal 'foo
+  Conflicts: <foobar:i386>
+  Recommends: <cool>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
+testsuccessequal 'foo
   Depends: bar
- |Recommends: <cool> (>= 2)
-  Recommends: <cooler> (<< 5)
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowVersion=1
-testequal 'foo
+  Conflicts: <foobar:i386>
+ |Recommends: <cool> (>= 2)
+  Recommends: <cooler> (<< 5)' aptcache depends foo -o APT::Cache::ShowVersion=1
+testsuccessequal 'foo
   Depends: bar
   Conflicts: <foobar>
   Conflicts: <foobar:i386>' aptcache depends foo --no-recommends
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar' aptcache depends foo --important
-testequal 'foo
+testsuccessequal 'foo
   Conflicts: <foobar>
   Conflicts: <foobar:i386>' aptcache depends foo --important --no-depends --conflicts
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
- |Recommends: <cool>
-  Recommends: <cooler>
   Conflicts: <foobar>
   Conflicts: <foobar:i386>
+ |Recommends: <cool>
+  Recommends: <cooler>
 bar
   Depends: bar
   Breaks: foo
   Breaks: <foo:i386>
   Replaces: foo
   Replaces: <foo:i386>
-<cool>
-<cooler>
 <foobar>
 <foobar:i386>
+<cool>
+<cooler>
 <foo:i386>' aptcache depends foo --recurse
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
 bar
   Depends: bar
@@ -107,18 +107,18 @@ bar
 
 ## rdpends
 
-testequal 'foo
+testsuccessequal 'foo
 Reverse Depends:
   bar
   bar' aptcache rdepends foo
-testequal 'foo
+testsuccessequal 'foo
 Reverse Depends:
   Replaces: bar
   Breaks: bar' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1
-testequal 'foo
+testsuccessequal 'foo
 Reverse Depends:
   Replaces: bar (<< 1)
   Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1
-testequal 'foo
+testsuccessequal 'foo
 Reverse Depends:
   Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1 --important --breaks