merge cppunittest from feature/gnumake4_writerfilter_head (e0ac3ddd8a3602490854829107908abefc3eaf2f)

1 files changed, 105 insertions, 171 deletions

diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 250a7804d15e..e995f7360853 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -1,227 +1,161 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
-
+#include <sal/cppunit.h>
 #include <osl/process.h>
-#include <ucbhelper/contentbroker.hxx>
 #include <cppuhelper/bootstrap.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <ucbhelper/contentbroker.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.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 <iostream>
 
-#include <doctok/exceptions.hxx>
 #include <doctok/WW8Document.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
-
-#include <iostream>
 
 namespace testdoctok
 {
-    using namespace ::std;
-    using namespace ::com::sun::star;
-    using namespace doctok;
+using namespace ::std;
+using namespace ::com::sun::star;
+using namespace ::writerfilter::doctok;
 
-    uno::Reference<io::XInputStream> xStream;
-    uno::Reference<uno::XComponentContext> xContext;
-    WW8Document::Pointer_t pDocument;
-    uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess;
+uno::Reference<io::XInputStream> xStream;
+uno::Reference<uno::XComponentContext> xContext;
+WW8Document::Pointer_t pDocument;
+uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess;
 
-    class test : public CppUnit::TestFixture
+class test : public CppUnit::TestFixture
+{
+
+public:
+    // initialise your test code values here.
+    void setUp()
     {
+    }
 
-    public:
-        // initialise your test code values here.
-        void setUp()
-        {
-        }
+    void tearDown()
+    {
+    }
 
-        void tearDown()
-        {
-        }
+    void testInitUno()
+    {
+        bool bResult = false;
 
-        void testInitUno()
-        {
-            bool bResult = false;
+        // initialise UCB-Broker
+        uno::Reference<uno::XComponentContext>
+            xComponentContext
+            (::cppu::defaultBootstrap_InitialComponentContext());
+        OSL_ASSERT( xComponentContext.is() );
 
-            // initialise UCB-Broker
-            uno::Reference<uno::XComponentContext>
-                xComponentContext
-                (::cppu::defaultBootstrap_InitialComponentContext());
-            OSL_ASSERT( xComponentContext.is() );
+        xContext = xComponentContext;
 
-            xContext = xComponentContext;
+        uno::Reference<lang::XMultiComponentFactory>
+            xFactory(xComponentContext->getServiceManager() );
+        OSL_ASSERT(xFactory.is());
 
-            uno::Reference<lang::XMultiComponentFactory>
-                xFactory(xComponentContext->getServiceManager() );
-            OSL_ASSERT(xFactory.is());
+        uno::Sequence<uno::Any> aUcbInitSequence(2);
+        aUcbInitSequence[0] <<=
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+        aUcbInitSequence[1] <<=
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
 
-            uno::Sequence<uno::Any> aUcbInitSequence(2);
-            aUcbInitSequence[0] <<=
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
-            aUcbInitSequence[1] <<=
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+        uno::Reference<lang::XMultiServiceFactory>
+            xServiceFactory(xFactory, uno::UNO_QUERY);
+        OSL_ASSERT( xServiceFactory.is() );
 
-            uno::Reference<lang::XMultiServiceFactory>
-                xServiceFactory(xFactory, uno::UNO_QUERY);
-            OSL_ASSERT( xServiceFactory.is() );
+        if (xServiceFactory.is())
+        {
+            sal_Bool bRet =
+                ::ucbhelper::ContentBroker::initialize(xServiceFactory,
+                                                       aUcbInitSequence);
 
-            if (xServiceFactory.is())
+            OSL_ASSERT(bRet);
+            if (bRet)
             {
-                sal_Bool bRet =
-                    ::ucb::ContentBroker::initialize(xServiceFactory,
-                                                     aUcbInitSequence);
-
-                OSL_ASSERT(bRet);
-                if (bRet)
-                {
-                    uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
-                        xNameContainer(xFactory->createInstanceWithContext
+                uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
+                    xNameContainer(xFactory->createInstanceWithContext
                                        (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
                                         ("com.sun.star.ucb.SimpleFileAccess" )),
-                                        xComponentContext), uno::UNO_QUERY );
+                                    xComponentContext), uno::UNO_QUERY );
 
-                    if (xNameContainer.is())
-                    {
-                        xSimpleFileAccess = xNameContainer;
+                if (xNameContainer.is())
+                {
+                    xSimpleFileAccess = xNameContainer;
 
-                        bResult = true;
-                    }
+                    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, "/test.doc");
-                rtl_uString *absfile=NULL;
-                rtl_uString_newConcat(&absfile, dir, fname);
-
-                rtl::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;
+        CPPUNIT_ASSERT_MESSAGE("UNO initialization failed",
+                               bResult);
+    }
 
-                xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
-
-                WW8Stream::Pointer_t pStream =
-                    WW8DocumentFactory::createStream(xContext, xStream);
-
-                pDocument = WW8DocumentFactory::createDocument(pStream);
-            }
-            catch (doctok::Exception)
-            {
-                clog << "Exception!!" << endl;
-            }
-
-            CPPUNIT_ASSERT_MESSAGE("creating document failed",
-                                   pDocument != NULL);
+    // insert your test code here.
+    void testOpenFile()
+    {
+        rtl_uString *dir=NULL;
+        osl_getProcessWorkingDir(&dir);
+        rtl_uString *fname=NULL;
+        rtl_uString_newFromAscii(&fname, "/test.doc");
+        rtl_uString *absfile=NULL;
+        rtl_uString_newConcat(&absfile, dir, fname);
 
-#if 1
-        }
+        rtl::OUString sInputFileURL( absfile );
 
-        void testTraversal()
+        for (sal_Int32 n = 0; n < sInputFileURL.getLength(); ++n)
         {
-#endif
-            sal_uInt32 nResult = 0;
+            sal_uChar nC = sInputFileURL[n];
 
-            try
-            {
-                WW8DocumentIterator::Pointer_t pIt = pDocument->begin();
-                WW8DocumentIterator::Pointer_t pItEnd = pDocument->end();
+            if (nC < 0xff && isprint(nC))
+                clog << static_cast<char>(nC);
+            else
+                clog << ".";
+        }
 
-                while (! pIt->equal(*pItEnd))
-                {
-                    pIt->dump(clog);
+        clog << endl;
 
-                    clog << endl;
+        xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
 
-                    WW8PropertySet::Pointer_t pAttrs = pIt->getProperties();
+        WW8Stream::Pointer_t pStream =
+            WW8DocumentFactory::createStream(xContext, xStream);
 
-                    if (pAttrs != NULL)
-                    {
-                        pAttrs->dump(clog);
-                    }
+        pDocument.reset(WW8DocumentFactory::createDocument(pStream));
 
-                    pIt->getText().dump(clog);
-                    ++(*pIt);
-                    ++nResult;
-                }
-            }
-            catch (doctok::Exception)
-            {
-                clog << "Exception!!" << endl;
-            }
+        CPPUNIT_ASSERT_MESSAGE("creating document failed",
+                               pDocument != NULL);
+    }
 
-            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();
+    void testEvents()
+    {
+        ::writerfilter::Stream::Pointer_t pStream = ::writerfilter::createStreamHandler();
 
-                pDocument->resolve(*pStream);
-            }
-            catch (doctok::Exception)
-            {
-                clog << "Exception!!" << endl;
-            }
-        }
+        pDocument->resolve(*pStream);
+    }
 
-        void testEnd()
-        {
-            ::ucb::ContentBroker::deinitialize();
-        }
+    void testEnd()
+    {
+        ::ucbhelper::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.
+    // 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(testEvents);
-        CPPUNIT_TEST(testEnd);
-        CPPUNIT_TEST_SUITE_END();
-    }; // class test
+    CPPUNIT_TEST_SUITE(test);
+    CPPUNIT_TEST(testInitUno);
+    CPPUNIT_TEST(testOpenFile);
+    CPPUNIT_TEST(testEvents);
+    CPPUNIT_TEST(testEnd);
+    CPPUNIT_TEST_SUITE_END();
+}; // class test
 
-    // -----------------------------------------------------------------------------
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
+// -----------------------------------------------------------------------------
+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;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */