shell/CppunitTest_shell_zip.mk | 38 +++++++++++++++++ shell/Module_shell.mk | 4 + shell/qa/zip/makefile.mk | 58 --------------------------- shell/qa/zip/testimpl/makefile.mk | 52 ------------------------ shell/qa/zip/testimpl/testzipimpl.cxx | 72 ---------------------------------- shell/qa/zip/testimpl/testzipimpl.hxx | 45 --------------------- shell/qa/zip/testzipimpl.cxx | 72 ++++++++++++++++++++++++++++++++++ shell/qa/zip/testzipimpl.hxx | 45 +++++++++++++++++++++ shell/qa/zip/ziptest.cxx | 44 ++++++++++++-------- 9 files changed, 186 insertions(+), 244 deletions(-)
New commits: commit 2adf469b425a8986c68f3f9ffdb8c389f84d6f4e Author: Fridrich Å trba <[email protected]> Date: Thu Jul 18 12:19:57 2013 +0200 Try to make the ziptest a bit more generic Change-Id: I2a380ebcc2b32fbb8e1c0ae6b83b5f34291e5d1d diff --git a/shell/CppunitTest_shell_zip.mk b/shell/CppunitTest_shell_zip.mk index 52f6d72..7e5d6dc 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 4039b91..0000000 --- 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 cf07233..0000000 --- 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 similarity index 96% rename from shell/qa/zip/testimpl/testzipimpl.cxx rename to shell/qa/zip/testzipimpl.cxx index 9aaa9db..dea6739 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 similarity index 96% rename from shell/qa/zip/testimpl/testzipimpl.hxx rename to shell/qa/zip/testzipimpl.hxx index 584305c..d8a2e5f 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 457833a..d7ed38e 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); } commit cfda5af070ef3dff4f7a8cd638be9c1cb5519a82 Author: Fridrich Å trba <[email protected]> Date: Thu Jul 18 11:30:10 2013 +0200 Trying to resurect the zip test Change-Id: Ic022f25a4f8d69b8d60bea7974900db5223e1251 diff --git a/shell/CppunitTest_shell_zip.mk b/shell/CppunitTest_shell_zip.mk new file mode 100644 index 0000000..52f6d72 --- /dev/null +++ b/shell/CppunitTest_shell_zip.mk @@ -0,0 +1,44 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,zip)) + +$(eval $(call gb_CppunitTest_add_exception_objects,zip, \ + shell/qa/zip/testimpl/testzipimpl \ + shell/qa/zip/ziptest \ +)) + + +$(eval $(call gb_CppunitTest_set_include,zip,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_externals,zip,\ + expat \ + zlib \ +)) + +$(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,\ + shell_xmlparser \ + shlxthandler_common \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index ecd3772..3461381 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -72,6 +72,10 @@ $(eval $(call gb_Module_add_targets,shell,\ StaticLibrary_xmlparser \ WinResTarget_shlxthdl \ )) + +$(eval $(call gb_Module_add_check_targets,shell,\ + CppunitTest_shell_zip \ +)) endif ifeq ($(BUILD_X64),TRUE) diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx index bea0458..457833a 100644 --- a/shell/qa/zip/ziptest.cxx +++ b/shell/qa/zip/ziptest.cxx @@ -45,9 +45,15 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(Test); -Test::Test() : - documentName("simpledocument.odt") +Test::Test() : documentName() { + const char* pSrcRoot = getenv( "SRC_ROOT" ); + if (pSrcRoot) + { + documentName.append(pSrcRoot); + documentName.append("/"); + } + documentName.append("shell/qa/zip/simpledocument.odt"); } void Test::test_directory() @@ -66,9 +72,9 @@ void Test::test_hasContentCaseInSensitive() void Test::test_getContent() { - TestZipImpl testImpl(documentName.c_str()); - bool isPassed = testImpl.test_getContent(); - CPPUNIT_ASSERT_MESSAGE("Couldn't receive content buffer form zipfile.", isPassed); + TestZipImpl testImpl(documentName.c_str()); + bool isPassed = testImpl.test_getContent(); + CPPUNIT_ASSERT_MESSAGE("Couldn't receive content buffer form zipfile.", isPassed); } CPPUNIT_PLUGIN_IMPLEMENT();
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
