diff options
Diffstat (limited to 'configmgr/qa')
-rw-r--r-- | configmgr/qa/unit/common.hxx | 6 | ||||
-rw-r--r-- | configmgr/qa/unit/makefile.mk | 4 | ||||
-rw-r--r-- | configmgr/qa/unit/threading.cxx | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx index f686a43aac..7d5be65928 100644 --- a/configmgr/qa/unit/common.hxx +++ b/configmgr/qa/unit/common.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "cppuhelper/component_context.hxx" #include "cppuhelper/servicefactory.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/file.hxx" #include "osl/thread.h" #include "osl/process.h" @@ -77,7 +77,7 @@ public: // init virtual void setUp(); virtual void tearDown(); - + // helpers void normalizePathKey (rtl::OString &rPath, rtl::OString &rKey); css::uno::Reference< css::uno::XInterface > createView(const sal_Char *pNodepath, bool bUpdate); diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index a6a79ebdd0..aededf799d 100644 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) SHL1VERSIONMAP = export.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx index b04f7c3550..68baee1c68 100644 --- a/configmgr/qa/unit/threading.cxx +++ b/configmgr/qa/unit/threading.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ class KeyTester : public osl::Thread virtual ~KeyTester () { } - virtual void run () + virtual void SAL_CALL run () { testIteration(); while (!m_pCond->check()) @@ -96,7 +96,7 @@ class KeyWriter : public KeyTester static const char *options[] = { "fish", "chips", "kippers", "bloaters" }; // fprintf (stderr, "set key %d\n", // (int) osl_getThreadIdentifier(NULL)); - m_pTest->setKey (m_aPath, rtl::OUString::createFromAscii (m_aKey), + m_pTest->setKey (m_aPath, rtl::OUString::createFromAscii (m_aKey), css::uno::makeAny (rtl::OUString::createFromAscii(options[(curOpt++ & 3)]))); } CATCH_FAIL ("setting keys") } @@ -156,7 +156,7 @@ void Test::threadTests() } } stop.set(); - + for (i = 0; i < numReaders; i++) { pReaders[i]->join(); delete pReaders[i]; @@ -170,7 +170,7 @@ void Test::threadTests() } class RecursiveListener : public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener > -{ +{ public: sal_Int32 m_nRecurse; css::uno::Reference< css::beans::XPropertySet > mxPropSet; @@ -188,7 +188,7 @@ public: { mxPropSet = css::uno::Reference< css::beans::XPropertySet > ( pTest->createView (pPath, true), css::uno::UNO_QUERY_THROW ); - + CPPUNIT_ASSERT_MESSAGE ("is prop set", mxPropSet.is()); mxPropSet->addPropertyChangeListener (rtl::OUString::createFromAscii (m_pKey), css::uno::Reference<css::beans::XPropertyChangeListener>(this)); |