Add test for using ExtractTar on compressed files

Git-Dch: ignore

diff --git a/test/libapt/extracttar_test.cc b/test/libapt/extracttar_test.cc
new file mode 100644 (file)
index 0000000..b4e1fd3
--- /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 c078cc568e487635bbc1c8656bbf020d5bd6e662..5ff9cf68a2a1d4e617d8fa7f7a22e00164ab6de2 100644 (file)
--- 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)