Try to make the ziptest a bit more generic

Change-Id: I2a380ebcc2b32fbb8e1c0ae6b83b5f34291e5d1d

6 files changed, 21 insertions, 133 deletions

diff --git a/shell/CppunitTest_shell_zip.mk b/shell/CppunitTest_shell_zip.mk
index 52f6d72d9e09..7e5d6dc6a0ba 100644
--- a/shell/CppunitTest_shell_zip.mk
+++ b/shell/CppunitTest_shell_zip.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,zip))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,zip, \
-    shell/qa/zip/testimpl/testzipimpl \
+    shell/qa/zip/testzipimpl \
     shell/qa/zip/ziptest \
 ))
 
@@ -26,14 +26,8 @@ $(eval $(call gb_CppunitTest_use_externals,zip,\
 ))
 
 $(eval $(call gb_CppunitTest_use_system_win32_libs,zip, \
-	advapi32 \
-	comctl32 \
 	kernel32 \
 	msvcprt \
-	oldnames \
-	ole32 \
-	shell32 \
-	uuid \
 ))
 
 $(eval $(call gb_CppunitTest_use_static_libraries,zip,\
diff --git a/shell/qa/zip/makefile.mk b/shell/qa/zip/makefile.mk
deleted file mode 100644
index 4039b918bab6..000000000000
--- a/shell/qa/zip/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-
-PRJ=../..
-
-PRJNAME=shell
-TARGET=qa_zip
-ENABLE_EXCEPTIONS=TRUE
-#USE_STLP_DEBUG= 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
-
-@all:
-.IF "$(GUI)" == "OS2"
-	@echo "Skipping, cppunit broken."
-.ELIF "$(WITH_CPPUNIT)" != "YES"
-	@echo "cppunit disabled. nothing do do."
-.END
-
-.ELSE
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = NONE
-SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)  
-SHL1LIBS = $(SLB)$/..$/lib$/iqa_zipimpl.lib
-SHL1TARGET = $(TARGET)
-SHL1VERSIONMAP = $(PRJ)/qa/zip/export.map
-DEF1NAME=$(SHL1TARGET)
-SLOFILES=$(SLO)$/ziptest.obj  
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE: _cppunit.mk
-
diff --git a/shell/qa/zip/testimpl/makefile.mk b/shell/qa/zip/testimpl/makefile.mk
deleted file mode 100644
index cf07233b20dd..000000000000
--- a/shell/qa/zip/testimpl/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-
-PRJ=../../..
-
-PRJNAME=shell
-TARGET=qa_zipimpl
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-.IF "$(OS)" == "WNT"
-	NO_DEFAULT_STL=TRUE
-	USE_STLP_DEBUG=
-.ENDIF
-USE_DEFFILE=TRUE
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-UWINAPILIB =
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = NONE
-.IF "$(OS)" == "WNT"
-	SHL1STDLIBS = msvcprt.lib 
-.ENDIF
-SHL1LIBS = $(SOLARLIBDIR)$/zlib.lib $(SLB)$/zipfile.lib   
-SLOFILES=$(SLO)$/testzipimpl.obj
-SHL1TARGET = $(TARGET)
-DEF1NAME=$(SHL1TARGET)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.IF "$(OS)" == "WNT"
-	INCLUDE!:=$(subst,/stl, $(INCLUDE))
-	.EXPORT : INCLUDE 
-.ENDIF
-
diff --git a/shell/qa/zip/testimpl/testzipimpl.cxx b/shell/qa/zip/testzipimpl.cxx
index 9aaa9db92d6b..dea673960a64 100644
--- a/shell/qa/zip/testimpl/testzipimpl.cxx
+++ b/shell/qa/zip/testzipimpl.cxx
@@ -22,8 +22,8 @@
 
 vector<string> expectedContents;
 
-TestZipImpl::TestZipImpl(const char * documentName) :
-    zipFile(ZipFile(string(documentName)))
+TestZipImpl::TestZipImpl(StreamInterface *stream) :
+    zipFile(ZipFile(stream))
 {
     expectedContents.push_back("mimetype");
     expectedContents.push_back("Configurations2/statusbar/");
diff --git a/shell/qa/zip/testimpl/testzipimpl.hxx b/shell/qa/zip/testzipimpl.hxx
index 584305cbe27b..d8a2e5f3daa0 100644
--- a/shell/qa/zip/testimpl/testzipimpl.hxx
+++ b/shell/qa/zip/testzipimpl.hxx
@@ -35,7 +35,7 @@ class DLLPUBLIC TestZipImpl
  private:
     ZipFile zipFile;
  public:
-    TestZipImpl(const char * documentName);
+	TestZipImpl(StreamInterface *stream);
     ~TestZipImpl();
     bool test_directory();
     bool test_hasContentCaseInSensitive();
diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx
index 457833afb2fd..d7ed38e4d338 100644
--- a/shell/qa/zip/ziptest.cxx
+++ b/shell/qa/zip/ziptest.cxx
@@ -22,7 +22,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
 #include <string>
-#include "testimpl/testzipimpl.hxx"
+#include "internal/stream_helper.hxx"
+#include "testzipimpl.hxx"
 using namespace std;
 
 class Test : public CppUnit::TestFixture
@@ -33,13 +34,13 @@ public:
     Test();
     void setUp() {}
     void tearDown() {}
-    void test_directory();
-    void test_hasContentCaseInSensitive();
-    void test_getContent();
+    void test_file_directory();
+    void test_file_hasContentCaseInSensitive();
+    void test_file_getContent();
     CPPUNIT_TEST_SUITE(Test);
-    CPPUNIT_TEST(test_directory);
-    CPPUNIT_TEST(test_hasContentCaseInSensitive);
-    CPPUNIT_TEST(test_getContent);
+    CPPUNIT_TEST(test_file_directory);
+    CPPUNIT_TEST(test_file_hasContentCaseInSensitive);
+    CPPUNIT_TEST(test_file_getContent);
     CPPUNIT_TEST_SUITE_END();
 };
 
@@ -56,23 +57,26 @@ Test::Test() : documentName()
     documentName.append("shell/qa/zip/simpledocument.odt");
 }
 
-void Test::test_directory()
+void Test::test_file_directory()
 {
-    TestZipImpl testImpl(documentName.c_str());
+    FileStream stream(documentName.c_str());
+    TestZipImpl testImpl(&stream);
     bool isPassed = testImpl.test_directory();
     CPPUNIT_ASSERT_MESSAGE("Content does not match with expected directory names.", isPassed);
 }
 
-void Test::test_hasContentCaseInSensitive()
+void Test::test_file_hasContentCaseInSensitive()
 {
-    TestZipImpl testImpl(documentName.c_str());
+    FileStream stream(documentName.c_str());
+    TestZipImpl testImpl(&stream);
     bool isPassed = testImpl.test_hasContentCaseInSensitive();
     CPPUNIT_ASSERT_MESSAGE("Content in zip file was not found.", isPassed);
 }
 
-void Test::test_getContent()
+void Test::test_file_getContent()
 {
-    TestZipImpl testImpl(documentName.c_str());
+    FileStream stream(documentName.c_str());
+    TestZipImpl testImpl(&stream);
     bool isPassed = testImpl.test_getContent();
     CPPUNIT_ASSERT_MESSAGE("Couldn't receive content buffer form zipfile.", isPassed);
 }