summaryrefslogtreecommitdiff
path: root/sal/qa/osl/process
diff options
context:
space:
mode:
Diffstat (limited to 'sal/qa/osl/process')
-rw-r--r--sal/qa/osl/process/osl_Thread.cxx71
-rw-r--r--sal/qa/osl/process/osl_process.cxx12
2 files changed, 39 insertions, 44 deletions
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 65b29432f510..f1262b31f248 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
#ifdef IOS
#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_Thread
#endif
@@ -567,10 +564,10 @@ namespace osl_Thread
}
- SAL_CPPUNIT_TEST_SUITE(create);
+ CPPUNIT_TEST_SUITE(create);
CPPUNIT_TEST(create_001);
CPPUNIT_TEST(create_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class create
@@ -633,11 +630,11 @@ namespace osl_Thread
);
}
- SAL_CPPUNIT_TEST_SUITE(createSuspended);
+ CPPUNIT_TEST_SUITE(createSuspended);
CPPUNIT_TEST(createSuspended_001);
// LLA: Deadlocked!!!
CPPUNIT_TEST(createSuspended_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class createSuspended
/** when the count value equal to or more than 3, suspend the thread.
@@ -743,11 +740,11 @@ namespace osl_Thread
);
}
- SAL_CPPUNIT_TEST_SUITE(suspend);
+ CPPUNIT_TEST_SUITE(suspend);
CPPUNIT_TEST(suspend_001);
// LLA: Deadlocked!!!
// CPPUNIT_TEST(createSuspended_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class suspend
/** Test of the osl::Thread::resume method
@@ -829,10 +826,10 @@ namespace osl_Thread
);
}
- SAL_CPPUNIT_TEST_SUITE(resume);
+ CPPUNIT_TEST_SUITE(resume);
CPPUNIT_TEST(resume_001);
CPPUNIT_TEST(resume_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class resume
/** Test of the osl::Thread::terminate method
@@ -908,10 +905,10 @@ namespace osl_Thread
nLaterValue > nValue );
}
- SAL_CPPUNIT_TEST_SUITE(terminate);
+ CPPUNIT_TEST_SUITE(terminate);
CPPUNIT_TEST(terminate_001);
CPPUNIT_TEST(terminate_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class terminate
/** Test of the osl::Thread::join method
@@ -1000,10 +997,10 @@ namespace osl_Thread
);
}
- SAL_CPPUNIT_TEST_SUITE(join);
+ CPPUNIT_TEST_SUITE(join);
CPPUNIT_TEST(join_001);
CPPUNIT_TEST(join_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class join
/** Test of the osl::Thread::isRunning method
@@ -1071,10 +1068,10 @@ namespace osl_Thread
}
- SAL_CPPUNIT_TEST_SUITE(isRunning);
+ CPPUNIT_TEST_SUITE(isRunning);
CPPUNIT_TEST(isRunning_001);
CPPUNIT_TEST(isRunning_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class isRunning
@@ -1522,7 +1519,7 @@ namespace osl_Thread
}
- SAL_CPPUNIT_TEST_SUITE(setPriority);
+ CPPUNIT_TEST_SUITE(setPriority);
#ifndef SOLARIS
CPPUNIT_TEST(setPriority_002);
CPPUNIT_TEST(setPriority_003);
@@ -1534,7 +1531,7 @@ namespace osl_Thread
CPPUNIT_TEST(setPriority_001_3);
CPPUNIT_TEST(setPriority_001_4);
CPPUNIT_TEST(setPriority_001_5);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class setPriority
/** Test of the osl::Thread::getPriority method
@@ -1587,10 +1584,10 @@ namespace osl_Thread
}
- SAL_CPPUNIT_TEST_SUITE(getPriority);
+ CPPUNIT_TEST_SUITE(getPriority);
CPPUNIT_TEST(getPriority_001);
CPPUNIT_TEST(getPriority_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class getPriority
@@ -1617,10 +1614,10 @@ namespace osl_Thread
}
- SAL_CPPUNIT_TEST_SUITE(getIdentifier);
+ CPPUNIT_TEST_SUITE(getIdentifier);
CPPUNIT_TEST(getIdentifier_001);
CPPUNIT_TEST(getIdentifier_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class getIdentifier
/** Test of the osl::Thread::getCurrentIdentifier method
@@ -1660,10 +1657,10 @@ namespace osl_Thread
{
}
- SAL_CPPUNIT_TEST_SUITE(getCurrentIdentifier);
+ CPPUNIT_TEST_SUITE(getCurrentIdentifier);
CPPUNIT_TEST(getCurrentIdentifier_001);
//CPPUNIT_TEST(getCurrentIdentifier_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class getCurrentIdentifier
/** Test of the osl::Thread::wait method
@@ -1727,9 +1724,9 @@ namespace osl_Thread
}
- SAL_CPPUNIT_TEST_SUITE(wait);
+ CPPUNIT_TEST_SUITE(wait);
CPPUNIT_TEST(wait_001);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class wait
/** osl::Thread::yield method: can not design good test scenario to test up to now
@@ -1751,9 +1748,9 @@ namespace osl_Thread
}
- SAL_CPPUNIT_TEST_SUITE(yield);
+ CPPUNIT_TEST_SUITE(yield);
CPPUNIT_TEST(yield_001);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class yield
/** Test of the osl::Thread::schedule method
@@ -1874,10 +1871,10 @@ namespace osl_Thread
);
}
- SAL_CPPUNIT_TEST_SUITE(schedule);
+ CPPUNIT_TEST_SUITE(schedule);
CPPUNIT_TEST(schedule_001);
CPPUNIT_TEST(schedule_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class schedule
// -----------------------------------------------------------------------------
@@ -1994,9 +1991,9 @@ namespace osl_ThreadData
}
- SAL_CPPUNIT_TEST_SUITE(ctors);
+ CPPUNIT_TEST_SUITE(ctors);
CPPUNIT_TEST(ctor_001);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class ctors
@@ -2107,11 +2104,11 @@ namespace osl_ThreadData
);
}
- SAL_CPPUNIT_TEST_SUITE(setData);
+ CPPUNIT_TEST_SUITE(setData);
CPPUNIT_TEST(setData_001);
CPPUNIT_TEST(setData_002);
CPPUNIT_TEST(setData_003);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class setData
class getData : public CppUnit::TestFixture
@@ -2191,10 +2188,10 @@ namespace osl_ThreadData
}
- SAL_CPPUNIT_TEST_SUITE(getData);
+ CPPUNIT_TEST_SUITE(getData);
CPPUNIT_TEST(getData_001);
CPPUNIT_TEST(getData_002);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
}; // class getData
// -----------------------------------------------------------------------------
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 87bd664b8d38..3723c6af451c 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -26,13 +26,11 @@
*
************************************************************************/
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
#ifdef IOS
#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_process
#endif
+#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
@@ -302,12 +300,12 @@ public:
osl_freeProcessHandle(process);
}
- SAL_CPPUNIT_TEST_SUITE(Test_osl_joinProcess);
+ CPPUNIT_TEST_SUITE(Test_osl_joinProcess);
CPPUNIT_TEST(osl_joinProcessWithTimeout_timeout_failure);
CPPUNIT_TEST(osl_joinProcessWithTimeout_without_timeout_failure);
CPPUNIT_TEST(osl_joinProcessWithTimeout_infinite);
CPPUNIT_TEST(osl_joinProcess);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
};
//#########################################################
@@ -738,7 +736,7 @@ public:
osl_freeProcessHandle(process);
}
- SAL_CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
+ CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
//TODO: Repair these under windows.
#ifndef WNT
CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
@@ -747,7 +745,7 @@ public:
CPPUNIT_TEST(osl_execProc_test_batch);
///TODO: Repair test (or tested function ;-) - test fails.
// CPPUNIT_TEST(osl_execProc_exe_name_in_argument_list);
- SAL_CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
};
//#####################################
generated by cgit (git 2.34.1) at 2024-07-16 03:50:43 +0000