Author: aconway
Date: Thu Jan 7 16:24:35 2010
New Revision: 896918
URL: http://svn.apache.org/viewvc?rev=896918&view=rev
Log:
StoreStatus tests clean up temporary directory properly.
Modified:
qpid/trunk/qpid/cpp/src/tests/StoreStatus.cpp
Modified: qpid/trunk/qpid/cpp/src/tests/StoreStatus.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/StoreStatus.cpp?rev=896918&r1=896917&r2=896918&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/StoreStatus.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/StoreStatus.cpp Thu Jan 7 16:24:35 2010
@@ -1,4 +1,4 @@
- /*
+/*
*
* Copyright (c) 2006 The Apache Software Foundation
*
@@ -39,8 +39,18 @@
const char* TEST_DIR = "StoreStatus.tmp";
+struct TestDir {
+ TestDir() {
+ remove_all(TEST_DIR);
+ create_directory(TEST_DIR);
+ }
+ ~TestDir() {
+ remove_all(TEST_DIR);
+ }
+};
+
QPID_AUTO_TEST_CASE(testLoadEmpty) {
- create_directory(TEST_DIR);
+ TestDir td;
StoreStatus ss(TEST_DIR);
BOOST_CHECK_EQUAL(ss.getState(), STORE_STATE_NO_STORE);
BOOST_CHECK(!ss.getClusterId());
@@ -48,11 +58,10 @@
ss.load();
BOOST_CHECK_EQUAL(ss.getState(), STORE_STATE_EMPTY_STORE);
BOOST_CHECK(!ss.getShutdownId());
- remove_all(TEST_DIR);
}
QPID_AUTO_TEST_CASE(testSaveLoadDirty) {
- create_directory(TEST_DIR);
+ TestDir td;
Uuid clusterId = Uuid(true);
StoreStatus ss(TEST_DIR);
ss.load();
@@ -64,11 +73,10 @@
BOOST_CHECK_EQUAL(ss2.getState(), STORE_STATE_DIRTY_STORE);
BOOST_CHECK_EQUAL(ss2.getClusterId(), clusterId);
BOOST_CHECK(!ss2.getShutdownId());
- remove_all(TEST_DIR);
}
QPID_AUTO_TEST_CASE(testSaveLoadClean) {
- create_directory(TEST_DIR);
+ TestDir td;
Uuid clusterId = Uuid(true);
Uuid shutdownId = Uuid(true);
StoreStatus ss(TEST_DIR);
@@ -82,12 +90,11 @@
BOOST_CHECK_EQUAL(ss2.getState(), STORE_STATE_CLEAN_STORE);
BOOST_CHECK_EQUAL(ss2.getClusterId(), clusterId);
BOOST_CHECK_EQUAL(ss2.getShutdownId(), shutdownId);
- remove_all(TEST_DIR);
}
QPID_AUTO_TEST_CASE(testMarkDirty) {
// Save clean then mark to dirty.
- create_directory(TEST_DIR);
+ TestDir td;
Uuid clusterId = Uuid(true);
Uuid shutdownId = Uuid(true);
StoreStatus ss(TEST_DIR);
@@ -101,9 +108,8 @@
BOOST_CHECK_EQUAL(ss2.getState(), STORE_STATE_DIRTY_STORE);
BOOST_CHECK_EQUAL(ss2.getClusterId(), clusterId);
BOOST_CHECK(!ss2.getShutdownId());
- remove_all(TEST_DIR);
}
QPID_AUTO_TEST_SUITE_END()
-}} // namespace qpid::tests
+ }} // namespace qpid::tests
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
