summaryrefslogtreecommitdiff
path: root/configmgr/qa
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2013-09-10 16:56:18 +0100
committerMichael Meeks <michael.meeks@collabora.com>2013-09-10 16:56:36 +0100
commite9b808bd2de9183daa31bfa9c93d6539ddcb0b62 (patch)
treea3a5a24fce38cb44298118e0f513cf74be6530cf /configmgr/qa
parenta66aeace78f366800ba5bc8be0d334ea823179ab (diff)
configmgr: cleanup unit test pieces.
Change-Id: I3d849a1676c638d431a15672c5a7253b70f4e610
Diffstat (limited to 'configmgr/qa')
-rw-r--r--configmgr/qa/unit/test.cxx77
1 files changed, 38 insertions, 39 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index bf119b473034..fa32488c58ca 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -52,9 +52,8 @@
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <comphelper/processfactory.hxx>
+#include <unotest/bootstrapfixturebase.hxx>
namespace {
@@ -141,11 +140,13 @@ TestThread::TestThread(
stop_(stop), success_(true)
{}
-bool TestThread::getSuccess() const {
+bool TestThread::getSuccess() const
+{
return success_;
}
-void TestThread::run() {
+void TestThread::run()
+{
try {
while (!stop_.check()) {
if (!iteration()) {
@@ -179,7 +180,8 @@ ReaderThread::ReaderThread(
create();
}
-bool ReaderThread::iteration() {
+bool ReaderThread::iteration()
+{
return test_.getKey(path_, relative_).hasValue();
}
@@ -251,7 +253,8 @@ RecursiveTest::RecursiveTest(
test_(theTest), count_(count), destroyed_(destroyed)
{}
-void RecursiveTest::test() {
+void RecursiveTest::test()
+{
properties_ = css::uno::Reference< css::beans::XPropertySet >(
test_.createUpdateAccess(
OUString(
@@ -267,7 +270,8 @@ void RecursiveTest::test() {
properties_, css::uno::UNO_QUERY_THROW)->dispose();
}
-RecursiveTest::~RecursiveTest() {
+RecursiveTest::~RecursiveTest()
+{
*destroyed_ = true;
}
@@ -301,7 +305,8 @@ SimpleRecursiveTest::SimpleRecursiveTest(
RecursiveTest(theTest, count, destroyed)
{}
-void SimpleRecursiveTest::step() const {
+void SimpleRecursiveTest::step() const
+{
test_.setKey(
OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -324,7 +329,8 @@ CrossThreadTest::CrossThreadTest(
RecursiveTest(theTest, count, destroyed)
{}
-void CrossThreadTest::step() const {
+void CrossThreadTest::step() const
+{
osl::Condition stop;
stop.set();
WriterThread(
@@ -342,32 +348,18 @@ void CrossThreadTest::step() const {
OUString("Label"));
}
-void Test::setUp() {
- char const * forward = getForwardString();
- rtl_uString * registry = 0;
- CPPUNIT_ASSERT(
- rtl_convertStringToUString(
- &registry, forward, rtl_str_getLength(forward),
- osl_getThreadTextEncoding(),
- (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)));
- context_ = css::uno::Reference< css::uno::XComponentContext >(
- css::uno::Reference< css::beans::XPropertySet >(
- cppu::createRegistryServiceFactory(
- OUString(registry, SAL_NO_ACQUIRE)),
- css::uno::UNO_QUERY_THROW)->getPropertyValue(
- OUString("DefaultContext")),
- css::uno::UNO_QUERY_THROW);
- provider_ = css::configuration::theDefaultProvider::get(context_);
+void Test::setUp()
+{
+ provider_ = css::configuration::theDefaultProvider::get(
+ comphelper::getProcessComponentContext() );
}
-void Test::tearDown() {
- css::uno::Reference< css::lang::XComponent >(
- context_, css::uno::UNO_QUERY_THROW)->dispose();
+void Test::tearDown()
+{
}
-void Test::testKeyFetch() {
+void Test::testKeyFetch()
+{
OUString s;
CPPUNIT_ASSERT(
getKey(
@@ -381,7 +373,8 @@ void Test::testKeyFetch() {
s);
}
-void Test::testKeySet() {
+void Test::testKeySet()
+{
setKey(
OUString("/org.openoffice.Setup/Test"),
OUString("AString"),
@@ -395,7 +388,8 @@ void Test::testKeySet() {
CPPUNIT_ASSERT( s == "baa" );
}
-void Test::testKeyReset() {
+void Test::testKeyReset()
+{
if (resetKey(
OUString("/org.openoffice.Setup/Test"),
OUString("AString")))
@@ -410,7 +404,8 @@ void Test::testKeyReset() {
}
}
-void Test::testSetSetMemberName() {
+void Test::testSetSetMemberName()
+{
OUString s;
CPPUNIT_ASSERT(
getKey(
@@ -452,7 +447,8 @@ void Test::testSetSetMemberName() {
CPPUNIT_ASSERT( s == "Fontwork Gallery" );
}
-void Test::testReadCommands() {
+void Test::testReadCommands()
+{
css::uno::Reference< css::container::XNameAccess > access(
createViewAccess(
OUString(
@@ -484,7 +480,8 @@ void Test::testReadCommands() {
access, css::uno::UNO_QUERY_THROW)->dispose();
}
-void Test::testThreads() {
+void Test::testThreads()
+{
struct Entry { OUString path; OUString relative; };
Entry list[] = {
{ OUString("/org.openoffice.Setup"),
@@ -546,14 +543,16 @@ void Test::testThreads() {
CPPUNIT_ASSERT(success);
}
-void Test::testRecursive() {
+void Test::testRecursive()
+{
bool destroyed = false;
rtl::Reference< RecursiveTest >(
new SimpleRecursiveTest(*this, 100, &destroyed))->test();
CPPUNIT_ASSERT(destroyed);
}
-void Test::testCrossThreads() {
+void Test::testCrossThreads()
+{
bool destroyed = false;
rtl::Reference< RecursiveTest >(
new SimpleRecursiveTest(*this, 10, &destroyed))->test();