[Libreoffice-commits] core.git: writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/Module_writerfilter.mk writerfilter/qa

Miklos Vajna vmiklos at collabora.co.uk
Mon Sep 23 08:08:40 PDT 2013


 writerfilter/CppunitTest_writerfilter_doctok.mk    |   44 ---
 writerfilter/Module_writerfilter.mk                |    2 
 writerfilter/qa/cppunittests/doctok/doctok.job     |    1 
 writerfilter/qa/cppunittests/doctok/export.map     |   25 --
 writerfilter/qa/cppunittests/doctok/testdoctok.cxx |  238 ---------------------
 5 files changed, 310 deletions(-)

New commits:
commit d3c70e68c652bbdeeaea20200e003b6c5f92a62f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Sep 23 16:59:51 2013 +0200

    writerfilter: remove dead doctok unit test
    
    Change-Id: I4d223611df92a7e348dc31e38bd45849fe0eb028

diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
deleted file mode 100644
index 1be6085..0000000
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- 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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_doctok))
-
-$(eval $(call gb_CppunitTest_use_external,writerfilter_doctok,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \
-	writerfilter/qa/cppunittests/doctok/testdoctok \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \
-	cppu \
-	cppuhelper \
-	sal \
-	writerfilter \
-	$(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/writerfilter/inc \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_doctok))
-$(eval $(call gb_CppunitTest_use_udk_api,writerfilter_doctok))
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index d6a1dc0..783b6ca 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -18,6 +18,4 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
     CppunitTest_writerfilter_rtftok \
 ))
 
-#    CppunitTest_writerfilter_doctok \
-
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/qa/cppunittests/doctok/doctok.job b/writerfilter/qa/cppunittests/doctok/doctok.job
deleted file mode 100644
index c99341d..0000000
--- a/writerfilter/qa/cppunittests/doctok/doctok.job
+++ /dev/null
@@ -1 +0,0 @@
-doctok.test.openFile
\ No newline at end of file
diff --git a/writerfilter/qa/cppunittests/doctok/export.map b/writerfilter/qa/cppunittests/doctok/export.map
deleted file mode 100644
index 06b6a4a..0000000
--- a/writerfilter/qa/cppunittests/doctok/export.map
+++ /dev/null
@@ -1,25 +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 .
-#
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-
-    local:
-        *;
-};
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
deleted file mode 100644
index e4a04f7..0000000
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#include <sal/config.h>
-
-#include <osl/process.h>
-#include <ucbhelper/contentbroker.hxx>
-#include <ucbhelper/std_inputstream.hxx>
-#include <cppuhelper/bootstrap.hxx>
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-
-#include <resourcemodel/exceptions.hxx>
-#include <doctok/WW8Document.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
-
-#include <iostream>
-
-namespace testdoctok
-{
-    using namespace ::std;
-    using namespace ::writerfilter::doctok;
-    using namespace ::com::sun::star;
-
-    uno::Reference<io::XInputStream> xStream;
-    uno::Reference<uno::XComponentContext> xContext;
-    WW8Document::Pointer_t pDocument;
-    uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xSimpleFileAccess;
-
-    class test : public CppUnit::TestFixture
-    {
-
-    public:
-        // initialise your test code values here.
-        void setUp()
-        {
-        }
-
-        void tearDown()
-        {
-        }
-
-        void testInitUno()
-        {
-            bool bResult = false;
-
-            // initialise UCB-Broker
-            uno::Reference<uno::XComponentContext>
-                xComponentContext
-                (::cppu::defaultBootstrap_InitialComponentContext());
-            OSL_ASSERT( xComponentContext.is() );
-
-            xContext = xComponentContext;
-
-            uno::Reference<lang::XMultiComponentFactory>
-                xFactory(xComponentContext->getServiceManager() );
-            OSL_ASSERT(xFactory.is());
-
-            uno::Sequence<uno::Any> aUcbInitSequence(2);
-            aUcbInitSequence[0] <<= OUString("Local");
-            aUcbInitSequence[1] <<= OUString("Office");
-
-            uno::Reference<lang::XMultiServiceFactory>
-                xServiceFactory(xFactory, uno::UNO_QUERY);
-            OSL_ASSERT( xServiceFactory.is() );
-
-            if (xServiceFactory.is())
-            {
-                sal_Bool bRet =
-                    ::ucb::ContentBroker::initialize(xServiceFactory,
-                                                     aUcbInitSequence);
-
-                OSL_ASSERT(bRet);
-                if (bRet)
-                {
-                    xSimpleFileAccess = ucb::SimpleFileAccess::create(xComponentContext);
-                    bResult = true;
-                }
-            }
-
-            CPPUNIT_ASSERT_MESSAGE("UNO initialization failed",
-                                   bResult);
-        }
-
-        // insert your test code here.
-        void testOpenFile()
-        {
-            try
-            {
-                rtl_uString *dir=NULL;
-                osl_getProcessWorkingDir(&dir);
-                rtl_uString *fname=NULL;
-                //rtl_uString_newFromAscii(&fname, "/OpenDocument-v1.doc");
-                rtl_uString_newFromAscii(&fname, "/test.doc");
-                //rtl_uString_newFromAscii(&fname, "/numbers.doc");
-                rtl_uString *absfile=NULL;
-                rtl_uString_newConcat(&absfile, dir, fname);
-
-                OUString sInputFileURL( absfile );
-
-                for (sal_uInt32 n = 0; n < sInputFileURL.getLength(); ++n)
-                {
-                    sal_uChar nC = sInputFileURL[n];
-
-                    if (nC < 0xff && isprint(nC))
-                        clog << static_cast<char>(nC);
-                    else
-                        clog << ".";
-                }
-
-                clog << endl;
-
-                xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
-
-                WW8Stream::Pointer_t pStream =
-                    WW8DocumentFactory::createStream(xContext, xStream);
-
-                pDocument = WW8DocumentFactory::createDocument(pStream);
-            }
-            catch (writerfilter::Exception e)
-            {
-                clog << "Exception!!" << endl;
-            }
-
-            CPPUNIT_ASSERT_MESSAGE("creating document failed",
-                                   pDocument != NULL);
-
-#if 1
-        }
-
-        void testTraversal()
-        {
-#endif
-            sal_uInt32 nResult = 0;
-
-            try
-            {
-                WW8DocumentIterator::Pointer_t pIt = pDocument->begin();
-                WW8DocumentIterator::Pointer_t pItEnd = pDocument->end();
-
-                while (! pIt->equal(*pItEnd))
-                {
-                    pIt->dump(clog);
-
-                    clog << endl;
-
-                    WW8PropertySet::Pointer_t pAttrs = pIt->getProperties();
-
-                    if (pAttrs != NULL)
-                    {
-                        pAttrs->dump(clog);
-                    }
-
-                    pIt->getText().dump(clog);
-                    ++(*pIt);
-                    ++nResult;
-                }
-            }
-            catch (writerfilter::Exception e)
-            {
-                clog << "Exception!!" << endl;
-            }
-
-            char sBuffer[256];
-            snprintf(sBuffer, 255, "%d", nResult);
-            clog << "Iterator steps:" << sBuffer << endl;
-
-            CPPUNIT_ASSERT_MESSAGE("traversing document failed",
-                                   nResult > 0);
-        }
-
-        void testEvents()
-        {
-            try
-            {
-                Stream::Pointer_t pStream = doctok::createStreamHandler();
-
-                pDocument->resolve(*pStream);
-            }
-            catch (writerfilter::Exception e)
-            {
-                clog << "Exception!!" << endl;
-            }
-        }
-
-        void testEnd()
-        {
-            ::ucb::ContentBroker::deinitialize();
-        }
-
-        // Change the following lines only, if you add, remove or rename
-        // member functions of the current class,
-        // because these macros are need by auto register mechanism.
-
-        CPPUNIT_TEST_SUITE(test);
-        CPPUNIT_TEST(testInitUno);
-        CPPUNIT_TEST(testOpenFile);
-        //CPPUNIT_TEST(testTraversal);
-        CPPUNIT_TEST(testEvents);
-        CPPUNIT_TEST(testEnd);
-        CPPUNIT_TEST_SUITE_END();
-    }; // class test
-
-    // -----------------------------------------------------------------------------
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
-} // namespace doctok
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list