mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This is test code, OK to unconditionally print to stdout

Browse Source 
...and where appropriate use CPPUNIT_ASSERT_EQUAL to have no need to always
print out certain values

Change-Id: Iad2ccb235b09852fffd3f010cf069c45b36e2d4b
This commit is contained in:
Stephan Bergmann
2016-03-04 12:19:10 +01:00
parent 46c67c4323
commit d35eac83ab
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/sal/log-areas.dox
View File

@@ -32,7 +32,6 @@ certain functionality.
@li @c sal.textenc - the textencoding SAL library @li @c sal.textenc - the textencoding SAL library
@li @c sal.w32 @li @c sal.w32
@li @c sal.test @li @c sal.test
@li @c sal.doublelock
@section basctl @section basctl

15
sal/qa/rtl/doublelock/rtl_doublelocking.cxx
View File

@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
// include files #include <sal/config.h>
#include <iostream>
#include <sal/types.h> #include <sal/types.h>
@@ -190,24 +192,23 @@ namespace rtl_DoubleLocking
sal_Int32 nValueOK2 = 0; sal_Int32 nValueOK2 = 0;
nValueOK2 = p2Thread->getOK(); nValueOK2 = p2Thread->getOK();
SAL_INFO("sal.doublelock", "Value in Thread #1 is " << nValueOK); std::cout << "Value in Thread #1 is " << nValueOK << "\n";
SAL_INFO("sal.doublelock", "Value in Thread #2 is " << nValueOK2); std::cout << "Value in Thread #2 is " << nValueOK2 << "\n";
sal_Int32 nValueFails = 0; sal_Int32 nValueFails = 0;
nValueFails = pThread->getFails(); nValueFails = pThread->getFails();
sal_Int32 nValueFails2 = 0; sal_Int32 nValueFails2 = 0;
nValueFails2 = p2Thread->getFails(); nValueFails2 = p2Thread->getFails();
SAL_INFO("sal.doublelock", "Fails in Thread #1 is " << nValueFails);
SAL_INFO("sal.doublelock", "Fails in Thead #2 is " << nValueFails2);
delete pThread; delete pThread;
delete p2Thread; delete p2Thread;
CPPUNIT_ASSERT_MESSAGE( CPPUNIT_ASSERT_MESSAGE(
"getValue() failed, wrong value expected.", "getValue() failed, wrong value expected.",
nValueOK != 0 && nValueFails == 0 && nValueFails2 == 0 nValueOK != 0
); );
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nValueFails);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nValueFails2);
} }
CPPUNIT_TEST_SUITE(getValue); CPPUNIT_TEST_SUITE(getValue);