Author: carnold
Date: Wed Jul 26 20:59:07 2006
New Revision: 425948
URL: http://svn.apache.org/viewvc?rev=425948&view=rev
Log:
LOGCXX-76: Still pass tests if APR unable to return home directory
Modified:
logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
Modified: logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp?rev=425948&r1=425947&r2=425948&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
(original)
+++ logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp Wed Jul
26 20:59:07 2006
@@ -171,20 +171,21 @@
apr_uid_t userid;
apr_gid_t groupid;
stat = apr_uid_current(&userid, &groupid, p);
- CPPUNIT_ASSERT_EQUAL(APR_SUCCESS, stat);
-
- char* username = NULL;
- stat = apr_uid_name_get(&username, userid, p);
- CPPUNIT_ASSERT_EQUAL(APR_SUCCESS, stat);
-
- char* dirname = NULL;
- stat = apr_uid_homepath_get(&dirname, username, p);
-
- LogString expected;
- Transcoder::decode(dirname, strlen(dirname), expected);
+ if (stat == APR_SUCCESS) {
+ char* username = NULL;
+ stat = apr_uid_name_get(&username, userid, p);
+ if (stat == APR_SUCCESS) {
+ char* dirname = NULL;
+ stat = apr_uid_homepath_get(&dirname, username, p);
+ if (stat == APR_SUCCESS) {
+ LogString expected;
+ Transcoder::decode(dirname, strlen(dirname), expected);
+ CPPUNIT_ASSERT_EQUAL(expected, actual);
+ }
+ }
+ }
apr_pool_destroy(p);
- CPPUNIT_ASSERT_EQUAL(expected, actual);
}
void testUserName() {
@@ -197,17 +198,16 @@
apr_uid_t userid;
apr_gid_t groupid;
stat = apr_uid_current(&userid, &groupid, p);
- CPPUNIT_ASSERT_EQUAL(APR_SUCCESS, stat);
-
- char* username = NULL;
- stat = apr_uid_name_get(&username, userid, p);
- CPPUNIT_ASSERT_EQUAL(APR_SUCCESS, stat);
-
- LogString expected;
- Transcoder::decode(username, strlen(username), expected);
+ if (stat == APR_SUCCESS) {
+ char* username = NULL;
+ stat = apr_uid_name_get(&username, userid, p);
+ if (stat == APR_SUCCESS) {
+ LogString expected;
+ Transcoder::decode(username, strlen(username), expected);
+ CPPUNIT_ASSERT_EQUAL(expected, actual);
+ }
+ }
apr_pool_destroy(p);
-
- CPPUNIT_ASSERT_EQUAL(expected, actual);
}
#endif
