summaryrefslogtreecommitdiff
path: root/test/libapt
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-08-27 13:58:14 +0200
committerJulian Andres Klode <jak@debian.org>2015-08-27 13:58:14 +0200
commitf19d6a77f60b876e5453614d24886aabdd242ef6 (patch)
tree4d9ed940810a874e5112f2d5b7d159bef2a0d9cc /test/libapt
parent848fd2a65fa2aef296d44c9a19b89ac272ca12fe (diff)
parent3564c2f4cfd9cbca6114da15c27f73efd08df78c (diff)
Merge branch 'feature/extractar-filefd' into debian/experimental
Diffstat (limited to 'test/libapt')
-rw-r--r--test/libapt/extracttar_test.cc41
-rw-r--r--test/libapt/makefile4
2 files changed, 43 insertions, 2 deletions
diff --git a/test/libapt/extracttar_test.cc b/test/libapt/extracttar_test.cc
new file mode 100644
index 000000000..b4e1fd37f
--- /dev/null
+++ b/test/libapt/extracttar_test.cc
@@ -0,0 +1,41 @@
+#include <apt-pkg/error.h>
+#include <apt-pkg/extracttar.h>
+#include <iostream>
+#include <stdlib.h>
+
+#include <gtest/gtest.h>
+#include "assert.h"
+
+class Stream : public pkgDirStream
+{
+ public:
+ int count;
+ Stream () { count = 0; }
+ virtual bool DoItem(Item &Itm,int &Fd) { (void)Itm; (void)Fd; count++; return true; }
+ virtual bool Fail(Item &Itm,int Fd) { (void)Itm; (void)Fd; return true; }
+ virtual bool FinishedFile(Item &Itm,int Fd) { (void)Itm; (void)Fd; return true; }
+ virtual bool Process(Item &Itm,const unsigned char * Data, unsigned long Size,unsigned long Pos) { (void)Itm; (void) Data; (void) Size; (void) Pos; return true; }
+ virtual ~Stream() {}
+};
+
+TEST(ExtractTar, ExtractTar)
+{
+ EXPECT_EQ(system("tar c makefile | gzip > tar.tgz"), 0);
+
+ FileFd fd("tar.tgz", FileFd::ReadOnly);
+ unlink("tar.tgz");
+ ExtractTar tar(fd, -1, "gzip");
+
+ // Run multiple times, because we want to check not only that extraction
+ // works, but also that it works multiple times (important for python-apt)
+ for (int i = 0; i < 5; i++) {
+ Stream stream;
+ fd.Seek(0);
+ tar.Go(stream);
+ if (_error->PendingError()) {
+ _error->DumpErrors();
+ EXPECT_FALSE(true);
+ }
+ EXPECT_EQ(stream.count, 1);
+ }
+}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index c078cc568..5ff9cf68a 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -15,8 +15,8 @@ test: $(BIN)/gtest$(BASENAME)
$(BIN)/gtest$(BASENAME): $(LIB)/gtest.a
PROGRAM = gtest${BASENAME}
-SLIBS = -lapt-pkg -lapt-private -pthread $(LIB)/gtest.a
-LIB_MAKES = apt-pkg/makefile apt-private/makefile
+SLIBS = -lapt-pkg -lapt-private -lapt-inst -pthread $(LIB)/gtest.a
+LIB_MAKES = apt-pkg/makefile apt-private/makefile apt-inst/makefile
SOURCE = gtest_runner.cc $(wildcard *-helpers.cc *_test.cc)
include $(PROGRAM_H)