diff options
| author | Radu Ioan <ioan.radu.g@gmail.com> | 2012-10-08 22:07:39 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-10 08:22:31 +0000 |
| commit | 0ea421781b16b449045e66c38007374ab2f2c509 (patch) | |
| tree | 063ad5af64ff224dd0d0b21601c87dc39772d68e /salhelper/qa | |
| parent | 36026a6ae5d2f42db5fa262a358a3bc8e33e036c (diff) | |
fdo#39625 Make existing cppunittests work
Make salhelper testapi cppunit work
- removed call to simpleheader.hxx
- added call in Module_sal.mk for sal_testapi
- created mk for cppunittest for sal_testapi
- fixed some compile warning for auto_ptr
Change-Id: I07a58dbd5282f92604f58eb450e0bf549c54c6b3
Reviewed-on: https://gerrit.libreoffice.org/839
Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'salhelper/qa')
| -rw-r--r-- | salhelper/qa/test_api.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx index 2566b9a912e3..afddab10c204 100644 --- a/salhelper/qa/test_api.cxx +++ b/salhelper/qa/test_api.cxx @@ -48,11 +48,14 @@ std::type_info const & getSimpleReferenceObjectTypeInfo() } -#include "testshl/simpleheader.hxx" #include "osl/mutex.hxx" #include "salhelper/condition.hxx" #include "salhelper/dynload.hxx" #include "salhelper/simplereferenceobject.hxx" +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> +#include <boost/scoped_ptr.hpp> #include <memory> @@ -208,12 +211,12 @@ void Test::testSimpleReferenceObject() { void Test::testDerivedCondition() { osl::Mutex mutex; - std::auto_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); + boost::scoped_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0); } void Test::testDerivedConditionWaiterTimedout() { - std::auto_ptr< salhelper::ConditionWaiter::timedout > p( + boost::scoped_ptr< salhelper::ConditionWaiter::timedout > p( new DerivedConditionWaiterTimedout); CPPUNIT_ASSERT( dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0); @@ -235,10 +238,10 @@ void Test::testDerivedSimpleReferenceObject() { } } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |