From fd23676e809b7fa87ae138cc22d2c683d212950e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 13 Jul 2015 12:47:05 +0200
Subject: bunch of micro-optimizations for depcache

DepCache functions are called a lot, so if we can squeeze some drops out
of them for free we should do so. Takes also the opportunity to remove
some whitespace errors from these functions.

Git-Dch: Ignore
---
 test/integration/test-apt-cache                    | 24 +++++++++++-----------
 .../test-apt-showlist-orgroup-in-recommends        |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index 97dc0f939..7da2ab71f 100755
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -56,21 +56,21 @@ testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive uns
 
 testsuccessequal 'foo
   Depends: bar
- |Recommends: <cool>
-  Recommends: <cooler>
   Conflicts: <foobar>
-  Conflicts: <foobar:i386>' aptcache depends 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
+  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
+  Conflicts: <foobar:i386>
+ |Recommends: <cool> (>= 2)
+  Recommends: <cooler> (<< 5)' aptcache depends foo -o APT::Cache::ShowVersion=1
 testsuccessequal 'foo
   Depends: bar
   Conflicts: <foobar>
@@ -82,20 +82,20 @@ testsuccessequal 'foo
   Conflicts: <foobar:i386>' aptcache depends foo --important --no-depends --conflicts
 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
 testsuccessequal 'foo
   Depends: bar
diff --git a/test/integration/test-apt-showlist-orgroup-in-recommends b/test/integration/test-apt-showlist-orgroup-in-recommends
index bce421ac4..929f7feb9 100755
--- a/test/integration/test-apt-showlist-orgroup-in-recommends
+++ b/test/integration/test-apt-showlist-orgroup-in-recommends
@@ -13,7 +13,7 @@ insertinstalledpackage 'ddd' 'all' '1'
 insertpackage 'unstable' 'aaa' 'all' '1'
 insertpackage 'unstable' 'ddd' 'all' '1'
 insertpackage 'unstable' 'yyy' 'all' '1'
-insertpackage 'unstable' 'zzz' 'all' '1'
+insertpackage 'unstable' 'zzz' 'all' '1:1'
 insertpackage 'unstable' 'simple' 'all' '1' 'Recommends: aaa, bbb
 Suggests: ccc, ddd'
 insertpackage 'unstable' 'orgroup' 'all' '1' 'Recommends: aaa | bbb
-- 
cgit v1.2.3-70-g09d2