From 1bef0dd58a281ca2f2900a48459d2c87b4ba8bba Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Wed, 22 Jan 2014 08:25:02 +0100
Subject: [PATCH] add integration test for apt search

---
 apt-private/private-search.cc                 |  2 +-
 .../{test-apt-binary => test-apt-cli-list}    |  0
 test/integration/test-apt-cli-search          | 45 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 rename test/integration/{test-apt-binary => test-apt-cli-list} (100%)
 create mode 100755 test/integration/test-apt-cli-search

diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index ff4140fa7..9d7f36138 100644
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -53,7 +53,7 @@ bool FullTextSearch(CommandLine &CmdL)					/*{{{*/
    std::map<std::string, std::string>::const_iterator K;
 
    LocalitySortedVersionSet bag;
-   OpTextProgress progress;
+   OpTextProgress progress(*_config);
    progress.OverallProgress(0, 100, 50,  _("Sorting"));
    GetLocalitySortedVersionSet(CacheFile, bag, progress);
    LocalitySortedVersionSet::iterator V = bag.begin();
diff --git a/test/integration/test-apt-binary b/test/integration/test-apt-cli-list
similarity index 100%
rename from test/integration/test-apt-binary
rename to test/integration/test-apt-cli-list
diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search
new file mode 100755
index 000000000..aa6018bca
--- /dev/null
+++ b/test/integration/test-apt-cli-search
@@ -0,0 +1,45 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "i386"
+
+DESCR='Some description that has a unusual word xxyyzz and aabbcc'
+DESCR2='Some other description with the unusual aabbcc only'
+insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"
+insertpackage 'testing' 'bar' 'i386' '2.0' '' '' "$DESCR2"
+
+setupaptarchive
+
+APTARCHIVE=$(readlink -f ./aptarchive)
+
+# with OP progress 
+testequal "Sorting...
+Full Text Search...
+foo/unstable 1.0 all
+  $DESCR
+" apt search xxyyzz
+
+# without op progress
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq xxyyzz
+
+# search with multiple words is a AND search
+testequal "foo/unstable 1.0 all
+  $DESCR
+" apt search -qq aabbcc xxyyzz
+
+# output is sorted and search word finds both package
+testequal "bar/testing 2.0 i386
+  $DESCR2
+
+foo/unstable 1.0 all
+  $DESCR
+" apt search -qq aabbcc
+
+
+
-- 
2.45.2