Index: source/cppunit/TestCase.cpp =================================================================== RCS file: /cvs/tools/testshl2/source/cppunit/TestCase.cpp,v retrieving revision 1.1 diff -u -b -B -p -r1.1 TestCase.cpp --- source/cppunit/TestCase.cpp 9 Jan 2003 11:06:06 -0000 1.1 +++ source/cppunit/TestCase.cpp 22 Feb 2003 14:01:51 -0000 @@ -66,14 +66,14 @@ TestCase::run( hTestResult result ) Test* pTest = this; // if (signalCheck(pTest->getName()) == HAS_SIGNAL) - sal_Int32 nValue = (pCallbackFunc)(NULL, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, result, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE); + sal_Int32 nValue = (pCallbackFunc)(0, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, result, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE); if (nValue == DO_NOT_EXECUTE) { return; } // (pTestResult_StartTest)(result, pTest); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE); try { @@ -83,28 +83,28 @@ TestCase::run( hTestResult result ) { runTest(); // (pTestResult_AddInfo)(result, pTest, "PASSED"); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE); } catch ( StubException &e) { - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "STUB", TAG_DONE ); + (pCallbackFunc)(0, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "STUB", TAG_DONE ); } catch ( Exception &e ) { Exception *copy = e.clone(); // (pTestResult_AddFailure)( result, pTest, copy ); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE ); + (pCallbackFunc)(0, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE ); } catch ( std::exception &e ) { // (pTestResult_AddError)( result, pTest, new Exception( e.what() ) ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( e.what() ), TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( e.what() ), TAG_DONE ); } catch (...) { Exception *e = new Exception( "caught unknown exception" ); // (pTestResult_AddError)( result, pTest, e ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE ); } try @@ -114,17 +114,17 @@ TestCase::run( hTestResult result ) catch (...) { // (pTestResult_AddError)( result, pTest, new Exception( "tearDown() failed" ) ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "tearDown() failed" ), TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "tearDown() failed" ), TAG_DONE ); } } catch (...) { // (pTestResult_AddError)( result, pTest, new Exception( "setUp() failed" ) ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "setUp() failed" ), TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "setUp() failed" ), TAG_DONE ); } // (pTestResult_EndTest)( result, pTest ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE ); } /// A default run method Index: source/cppunit/TestFactoryRegistry.cpp =================================================================== RCS file: /cvs/tools/testshl2/source/cppunit/TestFactoryRegistry.cpp,v retrieving revision 1.2 diff -u -b -B -p -r1.2 TestFactoryRegistry.cpp --- source/cppunit/TestFactoryRegistry.cpp 28 Jan 2003 10:13:33 -0000 1.2 +++ source/cppunit/TestFactoryRegistry.cpp 22 Feb 2003 14:01:51 -0000 @@ -157,7 +157,7 @@ NamedRegistries::needDestroy( TestFactor void NamedRegistries::testRegistries( hTestResult _pResult) { // initialise the test handling - (pCallbackFunc)(NULL, TAG_TYPE, INIT_TEST, TAG_RESULT_PTR, _pResult, TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, INIT_TEST, TAG_RESULT_PTR, _pResult, TAG_DONE); // Start signal based Check for (MapRegistries::const_iterator it = m_registries.begin(); @@ -171,7 +171,7 @@ void NamedRegistries::testRegistries( hT } // release test handling - (pCallbackFunc)(NULL, TAG_TYPE, RELEASE_TEST, TAG_RESULT_PTR, _pResult, TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RELEASE_TEST, TAG_RESULT_PTR, _pResult, TAG_DONE); // start normal based tests, leave signal signed tests out. //! Allfunction in the inclusion list which has a flag, not found, has to call here. Index: source/cppunit/TestSuite.cpp =================================================================== RCS file: /cvs/tools/testshl2/source/cppunit/TestSuite.cpp,v retrieving revision 1.1 diff -u -b -B -p -r1.1 TestSuite.cpp --- source/cppunit/TestSuite.cpp 9 Jan 2003 11:06:07 -0000 1.1 +++ source/cppunit/TestSuite.cpp 22 Feb 2003 14:01:51 -0000 @@ -39,7 +39,7 @@ void TestSuite::run( hTestResult result ) { // (pTestResult_EnterNode)(result, getName().c_str()); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE); for ( std::vector::iterator it = m_tests.begin(); it != m_tests.end(); ++it ) @@ -47,7 +47,7 @@ TestSuite::run( hTestResult result ) //# if ( result->shouldStop() ) //# break; // if ( pTestResult_ShouldStop(result) ) - if ( (pCallbackFunc)(NULL, TAG_TYPE, RESULT_SHOULD_STOP, TAG_RESULT_PTR, result, TAG_DONE) ) + if ( (pCallbackFunc)(0, TAG_TYPE, RESULT_SHOULD_STOP, TAG_RESULT_PTR, result, TAG_DONE) ) { break; } @@ -55,7 +55,7 @@ TestSuite::run( hTestResult result ) test->run( result ); } // (pTestResult_LeaveNode)(result, getName().c_str()); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE); } Index: source/cppunit/tresstatewrapper.cxx =================================================================== RCS file: /cvs/tools/testshl2/source/cppunit/tresstatewrapper.cxx,v retrieving revision 1.4 diff -u -b -B -p -r1.4 tresstatewrapper.cxx --- source/cppunit/tresstatewrapper.cxx 9 Jan 2003 14:34:08 -0000 1.4 +++ source/cppunit/tresstatewrapper.cxx 22 Feb 2003 14:01:52 -0000 @@ -111,12 +111,12 @@ rtl_tres_state_start::rtl_tres_state_sta m_pName(_pName) { // (pTestResult_EnterNode)(m_aResult, m_pName); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE); } rtl_tres_state_start::~rtl_tres_state_start() { // (pTestResult_LeaveNode)(m_aResult, m_pName); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE); } // --------------------------------- C-Wrapper --------------------------------- @@ -152,7 +152,7 @@ sal_Bool SAL_CALL c_rtl_tres_state( { CppUnit::Test* pTest = new WrappedTest(pFuncName); - sal_Int32 nValue = (pCallbackFunc)(NULL, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, pResult, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE); + sal_Int32 nValue = (pCallbackFunc)(0, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, pResult, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE); if (nValue == DO_NOT_EXECUTE) { return false; @@ -161,35 +161,35 @@ sal_Bool SAL_CALL c_rtl_tres_state( // This code is copied from CppUnit::TestCase and less adapted, to work with the // old test code. // (pTestResult_StartTest)(pResult, pTest); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE); try { CPPUNIT_ASSERT_MESSAGE( pTestMsg, bSuccess ? true : false ); // (pTestResult_AddInfo)(pResult, pTest, "#PASSED#"); - (pCallbackFunc)(NULL, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_INFO, "#PASSED#", TAG_DONE); + (pCallbackFunc)(0, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_INFO, "#PASSED#", TAG_DONE); } catch ( CppUnit::Exception &e ) { CppUnit::Exception *copy = e.clone(); // (pTestResult_AddFailure)( pResult, pTest, copy ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE ); } catch ( std::exception &e ) { //(pTestResult_AddError)( pResult, pTest, new CppUnit::Exception( e.what() ) ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE ); } catch (...) { CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" ); // (pTestResult_AddError)( pResult, pTest, e ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE ); } // (pTestResult_EndTest)( pResult, pTest ); - (pCallbackFunc)( NULL, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE ); + (pCallbackFunc)( 0, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE ); return bSuccess; } Index: source/result/signal.cxx =================================================================== RCS file: /cvs/tools/testshl2/source/result/signal.cxx,v retrieving revision 1.4 diff -u -b -B -p -r1.4 signal.cxx --- source/result/signal.cxx 28 Jan 2003 10:13:34 -0000 1.4 +++ source/result/signal.cxx 22 Feb 2003 14:01:53 -0000 @@ -190,7 +190,8 @@ void markSignalAsAlreadyDone(sal_Int32 _ //# << ")" << std::endl; //# // out << sLastTestFunctionName << std::endl; // SIGNAL! - fprintf(out, "# the previous test function creates signal: %s(%d)\n", getSignalName(_nSignalNo), _nSignalNo); + fprintf(out, "# the previous test function creates signal: %s(%d)\n", + getSignalName(_nSignalNo).c_str(), _nSignalNo); // fprintf(out, "%s\n", sLastTestFunctionName ); fclose(out); } @@ -538,7 +539,7 @@ void signalStartTest(std::string const& if (out != NULL) { // out << buildTestFunctionName(_sName) << std::endl; - fprintf(out, "%s\n", buildTestFunctionName(_sName)); + fprintf(out, "%s\n", buildTestFunctionName(_sName).c_str()); fclose(out); } else @@ -575,7 +576,7 @@ sal_Int32 SignalHandlerA( TagHelper cons { sal_Int32 nRetValue = 0; TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0); - hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, NULL); + hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR,0); CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult; try @@ -614,7 +615,7 @@ sal_Int32 SignalHandlerA( TagHelper cons case SIGNAL_START_TEST: { - const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME,0); if (sName != NULL) { signalStartTest(sName); @@ -624,7 +625,7 @@ sal_Int32 SignalHandlerA( TagHelper cons case SIGNAL_END_TEST: { - const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME,0); if (sName != NULL) { signalEndTest(sName); @@ -675,7 +676,7 @@ sal_Int32 ExecutionA( TagHelper const& _ { sal_Int32 nRetValue = 0; TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0); - hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, NULL); + hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR,0); CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult; try @@ -684,7 +685,7 @@ sal_Int32 ExecutionA( TagHelper const& _ { case EXECUTION_CHECK: { - const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME,0); if (sName) nRetValue = CheckExecution(pResult, sName); break; Index: source/result/treswrapper.cxx =================================================================== RCS file: /cvs/tools/testshl2/source/result/treswrapper.cxx,v retrieving revision 1.2 diff -u -b -B -p -r1.2 treswrapper.cxx --- source/result/treswrapper.cxx 9 Jan 2003 11:46:14 -0000 1.2 +++ source/result/treswrapper.cxx 22 Feb 2003 14:01:54 -0000 @@ -79,7 +79,7 @@ namespace CppUnit::Test* pTest = (CppUnit::Test*)_pTest; std::string sName = pTest->getName(); - CallbackDispatch(NULL, TAG_TYPE, SIGNAL_START_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE); + CallbackDispatch(0, TAG_TYPE, SIGNAL_START_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE); pResult->startTest(pTest); } @@ -91,7 +91,7 @@ namespace pResult->endTest(pTest); std::string sName = pTest->getName(); - CallbackDispatch(NULL, TAG_TYPE, SIGNAL_END_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE); + CallbackDispatch(0, TAG_TYPE, SIGNAL_END_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE); } // ----------------------------------------------------------------------------- @@ -152,8 +152,8 @@ namespace { sal_Int32 nRetValue = 0; TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0); - hTestResult pResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, NULL); - CppUnit::Test* pTest = (CppUnit::Test*) _aTagItems.GetTagData(TAG_TEST_PTR, NULL); + hTestResult pResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0); + CppUnit::Test* pTest = (CppUnit::Test*) _aTagItems.GetTagData(TAG_TEST_PTR, 0); try { @@ -169,35 +169,35 @@ namespace case RESULT_ADD_FAILURE: { - hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, NULL); + hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0); TestResult_addFailure(pResult, pTest, pException); break; } case RESULT_ADD_ERROR: { - hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, NULL); + hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0); TestResult_addError(pResult, pTest, pException); break; } case RESULT_ADD_INFO: { - const char* pInfo = (const char* ) _aTagItems.GetTagData(TAG_INFO, NULL); + const char* pInfo = (const char* ) _aTagItems.GetTagData(TAG_INFO, 0); TestResult_addInfo(pResult, pTest, pInfo); break; } case RESULT_ENTER_NODE: { - const char* pNode = (const char* )_aTagItems.GetTagData(TAG_NODENAME, NULL); + const char* pNode = (const char* )_aTagItems.GetTagData(TAG_NODENAME, 0); TestResult_enterNode(pResult, pNode); break; } case RESULT_LEAVE_NODE: { - const char* pNode = (const char* ) _aTagItems.GetTagData(TAG_NODENAME, NULL); + const char* pNode = (const char* ) _aTagItems.GetTagData(TAG_NODENAME, 0); TestResult_leaveNode(pResult, pNode); break; } @@ -263,7 +263,7 @@ sal_Int32 CallbackDispatch(int x, ...) // printf(".\n"); sal_Int32 nRetValue = 0; - Tag nPreTag = aTagItems.GetTagData(TAG_TYPE); + Tag nPreTag = aTagItems.GetTagData(TAG_TYPE,0); if ( (nPreTag & TAG_RESULT) == TAG_RESULT) { nRetValue = TestResult_StarterA( aTagItems );