You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2005/03/04 22:21:44 UTC
cvs commit: logging-log4cxx/tests/src l7dtestcase.cpp loggertestcase.cpp
carnold 2005/03/04 13:21:44
Modified: tests/src l7dtestcase.cpp loggertestcase.cpp
Log:
Fedora didn't like temp Locale's in calls to getResourceBundle
Revision Changes Path
1.10 +7 -4 logging-log4cxx/tests/src/l7dtestcase.cpp
Index: l7dtestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/l7dtestcase.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- l7dtestcase.cpp 1 Mar 2005 23:30:45 -0000 1.9
+++ l7dtestcase.cpp 4 Mar 2005 21:21:43 -0000 1.10
@@ -48,16 +48,19 @@
public:
void setUp()
{
+ Locale localeUS(LOG4CXX_STR("en"), LOG4CXX_STR("US"));
bundles[0] =
- ResourceBundle::getBundle(LOG4CXX_STR("L7D"), Locale(LOG4CXX_STR("en"), LOG4CXX_STR("US")));
+ ResourceBundle::getBundle(LOG4CXX_STR("L7D"), localeUS);
CPPUNIT_ASSERT(bundles[0] != 0);
-
+
+ Locale localeFR(LOG4CXX_STR("fr"), LOG4CXX_STR("FR"));
bundles[1] =
- ResourceBundle::getBundle(LOG4CXX_STR("L7D"), Locale(LOG4CXX_STR("fr"), LOG4CXX_STR("FR")));
+ ResourceBundle::getBundle(LOG4CXX_STR("L7D"), localeFR);
CPPUNIT_ASSERT(bundles[1] != 0);
+ Locale localeCH(LOG4CXX_STR("fr"), LOG4CXX_STR("CH"));
bundles[2] =
- ResourceBundle::getBundle(LOG4CXX_STR("L7D"), Locale(LOG4CXX_STR("fr"), LOG4CXX_STR("CH")));
+ ResourceBundle::getBundle(LOG4CXX_STR("L7D"), localeCH);
CPPUNIT_ASSERT(bundles[2] != 0);
root = Logger::getRootLogger();
1.12 +17 -16 logging-log4cxx/tests/src/loggertestcase.cpp
Index: loggertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/loggertestcase.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- loggertestcase.cpp 1 Mar 2005 23:30:45 -0000 1.11
+++ loggertestcase.cpp 4 Mar 2005 21:21:43 -0000 1.12
@@ -284,19 +284,20 @@
ResourceBundlePtr getBundle(const LogString& lang, const LogString& region)
{
- ResourceBundlePtr bundle(PropertyResourceBundle::getBundle(LOG4CXX_STR("L7D"),
- Locale(lang, region)));
- CPPUNIT_ASSERT(bundle != 0);
- return bundle;
+ Locale l(lang, region);
+ ResourceBundlePtr bundle(
+ PropertyResourceBundle::getBundle(LOG4CXX_STR("L7D"),l));
+ CPPUNIT_ASSERT(bundle != 0);
+ return bundle;
}
void testRB1()
{
- ResourceBundlePtr rbUS(getBundle(LOG4CXX_STR("en"), LOG4CXX_STR("US")));
- ResourceBundlePtr rbFR(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("FR")));
- ResourceBundlePtr rbCH(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("CH")));
+ ResourceBundlePtr rbUS(getBundle(LOG4CXX_STR("en"), LOG4CXX_STR("US")));
+ ResourceBundlePtr rbFR(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("FR")));
+ ResourceBundlePtr rbCH(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("CH")));
- LoggerPtr root = Logger::getRootLogger();
+ LoggerPtr root = Logger::getRootLogger();
root->setResourceBundle(rbUS);
ResourceBundlePtr t = root->getResourceBundle();
@@ -317,11 +318,11 @@
void testRB2()
{
LoggerPtr root = Logger::getRootLogger();
- ResourceBundlePtr rbUS(getBundle(LOG4CXX_STR("en"), LOG4CXX_STR("US")));
- ResourceBundlePtr rbFR(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("FR")));
- ResourceBundlePtr rbCH(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("CH")));
+ ResourceBundlePtr rbUS(getBundle(LOG4CXX_STR("en"), LOG4CXX_STR("US")));
+ ResourceBundlePtr rbFR(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("FR")));
+ ResourceBundlePtr rbCH(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("CH")));
- root->setResourceBundle(rbUS);
+ root->setResourceBundle(rbUS);
ResourceBundlePtr t = root->getResourceBundle();
CPPUNIT_ASSERT(t == rbUS);
@@ -341,11 +342,11 @@
void testRB3()
{
- ResourceBundlePtr rbUS(getBundle(LOG4CXX_STR("en"), LOG4CXX_STR("US")));
- ResourceBundlePtr rbFR(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("FR")));
- ResourceBundlePtr rbCH(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("CH")));
+ ResourceBundlePtr rbUS(getBundle(LOG4CXX_STR("en"), LOG4CXX_STR("US")));
+ ResourceBundlePtr rbFR(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("FR")));
+ ResourceBundlePtr rbCH(getBundle(LOG4CXX_STR("fr"), LOG4CXX_STR("CH")));
- LoggerPtr root = Logger::getRootLogger();
+ LoggerPtr root = Logger::getRootLogger();
root->setResourceBundle(rbUS);
ResourceBundlePtr t = root->getResourceBundle();