diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-06-04 11:21:52 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2014-06-04 11:21:52 +0000 |
| commit | 283007f8da755af1a9a4a66cc7089aaed3ec8d18 (patch) | |
| tree | 56df95ca97050e6b64c98de86b4adedd53f0b651 /sal | |
| parent | a8a2653568d31a2fb76aeb3183e128e3304452bd (diff) | |
#i125003# fix google-test for osl_condition in the sal module
the test didn't initialize the nanosecond part of the condition timeout and so
the absolute timeout calculated from the second and nanosecond values could
become invalid depending on the pseudo-random value of the nanosecond member.
This resulted in spurious gtest failures (first seen on Ubuntu).
Notes
Notes:
prefer: f158ee729ca794f52f4a0d28b1c2420e2a1f6ede
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/condition/osl_Condition.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx index 2feee84d8283..7231d0538d44 100644 --- a/sal/qa/osl/condition/osl_Condition.cxx +++ b/sal/qa/osl/condition/osl_Condition.cxx @@ -216,8 +216,7 @@ namespace osl_Condition Result wait(const TimeValue *pTimeout = 0) */ TEST(Sal_Test_Condition, wait_001) { - TimeValue tv1; - tv1.Seconds = 1; + TimeValue tv1 = {1,0}; ::osl::Condition cond1; ::osl::Condition cond2; @@ -232,14 +231,13 @@ namespace osl_Condition fprintf(stderr,"%d %d %d\n",r1,r2,r3); // #test comment#: test three types of wait. - ASSERT_TRUE( (cond1.wait(&tv1) == ::osl::Condition::result_ok) && - (cond2.wait() == ::osl::Condition::result_ok) && - (cond3.wait(&tv1) == ::osl::Condition::result_timeout) ); + ASSERT_TRUE( cond1.wait(&tv1) == ::osl::Condition::result_ok ); + ASSERT_TRUE( cond2.wait() == ::osl::Condition::result_ok ); + ASSERT_TRUE( cond3.wait(&tv1) == ::osl::Condition::result_timeout ); } TEST(Sal_Test_Condition, wait_002) { - TimeValue tv1; - tv1.Seconds = 1; + TimeValue tv1 = {1,0}; ::osl::Condition aCond; ::osl::Condition::Result wRes, wRes1; @@ -253,9 +251,10 @@ namespace osl_Condition sal_Bool bRes1 = aCond.check( ); // #test comment#: wait a condition after set/reset. - ASSERT_TRUE( !bRes && bRes1 && - ( ::osl::Condition::result_timeout == wRes ) && - ( ::osl::Condition::result_ok == wRes1 ) ); + ASSERT_TRUE( !bRes ); + ASSERT_TRUE( bRes1 ); + ASSERT_TRUE( ::osl::Condition::result_timeout == wRes ); + ASSERT_TRUE( ::osl::Condition::result_ok == wRes1 ); } @@ -288,7 +287,8 @@ namespace osl_Condition sal_Bool bRes1 = aCond.check( ); // #test comment#: use threads to set/reset Condition and check it in main routine. - ASSERT_TRUE( bRes && !bRes1 ); + ASSERT_TRUE( bRes ); + ASSERT_TRUE( !bRes1 ); } } // namespace osl_Condition |