[rhmessaging-commits] rhmessaging commits: r3074 - store/trunk/cpp/tests.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2009-01-27 10:09:50 -0500 (Tue, 27 Jan 2009)
New Revision: 3074

Modified:
   store/trunk/cpp/tests/OrderingTest.cpp
   store/trunk/cpp/tests/SimpleTest.cpp
   store/trunk/cpp/tests/TransactionalTest.cpp
   store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
Log:
Reset the log level to error+ for system tests

Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp	2009-01-26 23:36:56 UTC (rev 3073)
+++ store/trunk/cpp/tests/OrderingTest.cpp	2009-01-27 15:09:50 UTC (rev 3074)
@@ -33,7 +33,14 @@
 #include <qpid/broker/Queue.h>
 #include <qpid/broker/RecoveryManagerImpl.h>
 #include <qpid/framing/AMQHeaderBody.h>
+#include "qpid/log/Logger.h"
 
+#define SET_LOG_LEVEL(level) \
+    qpid::log::Options opts(""); \
+    opts.selectors.clear(); \
+    opts.selectors.push_back(level); \
+    qpid::log::Logger::instance().configure(opts);
+
 using namespace qpid::broker;
 using namespace qpid::framing;
 using namespace mrg::msgstore;
@@ -122,6 +129,8 @@
 
 QPID_AUTO_TEST_CASE(Basic)
 {
+    SET_LOG_LEVEL("error+"); // This only needs to be set once.
+
     std::cout << test_filename << ".Basic: " << std::flush;
     setup();
     //push on 10 messages

Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp	2009-01-26 23:36:56 UTC (rev 3073)
+++ store/trunk/cpp/tests/SimpleTest.cpp	2009-01-27 15:09:50 UTC (rev 3074)
@@ -34,7 +34,15 @@
 #include <qpid/broker/RecoveryManagerImpl.h>
 #include <qpid/framing/AMQHeaderBody.h>
 #include <qpid/framing/FieldTable.h>
+#include "qpid/log/Logger.h"
 
+#define SET_LOG_LEVEL(level) \
+    qpid::log::Options opts(""); \
+    opts.selectors.clear(); \
+    opts.selectors.push_back(level); \
+    qpid::log::Logger::instance().configure(opts);
+
+
 using boost::intrusive_ptr;
 using boost::static_pointer_cast;
 using namespace qpid;
@@ -133,8 +141,9 @@
 
 QPID_AUTO_TEST_CASE(CreateDelete)
 {
+    SET_LOG_LEVEL("error+"); // This only needs to be set once.
+
     cout << test_filename << ".CreateDelete: " << flush;
-
     MessageStoreImpl store;
     store.init(test_dir, 4, 1, 8);
     store.truncate();//make sure it is empty to begin with

Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp	2009-01-26 23:36:56 UTC (rev 3073)
+++ store/trunk/cpp/tests/TransactionalTest.cpp	2009-01-27 15:09:50 UTC (rev 3074)
@@ -34,7 +34,14 @@
 #include "qpid/broker/RecoveryManagerImpl.h"
 #include "qpid/framing/AMQHeaderBody.h"
 #include "qpid/log/Statement.h"
+#include "qpid/log/Logger.h"
 
+#define SET_LOG_LEVEL(level) \
+    qpid::log::Options opts(""); \
+    opts.selectors.clear(); \
+    opts.selectors.push_back(level); \
+    qpid::log::Logger::instance().configure(opts);
+
 using namespace mrg::msgstore;
 using namespace qpid::broker;
 using namespace qpid::framing;
@@ -239,6 +246,8 @@
 
 QPID_AUTO_TEST_CASE(Commit)
 {
+    SET_LOG_LEVEL("error+"); // This only needs to be set once.
+
     cout << test_filename << ".Commit: " << flush;
     swap(true);
     cout << "ok" << endl;

Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2009-01-26 23:36:56 UTC (rev 3073)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2009-01-27 15:09:50 UTC (rev 3074)
@@ -35,7 +35,14 @@
 #include "qpid/framing/AMQHeaderBody.h"
 #include "qpid/log/Statement.h"
 #include "TxnCtxt.h"
+#include "qpid/log/Logger.h"
 
+#define SET_LOG_LEVEL(level) \
+    qpid::log::Options opts(""); \
+    opts.selectors.clear(); \
+    opts.selectors.push_back(level); \
+    qpid::log::Logger::instance().configure(opts);
+
 using namespace mrg::msgstore;
 using namespace qpid::broker;
 using namespace qpid::framing;
@@ -511,6 +518,8 @@
 
 QPID_AUTO_TEST_CASE(CommitEnqueue)
 {
+    SET_LOG_LEVEL("error+"); // This only needs to be set once.
+
     cout << test_filename << ".CommitEnqueue: " << flush;
     tpct.testCommitEnqueue();
     cout << "ok" << endl;