rhmessaging commits: r1765 - in store/trunk/cpp: tests/jrnl and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-03-06 16:14:07 -0500 (Thu, 06 Mar 2008)
New Revision: 1765
Modified:
store/trunk/cpp/lib/jrnl/rmgr.cpp
store/trunk/cpp/tests/jrnl/_st_read_txn.cpp
Log:
Bugfix for transactional reads; aslo some new transactional read tests
Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-03-06 18:25:07 UTC (rev 1764)
+++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-03-06 21:14:07 UTC (rev 1765)
@@ -274,50 +274,37 @@
bool is_enq = false;
try
{
- fid = _emap.get_fid(_hdr._rid);
+ fid = _emap.get_fid(_hdr._rid); // If locked, will throw JERR_MAP_LOCKED
is_enq = true;
}
catch (const jexception& e)
{
// Block read for transactionally locked record (only when not recovering)
if (e.err_code() == jerrno::JERR_MAP_LOCKED && !_jc->is_read_only())
- throw;
-
- // (Recover mode only) Ok, not in emap - now search tmap, if present then read
- if (_jc->is_read_only())
- {
- std::vector<std::string> xid_list;
- _tmap.xid_list(xid_list);
- for (std::vector<std::string>::iterator itr = xid_list.begin();
- itr != xid_list.end() && !is_enq; itr++)
- {
- txn_data_list tx_list = _tmap.get_tdata_list(*itr);
- for (tdl_itr ditr = tx_list.begin(); ditr != tx_list.end() && !is_enq;
- ditr++)
- {
- if (ditr->_enq_flag)
- is_enq = ditr->_rid == _hdr._rid;
- else
- is_enq = ditr->_drid == _hdr._rid;
- }
- }
+ return RHM_IORES_TXPENDING;
+
+ // (Recover mode only) Ok, not in emap - now search tmap, if present then read
+ std::vector<std::string> xid_list;
+ _tmap.xid_list(xid_list);
+ for (std::vector<std::string>::iterator itr = xid_list.begin();
+ itr != xid_list.end() && !is_enq; itr++)
+ {
+ txn_data_list tx_list = _tmap.get_tdata_list(*itr);
+ for (tdl_itr ditr = tx_list.begin(); ditr != tx_list.end() && !is_enq;
+ ditr++)
+ {
+ if (ditr->_enq_flag)
+ is_enq = ditr->_rid == _hdr._rid;
+ else
+ is_enq = ditr->_drid == _hdr._rid;
+ }
}
+ if (!_jc->is_read_only() && is_enq)
+ return RHM_IORES_TXPENDING;
}
#endif
if (is_enq) // ok, this record is enqueued, check it, then read it...
{
-#if !(defined(RHM_WRONLY) || defined(RHM_RDONLY))
- // Is this locked by a pending dequeue transaction?
- try
- {
- if (_emap.is_locked(_hdr._rid) && !_jc->is_read_only())
- return RHM_IORES_TXPENDING;
- }
- catch (const jexception& e)
- {
- if (e.err_code() != jerrno::JERR_MAP_NOTFOUND) throw;
- }
-#endif
if (dtokp->rid())
{
if (_hdr._rid != dtokp->rid())
Modified: store/trunk/cpp/tests/jrnl/_st_read_txn.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-03-06 18:25:07 UTC (rev 1764)
+++ store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-03-06 21:14:07 UTC (rev 1765)
@@ -46,9 +46,9 @@
// === Test suite ===
-QPID_AUTO_TEST_CASE(enqueue_commit_block)
+QPID_AUTO_TEST_CASE(tx_enqueue_commit_block)
{
- string test_name = get_test_name(test_filename, "enqueue_commit_block");
+ string test_name = get_test_name(test_filename, "tx_enqueue_commit_block");
try
{
string msg;
@@ -57,33 +57,32 @@
string rxid;
bool transientFlag;
bool externalFlag;
-
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
jrnl_init(jc);
create_xid(xid, 0, XID_SIZE);
for (int m=0; m<NUM_MSGS; m++)
enq_txn_msg(jc, m, create_msg(msg, m, MSG_SIZE), xid, false);
jc.flush();
- read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
txn_commit(jc, xid);
jc.flush();
- cout << "[NOTE: Partially disabled until outstanding issue(s) resolved.] ";
-// for (int m=0; m<NUM_MSGS; m++)
-// {
-// read_msg(jc, rmsg, rxid, transientFlag, externalFlag);
-// BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg);
-// BOOST_CHECK_EQUAL(rxid, xid);
-// BOOST_CHECK_EQUAL(transientFlag, false);
-// BOOST_CHECK_EQUAL(externalFlag, false);
-// }
+ for (int m=0; m<NUM_MSGS; m++)
+ {
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag);
+ BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg);
+ BOOST_CHECK_EQUAL(rxid, xid);
+ BOOST_CHECK_EQUAL(transientFlag, false);
+ BOOST_CHECK_EQUAL(externalFlag, false);
+ }
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
}
catch(const exception& e) { BOOST_FAIL(e.what()); }
cout << "ok" << endl;
}
-QPID_AUTO_TEST_CASE(enqueue_commit_dequeue_block)
+QPID_AUTO_TEST_CASE(tx_enqueue_commit_interleaved)
{
- string test_name = get_test_name(test_filename, "enqueue_commit_dequeue_block");
+ string test_name = get_test_name(test_filename, "tx_enqueue_commit_interleaved");
try
{
string msg;
@@ -95,22 +94,28 @@
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
jrnl_init(jc);
- create_xid(xid, 0, XID_SIZE);
for (int m=0; m<NUM_MSGS; m++)
- enq_txn_msg(jc, m, create_msg(msg, m, MSG_SIZE), xid, false);
- txn_commit(jc, xid);
- for (int m=0; m<NUM_MSGS; m++)
- deq_msg(jc, m);
- jc.flush();
- read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
+ {
+ create_xid(xid, m, XID_SIZE);
+ enq_txn_msg(jc, 3*m, create_msg(msg, m, MSG_SIZE), xid, false);
+ jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
+ txn_commit(jc, xid);
+ jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag);
+ BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg);
+ BOOST_CHECK_EQUAL(rxid, xid);
+ BOOST_CHECK_EQUAL(transientFlag, false);
+ BOOST_CHECK_EQUAL(externalFlag, false);
+ }
}
catch(const exception& e) { BOOST_FAIL(e.what()); }
cout << "ok" << endl;
}
-QPID_AUTO_TEST_CASE(enqueue_abort_block)
+QPID_AUTO_TEST_CASE(tx_enqueue_abort_block)
{
- string test_name = get_test_name(test_filename, "enqueue_abort_block");
+ string test_name = get_test_name(test_filename, "tx_enqueue_abort_block");
try
{
string msg;
@@ -119,14 +124,13 @@
string rxid;
bool transientFlag;
bool externalFlag;
-
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
jrnl_init(jc);
- create_xid(xid, 0, XID_SIZE);
+ create_xid(xid, 1, XID_SIZE);
for (int m=0; m<NUM_MSGS; m++)
enq_txn_msg(jc, m, create_msg(msg, m, MSG_SIZE), xid, false);
jc.flush();
- read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
txn_abort(jc, xid);
jc.flush();
read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
@@ -135,9 +139,9 @@
cout << "ok" << endl;
}
-QPID_AUTO_TEST_CASE(enqueue_commit_interleaved)
+QPID_AUTO_TEST_CASE(tx_enqueue_abort_interleaved)
{
- string test_name = get_test_name(test_filename, "enqueue_commit_interleaved");
+ string test_name = get_test_name(test_filename, "tx_enqueue_abort_interleaved");
try
{
string msg;
@@ -149,29 +153,24 @@
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
jrnl_init(jc);
- cout << "[NOTE: Partially disabled until outstanding issue(s) resolved.] ";
for (int m=0; m<NUM_MSGS; m++)
{
create_xid(xid, m, XID_SIZE);
enq_txn_msg(jc, 3*m, create_msg(msg, m, MSG_SIZE), xid, false);
jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
+ txn_abort(jc, xid);
+ jc.flush();
read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
- txn_commit(jc, xid);
-// jc.flush();
-// read_msg(jc, rmsg, rxid, transientFlag, externalFlag);
-// BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg);
-// BOOST_CHECK_EQUAL(rxid, xid);
-// BOOST_CHECK_EQUAL(transientFlag, false);
-// BOOST_CHECK_EQUAL(externalFlag, false);
}
}
catch(const exception& e) { BOOST_FAIL(e.what()); }
cout << "ok" << endl;
}
-QPID_AUTO_TEST_CASE(enqueue_commit_dequeue_interleaved)
+QPID_AUTO_TEST_CASE(tx_enqueue_commit_dequeue_block)
{
- string test_name = get_test_name(test_filename, "enqueue_commit_dequeue_interleaved");
+ string test_name = get_test_name(test_filename, "tx_enqueue_commit_dequeue_block");
try
{
string msg;
@@ -183,7 +182,34 @@
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
jrnl_init(jc);
+ create_xid(xid, 2, XID_SIZE);
for (int m=0; m<NUM_MSGS; m++)
+ enq_txn_msg(jc, m, create_msg(msg, m, MSG_SIZE), xid, false);
+ txn_commit(jc, xid);
+ for (int m=0; m<NUM_MSGS; m++)
+ deq_msg(jc, m);
+ jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
+ }
+ catch(const exception& e) { BOOST_FAIL(e.what()); }
+ cout << "ok" << endl;
+}
+
+QPID_AUTO_TEST_CASE(tx_enqueue_commit_dequeue_interleaved)
+{
+ string test_name = get_test_name(test_filename, "tx_enqueue_commit_dequeue_interleaved");
+ try
+ {
+ string msg;
+ string xid;
+ string rmsg;
+ string rxid;
+ bool transientFlag;
+ bool externalFlag;
+
+ jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
+ jrnl_init(jc);
+ for (int m=0; m<NUM_MSGS; m++)
{
create_xid(xid, m, XID_SIZE);
enq_txn_msg(jc, 3*m, create_msg(msg, m, MSG_SIZE), xid, false);
@@ -197,9 +223,9 @@
cout << "ok" << endl;
}
-QPID_AUTO_TEST_CASE(enqueue_abort_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_tx_dequeue_commit_block)
{
- string test_name = get_test_name(test_filename, "enqueue_abort_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_tx_dequeue_commit_block");
try
{
string msg;
@@ -209,16 +235,114 @@
bool transientFlag;
bool externalFlag;
+ create_xid(xid, 3, XID_SIZE);
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
jrnl_init(jc);
for (int m=0; m<NUM_MSGS; m++)
+ enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), false);
+ for (int m=0; m<NUM_MSGS; m++)
+ deq_txn_msg(jc, m, xid);
+ jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
+ txn_commit(jc, xid);
+ jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
+ }
+ catch(const exception& e) { BOOST_FAIL(e.what()); }
+ cout << "ok" << endl;
+}
+
+QPID_AUTO_TEST_CASE(enqueue_tx_dequeue_commit_interleaved)
+{
+ string test_name = get_test_name(test_filename, "enqueue_tx_dequeue_commit_interleaved");
+ try
+ {
+ string msg;
+ string xid;
+ string rmsg;
+ string rxid;
+ bool transientFlag;
+ bool externalFlag;
+
+ jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
+ jrnl_init(jc);
+ for (int m=0; m<3*NUM_MSGS; m+=3)
{
+ enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), false);
create_xid(xid, m, XID_SIZE);
- enq_txn_msg(jc, 3*m, create_msg(msg, m, MSG_SIZE), xid, false);
+ deq_txn_msg(jc, m, xid);
jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
+ txn_commit(jc, xid);
+ jc.flush();
read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
+ }
+ }
+ catch(const exception& e) { BOOST_FAIL(e.what()); }
+ cout << "ok" << endl;
+}
+
+QPID_AUTO_TEST_CASE(enqueue_tx_dequeue_abort_block)
+{
+ string test_name = get_test_name(test_filename, "enqueue_tx_dequeue_abort_block");
+ try
+ {
+ string msg;
+ string xid;
+ string rmsg;
+ string rxid;
+ bool transientFlag;
+ bool externalFlag;
+
+ create_xid(xid, 4, XID_SIZE);
+ jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
+ jrnl_init(jc);
+ for (int m=0; m<NUM_MSGS; m++)
+ enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), false);
+ for (int m=0; m<NUM_MSGS; m++)
+ deq_txn_msg(jc, m, xid);
+ jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
+ txn_abort(jc, xid);
+ jc.flush();
+ for (int m=0; m<NUM_MSGS; m++)
+ {
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag);
+ BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg);
+ BOOST_CHECK_EQUAL(rxid.length(), size_t(0));
+ BOOST_CHECK_EQUAL(transientFlag, false);
+ BOOST_CHECK_EQUAL(externalFlag, false);
+ }
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
+ }
+ catch(const exception& e) { BOOST_FAIL(e.what()); }
+ cout << "ok" << endl;
+}
+
+QPID_AUTO_TEST_CASE(enqueue_tx_dequeue_abort_interleaved)
+{
+ string test_name = get_test_name(test_filename, "enqueue_tx_dequeue_abort_interleaved");
+ try
+ {
+ string msg;
+ string xid;
+ string rmsg;
+ string rxid;
+ bool transientFlag;
+ bool externalFlag;
+
+ jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
+ jrnl_init(jc);
+ for (int m=0; m<3*NUM_MSGS; m+=3)
+ {
+ enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), false);
+ create_xid(xid, m, XID_SIZE);
+ deq_txn_msg(jc, m, xid);
+ jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_TXPENDING);
txn_abort(jc, xid);
jc.flush();
+ read_msg(jc, rmsg, rxid, transientFlag, externalFlag);
read_msg(jc, rmsg, rxid, transientFlag, externalFlag, RHM_IORES_EMPTY);
}
}
16 years, 10 months
- 1
- 0
rhmessaging commits: r1764 - mgmt/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-03-06 13:25:07 -0500 (Thu, 06 Mar 2008)
New Revision: 1764
Modified:
mgmt/mint/python/mint/__init__.py
Log:
Add a method to navigate to the default vhost, if present
Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py 2008-03-06 16:26:43 UTC (rev 1763)
+++ mgmt/mint/python/mint/__init__.py 2008-03-06 18:25:07 UTC (rev 1764)
@@ -48,6 +48,13 @@
print "Connection failed: " + str(conn.exception)
print_exc()
+ def getDefaultVhost(self):
+ if self.broker:
+ try:
+ return Vhost.selectBy(broker=self.broker, name="/")[0]
+ except IndexError:
+ pass
+
class BrokerGroup(SQLObject):
class sqlmeta:
lazyUpdate = True
16 years, 10 months
- 1
- 0
rhmessaging commits: r1763 - store/trunk/cpp/lib/jrnl.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-03-06 11:26:43 -0500 (Thu, 06 Mar 2008)
New Revision: 1763
Modified:
store/trunk/cpp/lib/jrnl/wrfc.cpp
Log:
Additional bugfix in journal enqueue threshold claculations
Modified: store/trunk/cpp/lib/jrnl/wrfc.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-03-06 15:17:49 UTC (rev 1762)
+++ store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-03-06 16:26:43 UTC (rev 1763)
@@ -148,7 +148,7 @@
in_use |= fhp->enqcnt() > 0;
}
// Return true if threshold exceeded
- return findex != _fh_index && fhp->enqcnt() > 0;
+ return findex != _fh_index && in_use;
}
const std::string
16 years, 10 months
- 1
- 0
rhmessaging commits: r1762 - in store/trunk/cpp: tests/jrnl and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-03-06 10:17:49 -0500 (Thu, 06 Mar 2008)
New Revision: 1762
Modified:
store/trunk/cpp/lib/jrnl/wrfc.cpp
store/trunk/cpp/tests/jrnl/_st_basic.cpp
store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
Log:
Fixed bug in enqueue threshold calculations, fixed enqueue threshold and journal overflow tests in _st_basic
Modified: store/trunk/cpp/lib/jrnl/wrfc.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-03-05 15:22:53 UTC (rev 1761)
+++ store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-03-06 15:17:49 UTC (rev 1762)
@@ -28,6 +28,7 @@
* The GNU Lesser General Public License is available in the file COPYING.
*/
+#include <cmath>
#include <jrnl/wrfc.hpp>
#include <jrnl/jerrno.hpp>
#include <jrnl/jexception.hpp>
@@ -76,7 +77,8 @@
}
_fsize_sblks = fsize_sblks;
_fsize_dblks = fsize_sblks * JRNL_SBLK_SIZE;
- _enq_cap_offs_dblks = _fsize_dblks * _nfiles * (100 - JRNL_ENQ_THRESHOLD) / 100;
+ _enq_cap_offs_dblks = (u_int32_t)::ceil(_fsize_dblks * _nfiles *
+ (100.0 - JRNL_ENQ_THRESHOLD) / 100);
// Check the offset is at least one file; if not, make it so
if (_enq_cap_offs_dblks < _fsize_dblks)
_enq_cap_offs_dblks = _fsize_dblks;
@@ -104,17 +106,36 @@
return _reset_ok;
}
+
+/**
+* The following routine finds whether the next write will take the write pointer to beyond the
+* enqueue limit threshold. The following illustrates how this is achieved.
+*
+* Current file index: 4 +---+----------+
+* X's mark still-enqueued records |msg| 1-thresh |
+* msg = current msg size + unwritten cache +---+----------+
+* thresh = JRNL_ENQ_THRESHOLD as a fraction ^ V
+* +-------+-------+-------+-------+--+----+-------+-+-----+-------+
+* file num ->| 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 |
+* enq recs ->| X XX |XX XXX |XX XXXX|XXXXXXX|XX | | | X |
+* +-------+-------+-------+-------+--+----+-------+-+-----+-------+
+* ^ ^ ^
+* subm_dblks --+ | |
+* These files must be free of enqueues
+* If not, return true.
+*/
const bool
wrfc::enq_threshold(const u_int32_t enq_dsize_dblks) const
{
- u_int32_t subm_dblks = subm_cnt_dblks();
+ u_int32_t subm_dblks = subm_cnt_dblks(); // includes file hdr if > 0
// This compensates for new files which don't have their file headers written yet,
// as file header space cannot be included in this calculation.
- if (subm_dblks == 0)
- subm_dblks = 4;
+ if (subm_dblks != 0)
+ subm_dblks -= 4;
u_int32_t fwd_dblks = subm_dblks + enq_dsize_dblks + _enq_cap_offs_dblks;
u_int16_t findex = _fh_index;
nlfh* fhp = _curr_fh;
+ bool in_use = false;
while (fwd_dblks && !(findex != _fh_index && fhp->enqcnt()))
{
fwd_dblks -= fwd_dblks > _fsize_dblks ? _fsize_dblks : fwd_dblks;
@@ -124,7 +145,9 @@
findex = 0;
fhp = _fh_arr[findex];
}
+ in_use |= fhp->enqcnt() > 0;
}
+ // Return true if threshold exceeded
return findex != _fh_index && fhp->enqcnt() > 0;
}
Modified: store/trunk/cpp/tests/jrnl/_st_basic.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-03-05 15:22:53 UTC (rev 1761)
+++ store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-03-06 15:17:49 UTC (rev 1762)
@@ -336,9 +336,9 @@
cout << "ok" << endl;
}
-QPID_AUTO_TEST_CASE(journal_threshold_block)
+QPID_AUTO_TEST_CASE(journal_threshold)
{
- string test_name = get_test_name(test_filename, "journal_threshold_block");
+ string test_name = get_test_name(test_filename, "journal_threshold");
try
{
string msg;
@@ -351,58 +351,27 @@
u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES,
DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, LARGE_MSG_REC_SIZE_DBLKS);
for (m=0; m<t; m++)
- enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), true);
+ enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), false);
// This enqueue should exceed the threshold
- enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), true, RHM_IORES_ENQCAPTHRESH);
+ BOOST_CHECK_EQUAL(jc.get_enq_cnt(), t);
+ enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), false, RHM_IORES_ENQCAPTHRESH);
+ BOOST_CHECK_EQUAL(jc.get_enq_cnt(), t);
// Dequeue all msgs
for (m=0; m<t; m++)
deq_msg(jc, m);
+ BOOST_CHECK_EQUAL(jc.get_enq_cnt(), u_int32_t(0));
- cout << "[NOTE: Partially disabled until outstanding issue(s) resolved.] ";
-// // Fill journal to just below threshold
-// for (m=2*t; m<3*t; m++)
-// enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), true);
-// // This enqueue should exceed the threshold
-// enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), true, RHM_IORES_ENQCAPTHRESH);
+ // Check we can still enqueue and dequeue
+ for (m=2*t; m<2*t + NUM_MSGS; m++)
+ enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), false);
+ for (m=2*t; m<2*t + NUM_MSGS; m++)
+ deq_msg(jc, m);
}
catch(const exception& e) { BOOST_FAIL(e.what()); }
cout << "ok" << endl;
}
-QPID_AUTO_TEST_CASE(journal_threshold_interleaved)
-{
- string test_name = get_test_name(test_filename, "journal_threshold_interleaved");
- try
- {
- string msg;
-
- jcntl jc(test_name, JRNL_DIR, test_name, NUM_DEFAULT_JFILES, DEFAULT_JFSIZE_SBLKS);
- jrnl_init(jc);
- unsigned m;
-
- // Fill journal to just below threshold
- u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES,
- DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, LARGE_MSG_REC_SIZE_DBLKS);
- for (m=0; m<t; m++)
- enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), true);
- // This enqueue should exceed the threshold
- enq_msg(jc, m, create_msg(msg, m, LARGE_MSG_SIZE), true, RHM_IORES_ENQCAPTHRESH);
-
- cout << "[NOTE: Partially disabled until outstanding issue(s) resolved.] ";
- // Interleave dequeues and enqueues
-// for (m=0; m<t; m++)
-// {
-// u_int64_t msg_num = deq_msg(jc, m) + 1;
-// enq_msg(jc, msg_num, create_msg(msg, msg_num, LARGE_MSG_SIZE), true);
-// enq_msg(jc, msg_num + 1, create_msg(msg, msg_num + 1, LARGE_MSG_SIZE), true,
-// RHM_IORES_ENQCAPTHRESH);
-// }
- }
- catch(const exception& e) { BOOST_FAIL(e.what()); }
- cout << "ok" << endl;
-}
-
QPID_AUTO_TEST_CASE(journal_overflow)
{
string test_name = get_test_name(test_filename, "journal_overflow");
@@ -415,18 +384,18 @@
unsigned m;
// Fill journal to just below threshold
- cout << "[NOTE: Partially disabled until outstanding issue(s) resolved.] ";
- u_int32_t t = 10;
-// u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES,
-// DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, MSG_REC_SIZE_DBLKS);
+ u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES,
+ DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, MSG_REC_SIZE_DBLKS);
+ u_int32_t d = num_dequeues_rem(NUM_DEFAULT_JFILES, DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE);
for (m=0; m<t; m++)
- enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), true);
+ enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), false);
// This enqueue should exceed the threshold
-// enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), true, RHM_IORES_ENQCAPTHRESH);
+ enq_msg(jc, m, create_msg(msg, m, MSG_SIZE), false, RHM_IORES_ENQCAPTHRESH);
- // Dequeue all msgs except first
- for (m=1; m<t; m++)
+ // Dequeue as many msgs as possible except first
+ for (m=1; m<=d; m++)
deq_msg(jc, m);
+ deq_msg(jc, d+1, RHM_IORES_FULL);
}
catch(const exception& e) { BOOST_FAIL(e.what()); }
cout << "ok" << endl;
Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-03-05 15:22:53 UTC (rev 1761)
+++ store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-03-06 15:17:49 UTC (rev 1762)
@@ -236,20 +236,26 @@
}
const u_int32_t
-num_msgs_to_full(const u_int16_t num_files, const u_int32_t file_size_sblks,
+num_msgs_to_full(const u_int16_t num_files, const u_int32_t file_size_dblks,
const u_int32_t msg_rec_size_dblks)
{
- return u_int32_t(::floor(1.0 * num_files * file_size_sblks / msg_rec_size_dblks));
+ return u_int32_t(::floor(1.0 * num_files * file_size_dblks / msg_rec_size_dblks));
}
const u_int32_t
-num_msgs_to_threshold(const u_int16_t num_files, const u_int32_t file_size_sblks,
+num_msgs_to_threshold(const u_int16_t num_files, const u_int32_t file_size_dblks,
const u_int32_t msg_rec_size_dblks)
{
- return u_int32_t(::floor(1.0 * num_files * file_size_sblks * JRNL_ENQ_THRESHOLD /
+ return u_int32_t(::floor(1.0 * num_files * file_size_dblks * JRNL_ENQ_THRESHOLD /
msg_rec_size_dblks / 100));
}
+const u_int32_t
+num_dequeues_rem(const u_int16_t num_files, const u_int32_t file_size_sblks)
+{
+ return u_int32_t(::ceil(num_files * file_size_sblks * (1 - (1.0 * JRNL_ENQ_THRESHOLD / 100))));
+}
+
const string&
create_msg(string& s, const int msg_num, const int len)
{
16 years, 10 months
- 1
- 0
rhmessaging commits: r1761 - store/trunk/cpp/tests/jrnl/jtt.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-03-05 10:22:53 -0500 (Wed, 05 Mar 2008)
New Revision: 1761
Modified:
store/trunk/cpp/tests/jrnl/jtt/jtt.csv
Log:
reversing accidental commit of short test csv file
Modified: store/trunk/cpp/tests/jrnl/jtt/jtt.csv
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jtt.csv 2008-03-05 15:22:04 UTC (rev 1760)
+++ store/trunk/cpp/tests/jrnl/jtt/jtt.csv 2008-03-05 15:22:53 UTC (rev 1761)
@@ -6,3 +6,210 @@
,,,,,,,,,,,,,,,,,,,,
"Simple message combinations of persistent/deq transientueued/non-dequeued, transactional/non-transactional",,,,,,,,,,,,,,,,,,,,
1,"L",1,1,0,1,0,10,10,0,0,FALSE,FALSE,FALSE,54,1,0,0,0,0,"1 * 10-byte message"
+2,"L",1,10,0,10,0,10,10,0,0,FALSE,FALSE,FALSE,54,1,0,0,0,0,"10 * 10-byte message"
+3,"L",1,1,0,1,0,10,10,0,0,FALSE,TRUE,FALSE,54,1,0,0,0,0,"1 * 10-byte message [transient]"
+4,"L",1,10,0,10,0,10,10,0,0,FALSE,TRUE,FALSE,54,1,0,0,0,0,"10 * 10-byte message [transient]"
+5,"L",1,1,0,1,0,10,10,10,10,FALSE,FALSE,FALSE,64,1,0,0,0,0,"1 * 10-byte message [txn]"
+6,"L",1,10,0,10,0,10,10,10,10,FALSE,FALSE,FALSE,64,1,0,0,0,0,"10 * 10-byte message [txn]"
+7,"L",1,1,0,1,0,10,10,10,10,FALSE,TRUE,FALSE,64,1,0,0,0,0,"1 * 10-byte message [txn transient]"
+8,"L",1,10,0,10,0,10,10,10,10,FALSE,TRUE,FALSE,64,1,0,0,0,0,"10 * 10-byte message [txn transient]"
+9,"L",1,1,0,1,0,10,10,0,0,TRUE,FALSE,FALSE,54,1,32,1,0,0,"1 * 10-byte message [deq]"
+10,"L",1,10,0,10,0,10,10,0,0,TRUE,FALSE,FALSE,54,1,32,1,0,0,"10 * 10-byte message [deq]"
+11,"L",1,1,0,1,0,10,10,0,0,TRUE,TRUE,FALSE,54,1,32,1,0,0,"1 * 10-byte message [deq transient]"
+12,"L",1,10,0,10,0,10,10,0,0,TRUE,TRUE,FALSE,54,1,32,1,0,0,"10 * 10-byte message [deq transient]"
+13,"L",1,1,0,1,0,10,10,10,10,TRUE,FALSE,FALSE,64,1,54,1,46,1,"1 * 10-byte message [deq txn]"
+14,"L",1,10,0,10,0,10,10,10,10,TRUE,FALSE,FALSE,64,1,54,1,46,1,"10 * 10-byte message [deq txn]"
+15,"L",1,1,0,1,0,10,10,10,10,TRUE,TRUE,FALSE,64,1,54,1,46,1,"1 * 10-byte message [txn deq transient]"
+16,"L",1,10,0,10,0,10,10,10,10,TRUE,TRUE,FALSE,64,1,54,1,46,1,"10 * 10-byte message [txn deq transient]"
+17,"L",1,1,0,1,0,10,10,0,0,FALSE,FALSE,TRUE,54,1,0,0,0,0,"1 * 10-byte message [extern]"
+18,"L",1,10,0,10,0,10,10,0,0,FALSE,FALSE,TRUE,54,1,0,0,0,0,"10 * 10-byte message [extern]"
+19,"L",1,1,0,1,0,10,10,0,0,FALSE,TRUE,TRUE,54,1,0,0,0,0,"1 * 10-byte message [transient extern]"
+20,"L",1,10,0,10,0,10,10,0,0,FALSE,TRUE,TRUE,54,1,0,0,0,0,"10 * 10-byte message [transient extern]"
+21,"L",1,1,0,1,0,10,10,10,10,FALSE,FALSE,TRUE,64,1,0,0,0,0,"1 * 10-byte message [txn extern]"
+22,"L",1,10,0,10,0,10,10,10,10,FALSE,FALSE,TRUE,64,1,0,0,0,0,"10 * 10-byte message [txn extern]"
+23,"L",1,1,0,1,0,10,10,10,10,FALSE,TRUE,TRUE,64,1,0,0,0,0,"1 * 10-byte message [txn transient extern]"
+24,"L",1,10,0,10,0,10,10,10,10,FALSE,TRUE,TRUE,64,1,0,0,0,0,"10 * 10-byte message [txn transient extern]"
+25,"L",1,1,0,1,0,10,10,0,0,TRUE,FALSE,TRUE,54,1,32,1,0,0,"1 * 10-byte message [deq extern]"
+26,"L",1,10,0,10,0,10,10,0,0,TRUE,FALSE,TRUE,54,1,32,1,0,0,"10 * 10-byte message [deq extern]"
+27,"L",1,1,0,1,0,10,10,0,0,TRUE,TRUE,TRUE,54,1,32,1,0,0,"1 * 10-byte message [deq transient extern]"
+28,"L",1,10,0,10,0,10,10,0,0,TRUE,TRUE,TRUE,54,1,32,1,0,0,"10 * 10-byte message [deq transient extern]"
+29,"L",1,1,0,1,0,10,10,10,10,TRUE,FALSE,TRUE,64,1,54,1,46,1,"1 * 10-byte message [deq txn extern]"
+30,"L",1,10,0,10,0,10,10,10,10,TRUE,FALSE,TRUE,64,1,54,1,46,1,"10 * 10-byte message [deq txn extern]"
+31,"L",1,1,0,1,0,10,10,10,10,TRUE,TRUE,TRUE,64,1,54,1,46,1,"1 * 10-byte message [txn deq transient extern]"
+32,"L",1,10,0,10,0,10,10,10,10,TRUE,TRUE,TRUE,64,1,54,1,46,1,"10 * 10-byte message [txn deq transient extern]"
+,,,,,,,,,,,,,,,,,,,,
+"Transition from one d-block to two per message",,,,,,,,,,,,,,,,,,,,
+33,"L",1,10,0,10,0,84,84,0,0,FALSE,FALSE,FALSE,128,1,0,0,0,0,"1 dblk exact fit"
+34,"L",1,10,0,10,1,85,85,0,0,FALSE,FALSE,FALSE,129,2,0,0,0,0,"1 dblk + 1 byte"
+35,"L",1,10,0,10,0,58,58,26,26,FALSE,FALSE,FALSE,128,1,0,0,0,0,"1 dblk exact fit [txn]"
+36,"L",1,10,0,10,1,59,59,26,26,FALSE,FALSE,FALSE,129,2,0,0,0,0,"1 dblk + 1 byte [txn]"
+,,,,,,,,,,,,,,,,,,,,
+"Transition from one s-block to two per message",,,,,,,,,,,,,,,,,,,,
+37,"L",1,10,0,10,0,468,468,0,0,FALSE,FALSE,FALSE,512,4,0,0,0,0,"1 sblk exact fit"
+38,"L",1,10,0,10,1,469,469,0,0,FALSE,FALSE,FALSE,513,5,0,0,0,0,"1 sblk + 1 byte"
+39,"L",1,10,0,10,0,442,442,26,26,FALSE,FALSE,FALSE,512,4,0,0,0,0,"1 sblk exact fit [txn]"
+40,"L",1,10,0,10,1,443,443,26,26,FALSE,FALSE,FALSE,513,5,0,0,0,0,"1 sblk + 1 byte [txn]"
+,,,,,,,,,,,,,,,,,,,,
+"Transition from first page to second",,,,,,,,,,,,,,,,,,,,
+41,"L",1,8,0,8,0,4052,4052,0,0,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page"
+42,"L",1,8,1,9,0,4052,4052,0,0,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page"
+43,"L",1,8,0,8,1,4053,4053,0,0,FALSE,FALSE,FALSE,4097,33,0,0,0,0,"1/8 page + 1 byte"
+44,"L",1,8,0,8,0,3796,3796,256,256,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page [txn]"
+45,"L",1,8,1,9,0,3796,3796,256,256,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page [txn]"
+46,"L",1,8,0,8,1,3797,3797,256,256,FALSE,FALSE,FALSE,4097,33,0,0,0,0,"1/8 page + 1 byte [txn]"
+47,"L",1,8,0,8,0,3924,3924,0,0,TRUE,FALSE,FALSE,3968,31,32,1,0,0,"1/8 page incl deq [deq]"
+48,"L",1,8,1,9,0,3924,3924,0,0,TRUE,FALSE,FALSE,3968,31,32,1,0,0,"1/8 page incl deq [deq]"
+49,"L",1,8,0,8,1,3925,3925,0,0,TRUE,FALSE,FALSE,3969,32,32,1,0,0,"1/8 page incl deq + 1 byte [deq]"
+50,"L",1,8,0,8,0,3028,3028,256,256,TRUE,FALSE,FALSE,3328,26,300,3,292,3,"1/8 page incl deq & txn [deq txn]"
+51,"L",1,8,1,9,0,3028,3028,256,256,TRUE,FALSE,FALSE,3328,26,300,3,292,3,"1/8 page incl deq & txn [deq txn]"
+52,"L",1,8,0,8,1,3029,3029,256,256,TRUE,FALSE,FALSE,3329,27,300,3,292,3,"1/8 page incl deq & txn + 1 byte [deq txn]"
+,,,,,,,,,,,,,,,,,,,,
+"Page cache rollover (from page 32 back to page 0)",,,,,,,,,,,,,,,,,,,,
+53,"L",1,32,0,32,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
+54,"L",1,32,1,33,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
+55,"L",1,32,0,32,1,32725,32725,0,0,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte"
+56,"L",1.5,22,0,22,0,49108,49108,0,0,FALSE,FALSE,FALSE,49152,384,0,0,0,0,"1.5 pages"
+57,"L",1,32,0,32,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
+58,"L",1,32,1,33,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
+59,"L",1,32,0,32,1,32469,32469,256,256,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte [txn]"
+60,"L",1.5,22,0,22,0,48852,48852,256,256,FALSE,FALSE,FALSE,49152,384,0,0,0,0,"1.5 pages [txn]"
+61,"L",1,32,0,32,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
+62,"L",1,32,1,33,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
+63,"L",1,32,0,32,1,32597,32597,0,0,TRUE,FALSE,FALSE,32641,256,32,1,0,0,"1 page incl deq + 1 byte [deq]"
+64,"L",1.5,22,0,22,0,48980,48980,0,0,TRUE,FALSE,FALSE,49024,383,32,1,0,0,"1.5 pages incl deq [deq]"
+65,"L",1,32,0,32,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
+66,"L",1,32,1,33,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
+67,"L",1,32,0,32,1,31701,31701,256,256,TRUE,FALSE,FALSE,32001,251,300,3,292,3,"1 page incl deq & txn + 1 byte [deq txn]"
+68,"L",1.5,22,0,22,0,48084,48084,256,256,TRUE,FALSE,FALSE,48384,378,300,3,292,3,"1.5 pages incl deq & txn [deq txn]"
+,,,,,,,,,,,,,,,,,,,,
+"File transition (from file 0000 to 0001)",,,,,,,,,,,,,,,,,,,,
+69,"L",1,48,0,48,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
+70,"L",1,48,1,49,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
+71,"L",1,48,0,48,1,32725,32725,0,0,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte"
+72,"L",2.5,20,0,20,0,81876,81876,0,0,FALSE,FALSE,FALSE,81920,640,0,0,0,0,"2.5 pages"
+73,"L",1,48,0,48,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
+74,"L",1,48,1,49,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
+75,"L",1,48,0,48,1,32469,32469,256,256,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte [txn]"
+76,"L",2.5,20,0,20,0,81620,81620,256,256,FALSE,FALSE,FALSE,81920,640,0,0,0,0,"2.5 pages [txn]"
+77,"L",1,48,0,48,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
+78,"L",1,48,1,49,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
+79,"L",1,48,0,48,1,32597,32597,0,0,TRUE,FALSE,FALSE,32641,256,32,1,0,0,"1 page incl deq + 1 byte [deq]"
+80,"L",2.5,20,0,20,0,81748,81748,0,0,TRUE,FALSE,FALSE,81792,639,32,1,0,0,"2.5 pages incl deq [deq]"
+81,"L",1,48,0,48,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
+82,"L",1,48,1,49,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
+83,"L",1,48,0,48,1,31701,31701,256,256,TRUE,FALSE,FALSE,32001,251,300,3,292,3,"1 page incl deq & txn + 1 byte [deq txn]"
+84,"L",2.5,20,0,20,0,80852,80852,256,256,TRUE,FALSE,FALSE,81152,634,300,3,292,3,"2.5 pages incl deq & txn [deq txn]"
+,,,,,,,,,,,,,,,,,,,,
+"File rollover (from file 0007 to 0000) - RHM_WRONLY req'd for auto-dequeue == FALSE",,,,,,,,,,,,,,,,,,,,
+85,"L",0.5,16,0,16,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
+86,"L",0.5,16,1,17,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
+87,"L",0.5,16,0,16,1,786261,786261,0,0,TRUE,FALSE,FALSE,786305,6144,32,1,0,0,"24 pages incl deq + 1 byte [deq]"
+88,"L",0.5,16,0,16,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
+89,"L",0.5,16,1,17,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
+90,"L",0.5,16,0,16,1,785365,785365,256,256,TRUE,FALSE,FALSE,785665,6139,300,3,292,3,"24 pages incl deq & txn + 1 byte [deq txn]"
+91,"L",0.25,32,0,32,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
+92,"L",0.25,32,1,33,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
+93,"L",0.25,32,0,32,1,786261,786261,0,0,TRUE,FALSE,FALSE,786305,6144,32,1,0,0,"24 pages incl deq + 1 byte [deq]"
+94,"L",0.25,32,0,32,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
+95,"L",0.25,32,1,33,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
+96,"L",0.25,32,0,32,1,785365,785365,256,256,TRUE,FALSE,FALSE,785665,6139,300,3,292,3,"24 pages incl deq & txn + 1 byte [deq txn]"
+,,,,,,,,,,,,,,,,,,,,
+"Multi-page messages (large messages) - tests various paths in encoder.",,,,,,,,,,,,,,,,,,,,
+97,"L",1,16,0,16,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"data 1 page"
+98,"L",1,16,0,16,1,32725,32725,0,0,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"data 1 page + 1 byte (tail split; 1 byte over page boundary)"
+99,"L",1,16,0,16,11,32735,32735,0,0,FALSE,FALSE,FALSE,32779,257,0,0,0,0,"data 1 page + 11 bytes (tail split; 11 bytes over page boundary)"
+100,"L",1,16,0,16,12,32736,32736,0,0,FALSE,FALSE,FALSE,32780,257,0,0,0,0,"data 1 page + 12 bytes (tail separated exactly onto next page)"
+101,"L",1,16,0,16,13,32737,32737,0,0,FALSE,FALSE,FALSE,32781,257,0,0,0,0,"data 1 page + 13 bytes (data split; 1 byte over page boundary)"
+102,"L",1,16,0,16,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"data 1 page [txn]"
+103,"L",1,16,0,16,1,32469,32469,256,256,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"data 1 page + 1 byte (tail split; 1 byte over page boundary) [txn]"
+104,"L",1,16,0,16,11,32479,32479,256,256,FALSE,FALSE,FALSE,32779,257,0,0,0,0,"data 1 page + 11 bytes (tail split; 11 bytes over page boundary) [txn]"
+105,"L",1,16,0,16,12,32480,32480,256,256,FALSE,FALSE,FALSE,32780,257,0,0,0,0,"data 1 page + 12 bytes (tail separated exactly onto next page) [txn]"
+106,"L",1,16,0,16,13,32481,32481,256,256,FALSE,FALSE,FALSE,32781,257,0,0,0,0,"data 1 page + 13 bytes (data split; 1 byte over page boundary) [txn]"
+107,"L",2,16,0,16,0,65492,65492,0,0,FALSE,FALSE,FALSE,65536,512,0,0,0,0,"data 2 pages"
+108,"L",2,16,0,16,1,65493,65493,0,0,FALSE,FALSE,FALSE,65537,513,0,0,0,0,"data 2 pages + 1 byte (tail split; 1 byte over page boundary)"
+109,"L",2,16,0,16,11,65503,65503,0,0,FALSE,FALSE,FALSE,65547,513,0,0,0,0,"data 2 pages + 11 bytes (tail split; 11 bytes over page boundary)"
+110,"L",2,16,0,16,12,65504,65504,0,0,FALSE,FALSE,FALSE,65548,513,0,0,0,0,"data 2 pages + 12 bytes (tail separated exactly onto next page)"
+111,"L",2,16,0,16,13,65505,65505,0,0,FALSE,FALSE,FALSE,65549,513,0,0,0,0,"data 2 pages + 13 bytes (data split; 1 byte over page boundary)"
+112,"L",2,16,0,16,0,65236,65236,256,256,FALSE,FALSE,FALSE,65536,512,0,0,0,0,"data 2 pages [txn]"
+113,"L",2,16,0,16,1,65237,65237,256,256,FALSE,FALSE,FALSE,65537,513,0,0,0,0,"data 2 pages + 1 byte (tail split; 1 byte over page boundary) [txn]"
+114,"L",2,16,0,16,11,65247,65247,256,256,FALSE,FALSE,FALSE,65547,513,0,0,0,0,"data 2 pages + 11 bytes (tail split; 11 bytes over page boundary) [txn]"
+115,"L",2,16,0,16,12,65248,65248,256,256,FALSE,FALSE,FALSE,65548,513,0,0,0,0,"data 2 pages + 12 bytes (tail separated exactly onto next page) [txn]"
+116,"L",2,16,0,16,13,65249,65249,256,256,FALSE,FALSE,FALSE,65549,513,0,0,0,0,"data 2 pages + 13 bytes (data split; 1 byte over page boundary) [txn]"
+117,"L",4,16,0,16,0,131028,131028,0,0,FALSE,FALSE,FALSE,131072,1024,0,0,0,0,"data 4 pages"
+118,"L",4,16,0,16,1,131029,131029,0,0,FALSE,FALSE,FALSE,131073,1025,0,0,0,0,"data 4 pages + 1 byte (tail split; 1 byte over page boundary)"
+119,"L",4,16,0,16,11,131039,131039,0,0,FALSE,FALSE,FALSE,131083,1025,0,0,0,0,"data 4 pages + 11 bytes (tail split; 11 bytes over page boundary)"
+120,"L",4,16,0,16,12,131040,131040,0,0,FALSE,FALSE,FALSE,131084,1025,0,0,0,0,"data 4 pages + 12 bytes (tail separated exactly onto next page)"
+121,"L",4,16,0,16,13,131041,131041,0,0,FALSE,FALSE,FALSE,131085,1025,0,0,0,0,"data 4 pages + 13 bytes (data split; 1 byte over page boundary)"
+122,"L",4,16,0,16,0,130772,130772,256,256,FALSE,FALSE,FALSE,131072,1024,0,0,0,0,"data 4 pages [txn]"
+123,"L",4,16,0,16,1,130773,130773,256,256,FALSE,FALSE,FALSE,131073,1025,0,0,0,0,"data 4 pages + 1 byte (tail split; 1 byte over page boundary) [txn]"
+124,"L",4,16,0,16,11,130783,130783,256,256,FALSE,FALSE,FALSE,131083,1025,0,0,0,0,"data 4 pages + 11 bytes (tail split; 11 bytes over page boundary) [txn]"
+125,"L",4,16,0,16,12,130784,130784,256,256,FALSE,FALSE,FALSE,131084,1025,0,0,0,0,"data 4 pages + 12 bytes (tail separated exactly onto next page) [txn]"
+126,"L",4,16,0,16,13,130785,130785,256,256,FALSE,FALSE,FALSE,131085,1025,0,0,0,0,"data 4 pages + 13 bytes (data split; 1 byte over page boundary) [txn]"
+127,"L",3.5,16,0,16,0,114644,114644,0,0,FALSE,FALSE,FALSE,114688,896,0,0,0,0,"data 3.5 pages"
+128,"L",3.5,16,0,16,1,114645,114645,0,0,FALSE,FALSE,FALSE,114689,897,0,0,0,0,"data 3.5 pages + 1 byte"
+129,"L",3.5,16,0,16,0,114388,114388,256,256,FALSE,FALSE,FALSE,114688,896,0,0,0,0,"data 3.5 pages [txn]"
+130,"L",3.5,16,0,16,1,114389,114389,256,256,FALSE,FALSE,FALSE,114689,897,0,0,0,0,"data 3.5 pages + 1 byte [txn]"
+131,"L",1,16,0,16,-1,10,10,32735,32735,FALSE,FALSE,FALSE,32789,257,0,0,0,0,"xid 1 page – 1 byte; data 10 bytes (exact fit) [txn]"
+132,"L",1,16,0,16,0,10,10,32736,32736,FALSE,FALSE,FALSE,32790,257,0,0,0,0,"xid 1 page; data 10 bytes (exact fit) [txn]"
+133,"L",1,16,0,16,1,10,10,32737,32737,FALSE,FALSE,FALSE,32791,257,0,0,0,0,"xid 1 page + 1 byte; data 10 bytes (exact fit) [txn]"
+134,"L",2,16,0,16,-1,10,10,65503,65503,FALSE,FALSE,FALSE,65557,513,0,0,0,0,"xid 2 pages – 1 byte; data 10 bytes (exact fit) [txn]"
+135,"L",2,16,0,16,0,10,10,65504,65504,FALSE,FALSE,FALSE,65558,513,0,0,0,0,"xid 2 pages; data 10 bytes (exact fit) [txn]"
+136,"L",2,16,0,16,1,10,10,65505,65505,FALSE,FALSE,FALSE,65559,513,0,0,0,0,"xid 2 pages + 1 byte; data 10 bytes (exact fit) [txn]"
+137,"L",4,16,0,16,-1,10,10,131039,131039,FALSE,FALSE,FALSE,131093,1025,0,0,0,0,"xid 4 pages – 1 byte; data 10 bytes (exact fit) [txn]"
+138,"L",4,16,0,16,0,10,10,131040,131040,FALSE,FALSE,FALSE,131094,1025,0,0,0,0,"xid 4 pages; data 10 bytes (exact fit) [txn]"
+139,"L",4,16,0,16,1,10,10,131041,131041,FALSE,FALSE,FALSE,131095,1025,0,0,0,0,"xid 4 pages + 1 byte; data 10 bytes (exact fit) [txn]"
+140,"L",3.5,16,0,16,0,10,10,114656,114656,FALSE,FALSE,FALSE,114710,897,0,0,0,0,"xid 3.5 pages; data 10 bytes (exact fit) [txn]"
+141,"L",3.5,16,0,16,1,10,10,114657,114657,FALSE,FALSE,FALSE,114711,897,0,0,0,0,"xid 3.5 pages + 1 byte; data 10 bytes (exact fit) [txn]"
+142,"L",1,16,0,16,-1,10,10,32735,32735,TRUE,FALSE,FALSE,32789,257,32779,257,32771,257,"xid 1 page – 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
+143,"L",1,16,0,16,0,10,10,32736,32736,TRUE,FALSE,FALSE,32790,257,32780,257,32772,257,"xid 1 page for enq rec; data 10 bytes (exact fit) [deq, txn]"
+144,"L",1,16,0,16,1,10,10,32737,32737,TRUE,FALSE,FALSE,32791,257,32781,257,32773,257,"xid 1 page + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
+145,"L",2,16,0,16,-1,10,10,65503,65503,TRUE,FALSE,FALSE,65557,513,65547,513,65539,513,"xid 2 pages – 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
+146,"L",2,16,0,16,0,10,10,65504,65504,TRUE,FALSE,FALSE,65558,513,65548,513,65540,513,"xid 2 pages for enq rec; data 10 bytes (exact fit) [deq, txn]"
+147,"L",2,16,0,16,1,10,10,65505,65505,TRUE,FALSE,FALSE,65559,513,65549,513,65541,513,"xid 2 pages + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
+148,"L",4,16,0,16,-1,10,10,131039,131039,TRUE,FALSE,FALSE,131093,1025,131083,1025,131075,1025,"xid 4 pages – 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
+149,"L",4,16,0,16,0,10,10,131040,131040,TRUE,FALSE,FALSE,131094,1025,131084,1025,131076,1025,"xid 4 pages for enq rec; data 10 bytes (exact fit) [deq, txn]"
+150,"L",4,16,0,16,1,10,10,131041,131041,TRUE,FALSE,FALSE,131095,1025,131085,1025,131077,1025,"xid 4 pages + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
+151,"L",3.5,16,0,16,0,10,10,114656,114656,TRUE,FALSE,FALSE,114710,897,114700,897,114692,897,"xid 3.5 pages for enq rec; data 10 bytes (exact fit) [deq, txn]"
+152,"L",3.5,16,0,16,1,10,10,114657,114657,TRUE,FALSE,FALSE,114711,897,114701,897,114693,897,"xid 3.5 pages + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
+153,"L",1,16,0,16,-1,10,10,32735,32735,TRUE,FALSE,FALSE,32789,257,32779,257,32771,257,"xid 1 page – 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
+154,"L",1,16,0,16,0,10,10,32736,32736,TRUE,FALSE,FALSE,32790,257,32780,257,32772,257,"xid 1 page for deq rec; data 10 bytes (exact fit) [deq, txn]"
+155,"L",1,16,0,16,1,10,10,32737,32737,TRUE,FALSE,FALSE,32791,257,32781,257,32773,257,"xid 1 page + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
+156,"L",2,16,0,16,-1,10,10,65503,65503,TRUE,FALSE,FALSE,65557,513,65547,513,65539,513,"xid 2 pages – 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
+157,"L",2,16,0,16,0,10,10,65504,65504,TRUE,FALSE,FALSE,65558,513,65548,513,65540,513,"xid 2 pages for deq rec; data 10 bytes (exact fit) [deq, txn]"
+158,"L",2,16,0,16,1,10,10,65505,65505,TRUE,FALSE,FALSE,65559,513,65549,513,65541,513,"xid 2 pages + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
+159,"L",4,16,0,16,-1,10,10,131039,131039,TRUE,FALSE,FALSE,131093,1025,131083,1025,131075,1025,"xid 4 pages – 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
+160,"L",4,16,0,16,0,10,10,131040,131040,TRUE,FALSE,FALSE,131094,1025,131084,1025,131076,1025,"xid 4 pages for deq rec; data 10 bytes (exact fit) [deq, txn]"
+161,"L",4,16,0,16,1,10,10,131041,131041,TRUE,FALSE,FALSE,131095,1025,131085,1025,131077,1025,"xid 4 pages + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
+162,"L",3.5,16,0,16,0,10,10,114656,114656,TRUE,FALSE,FALSE,114710,897,114700,897,114692,897,"xid 3.5 pages for deq rec; data 10 bytes (exact fit) [deq, txn]"
+163,"L",3.5,16,0,16,1,10,10,114657,114657,TRUE,FALSE,FALSE,114711,897,114701,897,114693,897,"xid 3.5 pages + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
+164,"L",1,16,0,16,-1,10,10,32743,32743,TRUE,FALSE,FALSE,32797,257,32787,257,32779,257,"xid 1 page – 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
+165,"L",1,16,0,16,0,10,10,32744,32744,TRUE,FALSE,FALSE,32798,257,32788,257,32780,257,"xid 1 page for txn rec; data 10 bytes (exact fit) [deq, txn]"
+166,"L",1,16,0,16,1,10,10,32745,32745,TRUE,FALSE,FALSE,32799,257,32789,257,32781,257,"xid 1 page + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
+167,"L",2,16,0,16,-1,10,10,65511,65511,TRUE,FALSE,FALSE,65565,513,65555,513,65547,513,"xid 2 pages – 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
+168,"L",2,16,0,16,0,10,10,65512,65512,TRUE,FALSE,FALSE,65566,513,65556,513,65548,513,"xid 2 pages for txn rec; data 10 bytes (exact fit) [deq, txn]"
+169,"L",2,16,0,16,1,10,10,65513,65513,TRUE,FALSE,FALSE,65567,513,65557,513,65549,513,"xid 2 pages + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
+170,"L",4,16,0,16,-1,10,10,131047,131047,TRUE,FALSE,FALSE,131101,1025,131091,1025,131083,1025,"xid 4 pages – 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
+171,"L",4,16,0,16,0,10,10,131048,131048,TRUE,FALSE,FALSE,131102,1025,131092,1025,131084,1025,"xid 4 pages for txn rec; data 10 bytes (exact fit) [deq, txn]"
+172,"L",4,16,0,16,1,10,10,131049,131049,TRUE,FALSE,FALSE,131103,1025,131093,1025,131085,1025,"xid 4 pages + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
+173,"L",3.5,16,0,16,0,10,10,114664,114664,TRUE,FALSE,FALSE,114718,897,114708,897,114700,897,"xid 3.5 pages for txn rec; data 10 bytes (exact fit) [deq, txn]"
+174,"L",3.5,16,0,16,1,10,10,114665,114665,TRUE,FALSE,FALSE,114719,897,114709,897,114701,897,"xid 3.5 pages + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
+,,,,,,,,,,,,,,,,,,,,
+"High volume tests of random message lengths - RHM_WRONLY req'd for auto-dequeue == FALSE",,,,,,,,,,,,,,,,,,,,
+#175,"M",1,5000000,0,5000000,0,0,84,0,0,TRUE,FALSE,FALSE,128,1,32,1,0,0,"1 dblk max [deq]"
+#176,"M",3,3000000,0,3000000,0,0,340,0,0,TRUE,FALSE,FALSE,384,3,32,1,0,0,"3 dblks max [deq]"
+#177,"M",10,1600000,0,1600000,0,0,1236,0,0,TRUE,FALSE,FALSE,1280,10,32,1,0,0,"10 dblks max [deq]"
+#178,"M",30,600000,0,600000,0,0,3796,0,0,TRUE,FALSE,FALSE,3840,30,32,1,0,0,"30 dblks max [deq]"
+#179,"M",100,200000,0,200000,0,0,12756,0,0,TRUE,FALSE,FALSE,12800,100,32,1,0,0,"100 dblks max [deq]"
+#180,"M",300,60000,0,60000,0,0,38356,0,0,TRUE,FALSE,FALSE,38400,300,32,1,0,0,"300 dblks max [deq]"
+#181,"M",1000,20000,0,20000,0,0,127956,0,0,TRUE,FALSE,FALSE,128000,1000,32,1,0,0,"1000 dblks max [deq]"
+#182,"M",1,5000000,0,5000000,0,0,100,1,100,TRUE,FALSE,FALSE,244,2,144,2,136,2,"100 bytes xid max + 100 bytes data max [deq txn]"
+#183,"M",3,3000000,0,3000000,0,0,300,1,300,TRUE,FALSE,FALSE,644,6,344,3,336,3,"300 bytes xid max + 300 bytes data max [deq txn]"
+#184,"M",10,1600000,0,1600000,0,0,1000,1,1000,TRUE,FALSE,FALSE,2044,16,1044,9,1036,9,"1000 bytes xid max + 1000 bytes data max [deq txn]"
+#185,"M",30,600000,0,600000,0,0,3000,1,3000,TRUE,FALSE,FALSE,6044,48,3044,24,3036,24,"3000 bytes xid max + 3000 bytes data max [deq txn]"
+#186,"M",100,200000,0,200000,0,0,10000,1,10000,TRUE,FALSE,FALSE,20044,157,10044,79,10036,79,"10000 bytes xid max + 10000 bytes data max [deq txn]"
+#187,"M",300,60000,0,60000,0,0,30000,1,30000,TRUE,FALSE,FALSE,60044,470,30044,235,30036,235,"30000 bytes xid max + 30000 bytes data max [deq txn]"
+#188,"M",1000,20000,0,20000,0,0,100000,1,100000,TRUE,FALSE,FALSE,200044,1563,100044,782,100036,782,"100000 bytes xid max + 100000 bytes data max [deq txn]"
+,,,,,,,,,,,,,,,,,,,,
+"STANDARD PERFORMANCE BENCHMARK: 10,000,000 writes, data=212b (2 dblks)",,,,,,,,,,,,,,,,,,,,
+#189,"M",1,10000000,0,10000000,0,212,212,0,0,TRUE,FALSE,FALSE,256,2,32,1,0,0,"212 bytes data (2 dblks enq + 1 dblk deq)"
+#190,"M",1,10000000,0,10000000,0,148,148,64,64,TRUE,FALSE,FALSE,256,2,108,1,100,1,"148 bytes data + 64 bytes xid (2 dblks enq + 1 dblks deq + 1 dblks txn)"
16 years, 10 months
- 1
- 0
rhmessaging commits: r1760 - in store/trunk/cpp/tests: jrnl and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2008-03-05 10:22:04 -0500 (Wed, 05 Mar 2008)
New Revision: 1760
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
store/trunk/cpp/tests/jrnl/_st_basic.cpp
store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp
store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
store/trunk/cpp/tests/jrnl/_st_read.cpp
store/trunk/cpp/tests/jrnl/_st_read_txn.cpp
store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp
store/trunk/cpp/tests/jrnl/_ut_jdir.cpp
store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp
store/trunk/cpp/tests/jrnl/_ut_jexception.cpp
store/trunk/cpp/tests/jrnl/_ut_jinf.cpp
store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp
store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp
store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp
store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp
store/trunk/cpp/tests/jrnl/jtt/jtt.csv
store/trunk/cpp/tests/unit_test.h
Log:
Updated tests to allow to run under boost 1.32 as well as the original 1.33 and 1.34
Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/OrderingTest.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -42,7 +42,7 @@
QPID_AUTO_TEST_SUITE(OrderingTest)
-const std::string file("OrderingTest");
+const std::string test_filename("OrderingTest");
// === Helper fns ===
@@ -142,30 +142,30 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(BasicSync)
+QPID_AUTO_TEST_CASE(BasicSync)
{
- std::cout << file << ".BasicSync: " << std::flush;
+ std::cout << test_filename << ".BasicSync: " << std::flush;
testBasic(false);
std::cout << "ok" << std::endl;
}
-BOOST_AUTO_TEST_CASE(BasicAsync)
+QPID_AUTO_TEST_CASE(BasicAsync)
{
- std::cout << file << ".BasicAsync: " << std::flush;
+ std::cout << test_filename << ".BasicAsync: " << std::flush;
testBasic(true);
std::cout << "ok" << std::endl;
}
-BOOST_AUTO_TEST_CASE(CycleSync)
+QPID_AUTO_TEST_CASE(CycleSync)
{
- std::cout << file << ".CycleSync: " << std::flush;
+ std::cout << test_filename << ".CycleSync: " << std::flush;
testCycle(false);
std::cout << "ok" << std::endl;
}
-BOOST_AUTO_TEST_CASE(CycleAsync)
+QPID_AUTO_TEST_CASE(CycleAsync)
{
- std::cout << file << ".CycleAsync: " << std::flush;
+ std::cout << test_filename << ".CycleAsync: " << std::flush;
testCycle(true);
std::cout << "ok" << std::endl;
}
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -46,7 +46,7 @@
QPID_AUTO_TEST_SUITE(SimpleTest)
-const string file("SimpleTest");
+const string test_filename("SimpleTest");
// === Helper fns ===
@@ -574,184 +574,184 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(CreateDeleteSync)
+QPID_AUTO_TEST_CASE(CreateDeleteSync)
{
- cout << file << ".CreateDeleteSync: " << flush;
+ cout << test_filename << ".CreateDeleteSync: " << flush;
testCreateDelete(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(CreateDeleteAsync)
+QPID_AUTO_TEST_CASE(CreateDeleteAsync)
{
- cout << file << ".CreateDeleteAsync: " << flush;
+ cout << test_filename << ".CreateDeleteAsync: " << flush;
testCreateDelete(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(EmptyRecoverSync)
+QPID_AUTO_TEST_CASE(EmptyRecoverSync)
{
- cout << file << ".EmptyRecoverSync: " << flush;
+ cout << test_filename << ".EmptyRecoverSync: " << flush;
testEmptyRecover(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(EmptyRecoverAsync)
+QPID_AUTO_TEST_CASE(EmptyRecoverAsync)
{
- cout << file << ".EmptyRecoverAsync: " << flush;
+ cout << test_filename << ".EmptyRecoverAsync: " << flush;
testEmptyRecover(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(QueueCreateSync)
+QPID_AUTO_TEST_CASE(QueueCreateSync)
{
- cout << file << ".QueueCreateSync: " << flush;
+ cout << test_filename << ".QueueCreateSync: " << flush;
testQueueCreate(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(QueueCreateAsync)
+QPID_AUTO_TEST_CASE(QueueCreateAsync)
{
- cout << file << ".QueueCreateAsync: " << flush;
+ cout << test_filename << ".QueueCreateAsync: " << flush;
testQueueCreate(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(QueueCreateWithSettingsSync)
+QPID_AUTO_TEST_CASE(QueueCreateWithSettingsSync)
{
- cout << file << ".QueueCreateWithSettingsSync: " << flush;
+ cout << test_filename << ".QueueCreateWithSettingsSync: " << flush;
testQueueCreateWithSettings(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(QueueCreateWithSettingsAsync)
+QPID_AUTO_TEST_CASE(QueueCreateWithSettingsAsync)
{
- cout << file << ".QueueCreateWithSettingsAsync: " << flush;
+ cout << test_filename << ".QueueCreateWithSettingsAsync: " << flush;
testQueueCreateWithSettings(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(QueueDestroySync)
+QPID_AUTO_TEST_CASE(QueueDestroySync)
{
- cout << file << ".QueueDestroySync: " << flush;
+ cout << test_filename << ".QueueDestroySync: " << flush;
testQueueDestroy(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(QueueDestroyAsync)
+QPID_AUTO_TEST_CASE(QueueDestroyAsync)
{
- cout << file << ".QueueDestroyAsync: " << flush;
+ cout << test_filename << ".QueueDestroyAsync: " << flush;
testQueueDestroy(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(EnqueueSync)
+QPID_AUTO_TEST_CASE(EnqueueSync)
{
- cout << file << ".EnqueueSync: " << flush;
+ cout << test_filename << ".EnqueueSync: " << flush;
testEnqueue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(EnqueueAsync)
+QPID_AUTO_TEST_CASE(EnqueueAsync)
{
- cout << file << ".EnqueueAsync: " << flush;
+ cout << test_filename << ".EnqueueAsync: " << flush;
testEnqueue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(DequeueSync)
+QPID_AUTO_TEST_CASE(DequeueSync)
{
- cout << file << ".DequeueSync: " << flush;
+ cout << test_filename << ".DequeueSync: " << flush;
testDequeue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(DequeueAsync)
+QPID_AUTO_TEST_CASE(DequeueAsync)
{
- cout << file << ".DequeueAsync: " << flush;
+ cout << test_filename << ".DequeueAsync: " << flush;
testDequeue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(StagingSync)
+QPID_AUTO_TEST_CASE(StagingSync)
{
- cout << file << ".StagingSync: " << flush;
+ cout << test_filename << ".StagingSync: " << flush;
testStaging(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(StagingAsync)
+QPID_AUTO_TEST_CASE(StagingAsync)
{
- cout << file << ".StagingAsync: " << flush;
+ cout << test_filename << ".StagingAsync: " << flush;
testStaging(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(DestroyStagedMessageSync)
+QPID_AUTO_TEST_CASE(DestroyStagedMessageSync)
{
- cout << file << ".DestroyStagedMessageSync: " << flush;
+ cout << test_filename << ".DestroyStagedMessageSync: " << flush;
testDestroyStagedMessage(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(DestroyStagedMessageAsync)
+QPID_AUTO_TEST_CASE(DestroyStagedMessageAsync)
{
- cout << file << ".DestroyStagedMessageAsync: " << flush;
+ cout << test_filename << ".DestroyStagedMessageAsync: " << flush;
testDestroyStagedMessage(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(DestroyEnqueuedMessageSync)
+QPID_AUTO_TEST_CASE(DestroyEnqueuedMessageSync)
{
- cout << file << ".DestroyEnqueuedMessageSync: " << flush;
+ cout << test_filename << ".DestroyEnqueuedMessageSync: " << flush;
testDestroyEnqueuedMessage(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(DestroyEnqueuedMessageAsync)
+QPID_AUTO_TEST_CASE(DestroyEnqueuedMessageAsync)
{
- cout << file << ".DestroyEnqueuedMessageAsync: " << flush;
+ cout << test_filename << ".DestroyEnqueuedMessageAsync: " << flush;
testDestroyEnqueuedMessage(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(ExchangeCreateAndDestroySync)
+QPID_AUTO_TEST_CASE(ExchangeCreateAndDestroySync)
{
- cout << file << ".ExchangeCreateAndDestroySync: " << flush;
+ cout << test_filename << ".ExchangeCreateAndDestroySync: " << flush;
testExchangeCreateAndDestroy(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(ExchangeCreateAndDestroyAsync)
+QPID_AUTO_TEST_CASE(ExchangeCreateAndDestroyAsync)
{
- cout << file << ".ExchangeCreateAndDestroyAsync: " << flush;
+ cout << test_filename << ".ExchangeCreateAndDestroyAsync: " << flush;
testExchangeCreateAndDestroy(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(ExchangeBindAndUnbindSync)
+QPID_AUTO_TEST_CASE(ExchangeBindAndUnbindSync)
{
- cout << file << ".ExchangeBindAndUnbindSync: " << flush;
+ cout << test_filename << ".ExchangeBindAndUnbindSync: " << flush;
testExchangeBindAndUnbind(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(ExchangeBindAndUnbindAsync)
+QPID_AUTO_TEST_CASE(ExchangeBindAndUnbindAsync)
{
- cout << file << ".ExchangeBindAndUnbindAsync: " << flush;
+ cout << test_filename << ".ExchangeBindAndUnbindAsync: " << flush;
testExchangeBindAndUnbind(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(ExchangeImplicitUnbindSync)
+QPID_AUTO_TEST_CASE(ExchangeImplicitUnbindSync)
{
- cout << file << ".ExchangeImplicitUnbindSync: " << flush;
+ cout << test_filename << ".ExchangeImplicitUnbindSync: " << flush;
testExchangeImplicitUnbind(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(ExchangeImplicitUnbindAsync)
+QPID_AUTO_TEST_CASE(ExchangeImplicitUnbindAsync)
{
- cout << file << ".ExchangeImplicitUnbindAsync: " << flush;
+ cout << test_filename << ".ExchangeImplicitUnbindAsync: " << flush;
testExchangeImplicitUnbind(true);
cout << "ok" << endl;
}
Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/TransactionalTest.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -43,7 +43,7 @@
QPID_AUTO_TEST_SUITE(TransactionalTest)
-const string file("TransactionalTest");
+const string test_filename("TransactionalTest");
// === Helper fns ===
@@ -139,30 +139,30 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(CommitSync)
+QPID_AUTO_TEST_CASE(CommitSync)
{
- cout << file << ".CommitSync: " << flush;
+ cout << test_filename << ".CommitSync: " << flush;
swap(true, false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(CommitAsync)
+QPID_AUTO_TEST_CASE(CommitAsync)
{
- cout << file << ".CommitAsync: " << flush;
+ cout << test_filename << ".CommitAsync: " << flush;
swap(true, true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortSync)
+QPID_AUTO_TEST_CASE(AbortSync)
{
- cout << file << ".AbortSync: " << flush;
+ cout << test_filename << ".AbortSync: " << flush;
swap(false, false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortAsync)
+QPID_AUTO_TEST_CASE(AbortAsync)
{
- cout << file << ".AbortAsync: " << flush;
+ cout << test_filename << ".AbortAsync: " << flush;
swap(false, true);
cout << "ok" << endl;
}
Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -43,7 +43,7 @@
QPID_AUTO_TEST_SUITE(TwoPhaseCommitTest)
-const string file("TwoPhaseCommitTest");
+const string test_filename("TwoPhaseCommitTest");
// === Helper fns ===
@@ -373,156 +373,156 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(CommitSwapSync)
+QPID_AUTO_TEST_CASE(CommitSwapSync)
{
- cout << file << ".CommitSwapSync: " << flush;
+ cout << test_filename << ".CommitSwapSync: " << flush;
tpct.testCommitSwap(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(PrepareAndAbortSwapSync)
+QPID_AUTO_TEST_CASE(PrepareAndAbortSwapSync)
{
- cout << file << ".PrepareAndAbortSwapSync: " << flush;
+ cout << test_filename << ".PrepareAndAbortSwapSync: " << flush;
tpct.testPrepareAndAbortSwap(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortNoPrepareSwapSync)
+QPID_AUTO_TEST_CASE(AbortNoPrepareSwapSync)
{
- cout << file << ".AbortNoPrepareSwapSync: " << flush;
+ cout << test_filename << ".AbortNoPrepareSwapSync: " << flush;
tpct.testAbortNoPrepareSwap(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(CommitEnqueueSync)
+QPID_AUTO_TEST_CASE(CommitEnqueueSync)
{
- cout << file << ".CommitEnqueueSync: " << flush;
+ cout << test_filename << ".CommitEnqueueSync: " << flush;
tpct.testCommitEnqueue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(PrepareAndAbortEnqueueSync)
+QPID_AUTO_TEST_CASE(PrepareAndAbortEnqueueSync)
{
- cout << file << ".PrepareAndAbortEnqueueSync: " << flush;
+ cout << test_filename << ".PrepareAndAbortEnqueueSync: " << flush;
tpct.testPrepareAndAbortEnqueue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortNoPrepareEnqueueSync)
+QPID_AUTO_TEST_CASE(AbortNoPrepareEnqueueSync)
{
- cout << file << ".AbortNoPrepareEnqueueSync: " << flush;
+ cout << test_filename << ".AbortNoPrepareEnqueueSync: " << flush;
tpct.testAbortNoPrepareEnqueue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(CommitDequeueSync)
+QPID_AUTO_TEST_CASE(CommitDequeueSync)
{
- cout << file << ".CommitDequeueSync: " << flush;
+ cout << test_filename << ".CommitDequeueSync: " << flush;
tpct.testCommitDequeue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(PrepareAndAbortDequeueSync)
+QPID_AUTO_TEST_CASE(PrepareAndAbortDequeueSync)
{
- cout << file << ".PrepareAndAbortDequeueSync: " << flush;
+ cout << test_filename << ".PrepareAndAbortDequeueSync: " << flush;
tpct.testPrepareAndAbortDequeue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortNoPrepareDequeueSync)
+QPID_AUTO_TEST_CASE(AbortNoPrepareDequeueSync)
{
- cout << file << ".AbortNoPrepareDequeueSync: " << flush;
+ cout << test_filename << ".AbortNoPrepareDequeueSync: " << flush;
tpct.testAbortNoPrepareDequeue(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(RecoverPreparedThenCommittedSync)
+QPID_AUTO_TEST_CASE(RecoverPreparedThenCommittedSync)
{
- cout << file << ".RecoverPreparedThenCommittedSync: " << flush;
+ cout << test_filename << ".RecoverPreparedThenCommittedSync: " << flush;
tpct.testRecoverPreparedThenCommitted(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(RecoverPreparedThenAbortedSync)
+QPID_AUTO_TEST_CASE(RecoverPreparedThenAbortedSync)
{
- cout << file << ".RecoverPreparedThenAbortedSync: " << flush;
+ cout << test_filename << ".RecoverPreparedThenAbortedSync: " << flush;
tpct.testRecoverPreparedThenAborted(false);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(CommitSwapAsync)
+QPID_AUTO_TEST_CASE(CommitSwapAsync)
{
- cout << file << ".CommitSwapAsync: " << flush;
+ cout << test_filename << ".CommitSwapAsync: " << flush;
tpct.testCommitSwap(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(PrepareAndAbortSwapAsync)
+QPID_AUTO_TEST_CASE(PrepareAndAbortSwapAsync)
{
- cout << file << ".PrepareAndAbortSwapAsync: " << flush;
+ cout << test_filename << ".PrepareAndAbortSwapAsync: " << flush;
tpct.testPrepareAndAbortSwap(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortNoPrepareSwapAsync)
+QPID_AUTO_TEST_CASE(AbortNoPrepareSwapAsync)
{
- cout << file << ".AbortNoPrepareSwapAsync: " << flush;
+ cout << test_filename << ".AbortNoPrepareSwapAsync: " << flush;
tpct.testAbortNoPrepareSwap(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(CommitEnqueueAsync)
+QPID_AUTO_TEST_CASE(CommitEnqueueAsync)
{
- cout << file << ".CommitEnqueueAsync: " << flush;
+ cout << test_filename << ".CommitEnqueueAsync: " << flush;
tpct.testCommitEnqueue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(PrepareAndAbortEnqueueAsync)
+QPID_AUTO_TEST_CASE(PrepareAndAbortEnqueueAsync)
{
- cout << file << ".PrepareAndAbortEnqueueAsync: " << flush;
+ cout << test_filename << ".PrepareAndAbortEnqueueAsync: " << flush;
tpct.testPrepareAndAbortEnqueue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortNoPrepareEnqueueAsync)
+QPID_AUTO_TEST_CASE(AbortNoPrepareEnqueueAsync)
{
- cout << file << ".AbortNoPrepareEnqueueAsync: " << flush;
+ cout << test_filename << ".AbortNoPrepareEnqueueAsync: " << flush;
tpct.testAbortNoPrepareEnqueue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(CommitDequeueAsync)
+QPID_AUTO_TEST_CASE(CommitDequeueAsync)
{
- cout << file << ".CommitDequeueAsync: " << flush;
+ cout << test_filename << ".CommitDequeueAsync: " << flush;
tpct.testCommitDequeue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(PrepareAndAbortDequeueAsync)
+QPID_AUTO_TEST_CASE(PrepareAndAbortDequeueAsync)
{
- cout << file << ".PrepareAndAbortDequeueAsync: " << flush;
+ cout << test_filename << ".PrepareAndAbortDequeueAsync: " << flush;
tpct.testPrepareAndAbortDequeue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(AbortNoPrepareDequeueAsync)
+QPID_AUTO_TEST_CASE(AbortNoPrepareDequeueAsync)
{
- cout << file << ".AbortNoPrepareDequeueAsync: " << flush;
+ cout << test_filename << ".AbortNoPrepareDequeueAsync: " << flush;
tpct.testAbortNoPrepareDequeue(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(RecoverPreparedThenCommittedAsync)
+QPID_AUTO_TEST_CASE(RecoverPreparedThenCommittedAsync)
{
- cout << file << ".RecoverPreparedThenCommittedAsync: " << flush;
+ cout << test_filename << ".RecoverPreparedThenCommittedAsync: " << flush;
tpct.testRecoverPreparedThenCommitted(true);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(RecoverPreparedThenAbortedAsync)
+QPID_AUTO_TEST_CASE(RecoverPreparedThenAbortedAsync)
{
- cout << file << ".RecoverPreparedThenAbortedAsync: " << flush;
+ cout << test_filename << ".RecoverPreparedThenAbortedAsync: " << flush;
tpct.testRecoverPreparedThenAborted(true);
cout << "ok" << endl;
}
Modified: store/trunk/cpp/tests/jrnl/_st_basic.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -40,15 +40,15 @@
QPID_AUTO_TEST_SUITE(journal_basic)
-const string file("_st_basic");
+const string test_filename("_st_basic");
#include "_st_helper_fns.hpp"
// === Test suite ===
-BOOST_AUTO_TEST_CASE(instantiation)
+QPID_AUTO_TEST_CASE(instantiation)
{
- string test_name = get_test_name(file, "instantiation");
+ string test_name = get_test_name(test_filename, "instantiation");
try
{
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
@@ -58,9 +58,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(initialization)
+QPID_AUTO_TEST_CASE(initialization)
{
- string test_name = get_test_name(file, "initialization");
+ string test_name = get_test_name(test_filename, "initialization");
try
{
jcntl jc(test_name, JRNL_DIR, test_name, NUM_TEST_JFILES, TEST_JFSIZE_SBLKS);
@@ -72,9 +72,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_dequeue_block)
+QPID_AUTO_TEST_CASE(enqueue_dequeue_block)
{
- string test_name = get_test_name(file, "enqueue_dequeue_block");
+ string test_name = get_test_name(test_filename, "enqueue_dequeue_block");
try
{
string msg;
@@ -90,9 +90,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_dequeue_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_dequeue_interleaved)
{
- string test_name = get_test_name(file, "enqueue_dequeue_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_dequeue_interleaved");
try
{
string msg;
@@ -109,9 +109,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_dequeue_interleaved_file_rollover)
+QPID_AUTO_TEST_CASE(enqueue_dequeue_interleaved_file_rollover)
{
- string test_name = get_test_name(file, "enqueue_dequeue_interleaved_file_rollover");
+ string test_name = get_test_name(test_filename, "enqueue_dequeue_interleaved_file_rollover");
try
{
string msg;
@@ -130,9 +130,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(empty_recover)
+QPID_AUTO_TEST_CASE(empty_recover)
{
- string test_name = get_test_name(file, "empty_recover");
+ string test_name = get_test_name(test_filename, "empty_recover");
try
{
{
@@ -175,9 +175,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_recover_dequeue_block)
+QPID_AUTO_TEST_CASE(enqueue_recover_dequeue_block)
{
- string test_name = get_test_name(file, "enqueue_recover_dequeue_block");
+ string test_name = get_test_name(test_filename, "enqueue_recover_dequeue_block");
try
{
{
@@ -204,9 +204,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_recover_dequeue_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_recover_dequeue_interleaved)
{
- string test_name = get_test_name(file, "enqueue_recover_dequeue_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_recover_dequeue_interleaved");
try
{
string msg;
@@ -240,9 +240,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(header_flags)
+QPID_AUTO_TEST_CASE(header_flags)
{
- string test_name = get_test_name(file, "header_flags");
+ string test_name = get_test_name(test_filename, "header_flags");
try
{
{
@@ -336,9 +336,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(journal_threshold_block)
+QPID_AUTO_TEST_CASE(journal_threshold_block)
{
- string test_name = get_test_name(file, "journal_threshold_block");
+ string test_name = get_test_name(test_filename, "journal_threshold_block");
try
{
string msg;
@@ -370,9 +370,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(journal_threshold_interleaved)
+QPID_AUTO_TEST_CASE(journal_threshold_interleaved)
{
- string test_name = get_test_name(file, "journal_threshold_interleaved");
+ string test_name = get_test_name(test_filename, "journal_threshold_interleaved");
try
{
string msg;
@@ -403,9 +403,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(journal_overflow)
+QPID_AUTO_TEST_CASE(journal_overflow)
{
- string test_name = get_test_name(file, "journal_overflow");
+ string test_name = get_test_name(test_filename, "journal_overflow");
try
{
string msg;
@@ -432,9 +432,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(double_dequeue)
+QPID_AUTO_TEST_CASE(double_dequeue)
{
- string test_name = get_test_name(file, "double_dequeue");
+ string test_name = get_test_name(test_filename, "double_dequeue");
try
{
string msg;
Modified: store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -40,15 +40,15 @@
QPID_AUTO_TEST_SUITE(journal_basic_txn)
-const string file("_st_basic_txn");
+const string test_filename("_st_basic_txn");
#include "_st_helper_fns.hpp"
// === Test suite ===
-BOOST_AUTO_TEST_CASE(enqueue_commit_dequeue_block)
+QPID_AUTO_TEST_CASE(enqueue_commit_dequeue_block)
{
- string test_name = get_test_name(file, "enqueue_commit_dequeue_block");
+ string test_name = get_test_name(test_filename, "enqueue_commit_dequeue_block");
try
{
string msg;
@@ -68,9 +68,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_abort_dequeue_block)
+QPID_AUTO_TEST_CASE(enqueue_abort_dequeue_block)
{
- string test_name = get_test_name(file, "enqueue_abort_dequeue_block");
+ string test_name = get_test_name(test_filename, "enqueue_abort_dequeue_block");
try
{
string msg;
@@ -97,9 +97,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_commit_dequeue_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_commit_dequeue_interleaved)
{
- string test_name = get_test_name(file, "enqueue_commit_dequeue_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_commit_dequeue_interleaved");
try
{
string msg;
@@ -120,9 +120,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_abort_dequeue_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_abort_dequeue_interleaved)
{
- string test_name = get_test_name(file, "enqueue_abort_dequeue_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_abort_dequeue_interleaved");
try
{
string msg;
@@ -148,9 +148,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_dequeue_commit_block)
+QPID_AUTO_TEST_CASE(enqueue_dequeue_commit_block)
{
- string test_name = get_test_name(file, "enqueue_dequeue_commit_block");
+ string test_name = get_test_name(test_filename, "enqueue_dequeue_commit_block");
try
{
string msg;
@@ -170,9 +170,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_dequeue_abort_block)
+QPID_AUTO_TEST_CASE(enqueue_dequeue_abort_block)
{
- string test_name = get_test_name(file, "enqueue_dequeue_abort_block");
+ string test_name = get_test_name(test_filename, "enqueue_dequeue_abort_block");
try
{
string msg;
@@ -192,9 +192,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_dequeue_commit_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_dequeue_commit_interleaved)
{
- string test_name = get_test_name(file, "enqueue_dequeue_commit_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_dequeue_commit_interleaved");
try
{
string msg;
@@ -215,9 +215,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_dequeue_abort_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_dequeue_abort_interleaved)
{
- string test_name = get_test_name(file, "enqueue_dequeue_abort_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_dequeue_abort_interleaved");
try
{
string msg;
Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -51,7 +51,7 @@
const string
get_test_name(const string& file, const string& test_name)
{
- cout << file << "." << test_name << ": " << flush;
+ cout << test_filename << "." << test_name << ": " << flush;
return file + "." + test_name;
}
@@ -254,8 +254,8 @@
create_msg(string& s, const int msg_num, const int len)
{
ostringstream oss;
- oss << "Message_" << setfill('0') << setw(4) << msg_num << "_";
- for (int i=14; i<=len; i++)
+ oss << "MSG_" << setfill('0') << setw(6) << msg_num << "_";
+ for (int i=12; i<=len; i++)
oss << (char)('0' + i%10);
s.assign(oss.str());
return s;
@@ -265,8 +265,8 @@
create_xid(string& s, const int msg_num, const int len)
{
ostringstream oss;
- oss << "XID_" << setfill('0') << setw(4) << msg_num << "_";
- for (int i=9; i<len; i++)
+ oss << "XID_" << setfill('0') << setw(6) << msg_num << "_";
+ for (int i=11; i<len; i++)
oss << (char)('a' + i%26);
s.assign(oss.str());
return s;
Modified: store/trunk/cpp/tests/jrnl/_st_read.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -40,15 +40,15 @@
QPID_AUTO_TEST_SUITE(journal_read)
-const string file("_st_read");
+const string test_filename("_st_read");
#include "_st_helper_fns.hpp"
// === Test suite ===
-BOOST_AUTO_TEST_CASE(enqueue_read_dequeue_block)
+QPID_AUTO_TEST_CASE(enqueue_read_dequeue_block)
{
- string test_name = get_test_name(file, "enqueue_read_dequeue_block");
+ string test_name = get_test_name(test_filename, "enqueue_read_dequeue_block");
try
{
string msg;
@@ -79,9 +79,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_read_dequeue_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_read_dequeue_interleaved)
{
- string test_name = get_test_name(file, "enqueue_read_dequeue_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_read_dequeue_interleaved");
try
{
string msg;
@@ -110,9 +110,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_recovered_read_dequeue)
+QPID_AUTO_TEST_CASE(enqueue_recovered_read_dequeue)
{
- string test_name = get_test_name(file, "enqueue_recovered_read_dequeue");
+ string test_name = get_test_name(test_filename, "enqueue_recovered_read_dequeue");
try
{
{
@@ -153,9 +153,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_recover_read_recovered_read_dequeue)
+QPID_AUTO_TEST_CASE(enqueue_recover_read_recovered_read_dequeue)
{
- string test_name = get_test_name(file, "enqueue_recover_read_recovered_read_dequeue");
+ string test_name = get_test_name(test_filename, "enqueue_recover_read_recovered_read_dequeue");
try
{
{
@@ -227,9 +227,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(delayed_read)
+QPID_AUTO_TEST_CASE(delayed_read)
{
- string test_name = get_test_name(file, "delayed_read");
+ string test_name = get_test_name(test_filename, "delayed_read");
try
{
cout << "[NOTE: Disabled until outstanding issue(s) resolved.] ";
@@ -255,9 +255,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(cache_cycled_delayed_read)
+QPID_AUTO_TEST_CASE(cache_cycled_delayed_read)
{
- string test_name = get_test_name(file, "cache_cycled_delayed_read");
+ string test_name = get_test_name(test_filename, "cache_cycled_delayed_read");
try
{
cout << "[NOTE: Disabled until outstanding issue(s) resolved.] ";
Modified: store/trunk/cpp/tests/jrnl/_st_read_txn.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -40,15 +40,15 @@
QPID_AUTO_TEST_SUITE(journal_read_txn)
-const string file("_st_read_txn");
+const string test_filename("_st_read_txn");
#include "_st_helper_fns.hpp"
// === Test suite ===
-BOOST_AUTO_TEST_CASE(enqueue_commit_block)
+QPID_AUTO_TEST_CASE(enqueue_commit_block)
{
- string test_name = get_test_name(file, "enqueue_commit_block");
+ string test_name = get_test_name(test_filename, "enqueue_commit_block");
try
{
string msg;
@@ -81,9 +81,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_commit_dequeue_block)
+QPID_AUTO_TEST_CASE(enqueue_commit_dequeue_block)
{
- string test_name = get_test_name(file, "enqueue_commit_dequeue_block");
+ string test_name = get_test_name(test_filename, "enqueue_commit_dequeue_block");
try
{
string msg;
@@ -108,9 +108,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_abort_block)
+QPID_AUTO_TEST_CASE(enqueue_abort_block)
{
- string test_name = get_test_name(file, "enqueue_abort_block");
+ string test_name = get_test_name(test_filename, "enqueue_abort_block");
try
{
string msg;
@@ -135,9 +135,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_commit_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_commit_interleaved)
{
- string test_name = get_test_name(file, "enqueue_commit_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_commit_interleaved");
try
{
string msg;
@@ -169,9 +169,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_commit_dequeue_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_commit_dequeue_interleaved)
{
- string test_name = get_test_name(file, "enqueue_commit_dequeue_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_commit_dequeue_interleaved");
try
{
string msg;
@@ -197,9 +197,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enqueue_abort_interleaved)
+QPID_AUTO_TEST_CASE(enqueue_abort_interleaved)
{
- string test_name = get_test_name(file, "enqueue_abort_interleaved");
+ string test_name = get_test_name(test_filename, "enqueue_abort_interleaved");
try
{
string msg;
Modified: store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -38,20 +38,20 @@
QPID_AUTO_TEST_SUITE(eng_map_suite)
-const string file("_ut_enq_map");
+const string test_filename("_ut_enq_map");
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
enq_map e1;
BOOST_CHECK(e1.empty());
BOOST_CHECK_EQUAL(e1.size(), 0);
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(insert_get)
+QPID_AUTO_TEST_CASE(insert_get)
{
- cout << file << ".insert_get: " << flush;
+ cout << test_filename << ".insert_get: " << flush;
u_int16_t fid;
u_int64_t rid;
u_int16_t fid_start = 0x2000U;
@@ -108,9 +108,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(get_remove)
+QPID_AUTO_TEST_CASE(get_remove)
{
- cout << file << ".get_remove: " << flush;
+ cout << test_filename << ".get_remove: " << flush;
u_int16_t fid;
u_int64_t rid;
u_int16_t fid_start = 0x3000U;
@@ -144,9 +144,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(lock)
+QPID_AUTO_TEST_CASE(lock)
{
- cout << file << ".lock: " << flush;
+ cout << test_filename << ".lock: " << flush;
u_int16_t fid;
u_int64_t rid;
u_int16_t fid_start = 0x4000U;
@@ -210,9 +210,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(lists)
+QPID_AUTO_TEST_CASE(lists)
{
- cout << file << ".lists: " << flush;
+ cout << test_filename << ".lists: " << flush;
u_int16_t fid;
u_int64_t rid;
u_int16_t fid_start = 0x5000UL;
Modified: store/trunk/cpp/tests/jrnl/_ut_jdir.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -52,7 +52,7 @@
QPID_AUTO_TEST_SUITE(jdir_suite)
-const string file("_ut_jdir");
+const string test_filename("_ut_jdir");
// === Helper functions ===
@@ -176,9 +176,9 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
string dir("/tmp/A/B/C/D/E/F");
string bfn("test_base");
jdir dir1(dir, bfn);
@@ -187,9 +187,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(create_delete_dir)
+QPID_AUTO_TEST_CASE(create_delete_dir)
{
- cout << file << ".create_delete_dir: " << flush;
+ cout << test_filename << ".create_delete_dir: " << flush;
// Use instance
string dir_A("/tmp/A");
string dir_Ats("/tmp/A/"); // trailing '/'
@@ -248,9 +248,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(create_delete_dir_recursive)
+QPID_AUTO_TEST_CASE(create_delete_dir_recursive)
{
- cout << file << ".create_delete_dir_recursive: " << flush;
+ cout << test_filename << ".create_delete_dir_recursive: " << flush;
// Use instances
check_dir_not_existing("/tmp/E");
jdir dir1("/tmp/E/F/G/H", "test_base");
@@ -316,9 +316,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(clear_verify_dir)
+QPID_AUTO_TEST_CASE(clear_verify_dir)
{
- cout << file << ".clear_verify_dir: " << flush;
+ cout << test_filename << ".clear_verify_dir: " << flush;
// Use instances
const char* jrnl_dir = "/tmp/test_dir_1";
const char* bfn = "test_base";
Modified: store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -38,11 +38,11 @@
QPID_AUTO_TEST_SUITE(jerrno_suite)
using namespace rhm::journal;
-const string file("_ut_jerrno");
+const string test_filename("_ut_jerrno");
-BOOST_AUTO_TEST_CASE(jerrno_val)
+QPID_AUTO_TEST_CASE(jerrno_val)
{
- cout << file << ".jerrno_val: " << flush;
+ cout << test_filename << ".jerrno_val: " << flush;
const char* m = "JERR__MALLOC";
string malloc_msg = string(jerrno::err_msg(jerrno::JERR__MALLOC));
BOOST_CHECK(malloc_msg.substr(0, ::strlen(m)).compare(m) == 0);
Modified: store/trunk/cpp/tests/jrnl/_ut_jexception.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -38,7 +38,7 @@
QPID_AUTO_TEST_SUITE(jexception_suite)
-const string file("_ut_jexception");
+const string test_filename("_ut_jexception");
// === Helper functions ===
@@ -67,9 +67,9 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(constructor_1)
+QPID_AUTO_TEST_CASE(constructor_1)
{
- cout << file << ".constructor_1: " << flush;
+ cout << test_filename << ".constructor_1: " << flush;
try
{
jexception e1;
@@ -91,9 +91,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_2)
+QPID_AUTO_TEST_CASE(constructor_2)
{
- cout << file << ".constructor_2: " << flush;
+ cout << test_filename << ".constructor_2: " << flush;
const u_int32_t err_code = 2;
try
{
@@ -116,9 +116,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_3a)
+QPID_AUTO_TEST_CASE(constructor_3a)
{
- cout << file << ".constructor_3a: " << flush;
+ cout << test_filename << ".constructor_3a: " << flush;
const char* err_msg = "exception3";
try
{
@@ -141,9 +141,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_3b)
+QPID_AUTO_TEST_CASE(constructor_3b)
{
- cout << file << ".constructor_3b: " << flush;
+ cout << test_filename << ".constructor_3b: " << flush;
const string err_msg("exception3");
try
{
@@ -166,9 +166,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_4a)
+QPID_AUTO_TEST_CASE(constructor_4a)
{
- cout << file << ".constructor_4a: " << flush;
+ cout << test_filename << ".constructor_4a: " << flush;
const u_int32_t err_code = 4;
const char* err_msg = "exception4";
try
@@ -192,9 +192,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_4b)
+QPID_AUTO_TEST_CASE(constructor_4b)
{
- cout << file << ".constructor_4b: " << flush;
+ cout << test_filename << ".constructor_4b: " << flush;
const u_int32_t err_code = 4;
const string err_msg("exception4");
try
@@ -218,9 +218,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_5a)
+QPID_AUTO_TEST_CASE(constructor_5a)
{
- cout << file << ".constructor_5a: " << flush;
+ cout << test_filename << ".constructor_5a: " << flush;
const u_int32_t err_code = 5;
const char* err_class = "class5";
const char* err_fn = "fn5";
@@ -245,9 +245,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_5b)
+QPID_AUTO_TEST_CASE(constructor_5b)
{
- cout << file << ".constructor_5b: " << flush;
+ cout << test_filename << ".constructor_5b: " << flush;
const u_int32_t err_code = 5;
const string err_class("class5");
const string err_fn("fn5");
@@ -272,9 +272,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_6a)
+QPID_AUTO_TEST_CASE(constructor_6a)
{
- cout << file << ".constructor_6a: " << flush;
+ cout << test_filename << ".constructor_6a: " << flush;
const u_int32_t err_code = 6;
const char* err_msg = "exception6";
const char* err_class = "class6";
@@ -300,9 +300,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_6b)
+QPID_AUTO_TEST_CASE(constructor_6b)
{
- cout << file << ".constructor_6b: " << flush;
+ cout << test_filename << ".constructor_6b: " << flush;
const u_int32_t err_code = 6;
const string err_msg("exception6");
const string err_class("class6");
@@ -328,9 +328,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(msg_scope)
+QPID_AUTO_TEST_CASE(msg_scope)
{
- cout << file << ".msg_scope: " << flush;
+ cout << test_filename << ".msg_scope: " << flush;
try
{
// These will go out of scope as soon as jexception is thrown...
Modified: store/trunk/cpp/tests/jrnl/_ut_jinf.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -46,7 +46,7 @@
QPID_AUTO_TEST_SUITE(jinf_suite)
-const string file("_ut_jinf");
+const string test_filename("_ut_jinf");
// === Helper functions ===
@@ -138,9 +138,9 @@
jfiles.clear();
}
-BOOST_AUTO_TEST_CASE(write_constructor)
+QPID_AUTO_TEST_CASE(write_constructor)
{
- cout << file << ".write_constructor: " << flush;
+ cout << test_filename << ".write_constructor: " << flush;
::clock_gettime(CLOCK_REALTIME, &ts);
jinf ji(jid, jdir, base_filename, NUM_JFILES, JFSIZE_SBLKS, ts);
BOOST_CHECK_EQUAL(ji.jver(), RHM_JDAT_VERSION);
@@ -162,9 +162,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(read_constructor)
+QPID_AUTO_TEST_CASE(read_constructor)
{
- cout << file << ".read_constructor: " << flush;
+ cout << test_filename << ".read_constructor: " << flush;
stringstream fn;
fn << jdir << "/" << base_filename << "." << JRNL_INFO_EXTENSION;
jinf ji(fn.str(), false);
@@ -186,9 +186,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(validate)
+QPID_AUTO_TEST_CASE(validate)
{
- cout << file << ".validate: " << flush;
+ cout << test_filename << ".validate: " << flush;
stringstream fn;
fn << jdir << "/" << base_filename << "." << JRNL_INFO_EXTENSION;
jinf ji(fn.str(), true);
@@ -196,9 +196,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(analyze_empty_journal)
+QPID_AUTO_TEST_CASE(analyze_empty_journal)
{
- cout << file << ".analyze_empty_journal: " << flush;
+ cout << test_filename << ".analyze_empty_journal: " << flush;
vector<string> jfiles;
create_journal_filenames(jfiles);
@@ -218,9 +218,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(analyze_linear_journal)
+QPID_AUTO_TEST_CASE(analyze_linear_journal)
{
- cout << file << ".analyze_linear_journal: " << flush;
+ cout << test_filename << ".analyze_linear_journal: " << flush;
vector<string> jfiles;
for (int i=0; i<NUM_JFILES; i++)
{
Modified: store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -42,11 +42,11 @@
QPID_AUTO_TEST_SUITE(rec_hdr_suite)
-const string file("_ut_rec_hdr");
+const string test_filename("_ut_rec_hdr");
-BOOST_AUTO_TEST_CASE(hdr_class)
+QPID_AUTO_TEST_CASE(hdr_class)
{
- cout << file << ".hdr_class: " << flush;
+ cout << test_filename << ".hdr_class: " << flush;
rec_hdr h1;
BOOST_CHECK_EQUAL(h1._magic, 0UL);
BOOST_CHECK_EQUAL(h1._version, 0);
@@ -107,9 +107,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(rec_tail_class)
+QPID_AUTO_TEST_CASE(rec_tail_class)
{
- cout << file << ".rec_tail_class: " << flush;
+ cout << test_filename << ".rec_tail_class: " << flush;
const u_int32_t magic = 0xfedcba98;
const u_int64_t rid = 0xfedcba9876543210ULL;
const u_int32_t xmagic = ~magic;
@@ -135,9 +135,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(file_hdr_class)
+QPID_AUTO_TEST_CASE(file_hdr_class)
{
- cout << file << ".file_hdr_class: " << flush;
+ cout << test_filename << ".file_hdr_class: " << flush;
const u_int32_t magic = 0xfedcba98UL;
const u_int8_t version = 0xa5;
const u_int16_t uflag = 0x5537;
@@ -217,9 +217,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(enq_hdr_class)
+QPID_AUTO_TEST_CASE(enq_hdr_class)
{
- cout << file << ".enq_hdr_class: " << flush;
+ cout << test_filename << ".enq_hdr_class: " << flush;
const u_int32_t magic = 0xfedcba98UL;
const u_int8_t version = 0xa5;
const u_int64_t rid = 0xfedcba9876543210ULL;
@@ -326,9 +326,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(deq_hdr_class)
+QPID_AUTO_TEST_CASE(deq_hdr_class)
{
- cout << file << ".deq_hdr_class: " << flush;
+ cout << test_filename << ".deq_hdr_class: " << flush;
const u_int32_t magic = 0xfedcba98UL;
const u_int8_t version = 0xa5;
const u_int16_t uflag = 0x5537;
@@ -383,9 +383,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(txn_hdr_class)
+QPID_AUTO_TEST_CASE(txn_hdr_class)
{
- cout << file << ".txn_hdr_class: " << flush;
+ cout << test_filename << ".txn_hdr_class: " << flush;
const u_int32_t magic = 0xfedcba98UL;
const u_int8_t version = 0xa5;
const u_int16_t uflag = 0x5537;
Modified: store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -31,11 +31,11 @@
QPID_AUTO_TEST_SUITE(jtt_time_ns)
-const string file("_ut_time_ns");
+const string test_filename("_ut_time_ns");
-BOOST_AUTO_TEST_CASE(constructors)
+QPID_AUTO_TEST_CASE(constructors)
{
- cout << file << ".constructors: " << flush;
+ cout << test_filename << ".constructors: " << flush;
const time_t sec = 123;
const long nsec = 123456789;
@@ -62,9 +62,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(operators)
+QPID_AUTO_TEST_CASE(operators)
{
- cout << file << ".operators: " << flush;
+ cout << test_filename << ".operators: " << flush;
const time_t sec1 = 123;
const long nsec1 = 123456789;
const time_t sec2 = 1;
@@ -146,9 +146,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(str)
+QPID_AUTO_TEST_CASE(str)
{
- cout << file << ".str: " << flush;
+ cout << test_filename << ".str: " << flush;
time_ns t1(123, 123456789);
BOOST_CHECK_EQUAL(t1.str(), "123.123457");
BOOST_CHECK_EQUAL(t1.str(9), "123.123456789");
Modified: store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -39,7 +39,7 @@
QPID_AUTO_TEST_SUITE(txn_map_suite)
-const string file("_ut_txn_map");
+const string test_filename("_ut_txn_map");
// === Helper functions ===
@@ -62,9 +62,9 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
const u_int64_t rid = 0x123456789abcdef0ULL;
const u_int64_t drid = 0xfedcba9876543210ULL;
const u_int16_t fid = 0xfedcU;
@@ -82,9 +82,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(insert_get)
+QPID_AUTO_TEST_CASE(insert_get)
{
- cout << file << ".insert_get: " << flush;
+ cout << test_filename << ".insert_get: " << flush;
u_int16_t fid;
u_int64_t rid;
u_int16_t fid_start = 0x2000U;
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -32,11 +32,11 @@
QPID_AUTO_TEST_SUITE(jtt_data_src)
-const string file("_ut_data_src");
+const string test_filename("_ut_data_src");
-BOOST_AUTO_TEST_CASE(data)
+QPID_AUTO_TEST_CASE(data)
{
- cout << file << ".data: " << flush;
+ cout << test_filename << ".data: " << flush;
BOOST_CHECK(data_src::max_dsize > 0);
for (size_t i=0; i<1024; i++)
{
@@ -55,9 +55,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(xid_data_xid)
+QPID_AUTO_TEST_CASE(xid_data_xid)
{
- cout << file << ".xid_data_xid: " << flush;
+ cout << test_filename << ".xid_data_xid: " << flush;
BOOST_CHECK_EQUAL(data_src::get_xid(1), "0");
BOOST_CHECK_EQUAL(data_src::get_xid(2), "01");
BOOST_CHECK_EQUAL(data_src::get_xid(3), "002");
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -31,11 +31,11 @@
QPID_AUTO_TEST_SUITE(jtt_jrnl_init_params)
-const string file("_ut_jrnl_init_params");
+const string test_filename("_ut_jrnl_init_params");
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
const string jid = "jid";
const string jdir = "jdir";
const string bfn = "base filename";
@@ -50,9 +50,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(copy_constructor_1)
+QPID_AUTO_TEST_CASE(copy_constructor_1)
{
- cout << file << ".copy_constructor_1: " << flush;
+ cout << test_filename << ".copy_constructor_1: " << flush;
const string jid = "jid";
const string jdir = "jdir";
const string bfn = "base filename";
@@ -68,9 +68,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(copy_constructor_2)
+QPID_AUTO_TEST_CASE(copy_constructor_2)
{
- cout << file << ".copy_constructor_2: " << flush;
+ cout << test_filename << ".copy_constructor_2: " << flush;
const string jid = "jid";
const string jdir = "jdir";
const string bfn = "base filename";
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -35,11 +35,11 @@
QPID_AUTO_TEST_SUITE(jtt_jrnl_instance)
-const string file("_ut_jrnl_instance");
+const string test_filename("_ut_jrnl_instance");
-BOOST_AUTO_TEST_CASE(constructor_1)
+QPID_AUTO_TEST_CASE(constructor_1)
{
- cout << file << ".constructor_1: " << flush;
+ cout << test_filename << ".constructor_1: " << flush;
const string jid = "jid1";
const string jdir = "/tmp/test1";
const string bfn = "test";
@@ -60,9 +60,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_2)
+QPID_AUTO_TEST_CASE(constructor_2)
{
- cout << file << ".constructor_2: " << flush;
+ cout << test_filename << ".constructor_2: " << flush;
const string jid = "jid2";
const string jdir = "/tmp/test2";
const string bfn = "test";
@@ -85,9 +85,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_3)
+QPID_AUTO_TEST_CASE(constructor_3)
{
- cout << file << ".constructor_3: " << flush;
+ cout << test_filename << ".constructor_3: " << flush;
const string jid = "jid3";
const string jdir = "/tmp/test3";
const string bfn = "test";
@@ -110,9 +110,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(recover)
+QPID_AUTO_TEST_CASE(recover)
{
- cout << file << ".recover: " << flush;
+ cout << test_filename << ".recover: " << flush;
const string jid = "jid5";
const string jdir = "/tmp/test5";
const string bfn = "test";
@@ -141,9 +141,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(recover_no_files)
+QPID_AUTO_TEST_CASE(recover_no_files)
{
- cout << file << ".recover_no_files: " << flush;
+ cout << test_filename << ".recover_no_files: " << flush;
const string jid = "jid6";
const string jdir = "/tmp/test6";
const string bfn = "test";
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -34,11 +34,11 @@
QPID_AUTO_TEST_SUITE(jtt_read_arg)
-const string file("_ut_read_arg");
+const string test_filename("_ut_read_arg");
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
read_arg ra1;
BOOST_CHECK_EQUAL(ra1.val(), read_arg::NONE);
BOOST_CHECK_EQUAL(ra1.str(), "NONE");
@@ -57,9 +57,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(set_val)
+QPID_AUTO_TEST_CASE(set_val)
{
- cout << file << ".set_val: " << flush;
+ cout << test_filename << ".set_val: " << flush;
read_arg ra;
BOOST_CHECK_EQUAL(ra.val(), read_arg::NONE);
BOOST_CHECK_EQUAL(ra.str(), "NONE");
@@ -75,9 +75,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(parse)
+QPID_AUTO_TEST_CASE(parse)
{
- cout << file << ".parse: " << flush;
+ cout << test_filename << ".parse: " << flush;
read_arg ra;
ra.parse("LAZYLOAD");
BOOST_CHECK_EQUAL(ra.val(), read_arg::LAZYLOAD);
@@ -100,9 +100,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(istream_)
+QPID_AUTO_TEST_CASE(istream_)
{
- cout << file << ".istream_: " << flush;
+ cout << test_filename << ".istream_: " << flush;
read_arg ra;
istringstream ss1("LAZYLOAD", ios::in);
ss1 >> ra;
@@ -123,9 +123,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(ostream_)
+QPID_AUTO_TEST_CASE(ostream_)
{
- cout << file << ".ostream_: " << flush;
+ cout << test_filename << ".ostream_: " << flush;
ostringstream s1;
read_arg ra(read_arg::LAZYLOAD);
s1 << ra;
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -33,11 +33,11 @@
QPID_AUTO_TEST_SUITE(jtt_test_case)
-const string file("_ut_test_case");
+const string test_filename("_ut_test_case");
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
const unsigned test_case_num = 0x12345;
const u_int32_t num_msgs = 0x100;
const size_t min_data_size = 0x1000;
@@ -65,9 +65,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(results)
+QPID_AUTO_TEST_CASE(results)
{
- cout << file << ".results: " << flush;
+ cout << test_filename << ".results: " << flush;
const unsigned test_case_num = 0x12345;
const u_int32_t num_msgs = 0x100;
const size_t min_data_size = 0x1000;
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -33,11 +33,11 @@
QPID_AUTO_TEST_SUITE(jtt_test_case_result)
-const string file("_ut_test_case_result");
+const string test_filename("_ut_test_case_result");
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
const string jid("journal id 1");
test_case_result tcr(jid);
BOOST_CHECK_EQUAL(tcr.jid(), jid);
@@ -52,9 +52,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(start_stop)
+QPID_AUTO_TEST_CASE(start_stop)
{
- cout << file << ".start_stop: " << flush;
+ cout << test_filename << ".start_stop: " << flush;
const string jid("journal id 2");
test_case_result tcr(jid);
BOOST_CHECK_EQUAL(tcr.exception(), false);
@@ -89,9 +89,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(start_exception_stop_1)
+QPID_AUTO_TEST_CASE(start_exception_stop_1)
{
- cout << file << ".start_exception_stop_1: " << flush;
+ cout << test_filename << ".start_exception_stop_1: " << flush;
const string jid("journal id 3");
test_case_result tcr(jid);
const u_int32_t err_code = 0x321;
@@ -112,9 +112,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(start_exception_stop_2)
+QPID_AUTO_TEST_CASE(start_exception_stop_2)
{
- cout << file << ".start_exception_stop_2: " << flush;
+ cout << test_filename << ".start_exception_stop_2: " << flush;
const string jid("journal id 4");
test_case_result tcr(jid);
const string err_msg = "exception message";
@@ -133,9 +133,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(start_exception_stop_3)
+QPID_AUTO_TEST_CASE(start_exception_stop_3)
{
- cout << file << ".start_exception_stop_3: " << flush;
+ cout << test_filename << ".start_exception_stop_3: " << flush;
const string jid("journal id 5");
test_case_result tcr(jid);
const char* err_msg = "exception message";
@@ -154,9 +154,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(start_exception)
+QPID_AUTO_TEST_CASE(start_exception)
{
- cout << file << ".start_exception: " << flush;
+ cout << test_filename << ".start_exception: " << flush;
const string jid("journal id 6");
test_case_result tcr(jid);
u_int32_t err_code = 0x654;
@@ -175,9 +175,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(counters)
+QPID_AUTO_TEST_CASE(counters)
{
- cout << file << ".counters: " << flush;
+ cout << test_filename << ".counters: " << flush;
const u_int32_t num_enq = 125;
const u_int32_t num_deq = 64;
const u_int32_t num_read = 22;
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -32,7 +32,7 @@
QPID_AUTO_TEST_SUITE(jtt_test_case_result_agregation)
-const string file("_ut_test_case_result_agregation");
+const string test_filename("_ut_test_case_result_agregation");
// === Helper functions ===
@@ -68,9 +68,9 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(constructor_1)
+QPID_AUTO_TEST_CASE(constructor_1)
{
- cout << file << ".constructor_1: " << flush;
+ cout << test_filename << ".constructor_1: " << flush;
test_case_result_agregation tcra;
BOOST_CHECK_EQUAL(tcra.tc_average_mode(), true);
BOOST_CHECK_EQUAL(tcra.jid(), "Average");
@@ -85,9 +85,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(constructor_2)
+QPID_AUTO_TEST_CASE(constructor_2)
{
- cout << file << ".constructor_2: " << flush;
+ cout << test_filename << ".constructor_2: " << flush;
string jid("journal id");
test_case_result_agregation tcra(jid);
BOOST_CHECK_EQUAL(tcra.tc_average_mode(), false);
@@ -103,9 +103,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(add_test_case)
+QPID_AUTO_TEST_CASE(add_test_case)
{
- cout << file << ".add_test_case: " << flush;
+ cout << test_filename << ".add_test_case: " << flush;
string jid("jid1");
test_case_result::shared_ptr tcrp1 = make_result("jid1", 10, 10, 0, 1, 101010101L);
test_case_result::shared_ptr tcrp2 = make_result("jid1", 25, 0, 35, 10, 20202020L);
@@ -140,9 +140,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(add_test_case_average)
+QPID_AUTO_TEST_CASE(add_test_case_average)
{
- cout << file << ".add_test_case_average: " << flush;
+ cout << test_filename << ".add_test_case_average: " << flush;
test_case_result::shared_ptr tcrp1 = make_result("jid1", 10, 10, 0, 1, 101010101L);
test_case_result::shared_ptr tcrp2 = make_result("jid2", 25, 0, 35, 10, 20202020L);
test_case_result::shared_ptr tcrp3 = make_result("jid3", 0, 15, 5, 2, 555555555L);
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-03-05 15:22:04 UTC (rev 1760)
@@ -34,7 +34,7 @@
QPID_AUTO_TEST_SUITE(jtt_test_case_set)
const string csv_file("_ut_test_case_set.csv");
-const string file("_ut_test_case_set");
+const string test_filename("_ut_test_case_set");
// === Helper functions ===
@@ -50,18 +50,18 @@
// === Test suite ===
-BOOST_AUTO_TEST_CASE(constructor)
+QPID_AUTO_TEST_CASE(constructor)
{
- cout << file << ".constructor: " << flush;
+ cout << test_filename << ".constructor: " << flush;
test_case_set tcs;
BOOST_CHECK(tcs.empty());
BOOST_CHECK_EQUAL(tcs.size(), unsigned(0));
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(append_1)
+QPID_AUTO_TEST_CASE(append_1)
{
- cout << file << ".append_1: " << flush;
+ cout << test_filename << ".append_1: " << flush;
const unsigned test_case_num = 0x12345;
const u_int32_t num_msgs = 0x100;
const size_t min_data_size = 0x1000;
@@ -92,9 +92,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(append_2)
+QPID_AUTO_TEST_CASE(append_2)
{
- cout << file << ".append_2: " << flush;
+ cout << test_filename << ".append_2: " << flush;
const unsigned test_case_num = 0x12345;
const u_int32_t num_msgs = 0x100;
const size_t min_data_size = 0x1000;
@@ -126,9 +126,9 @@
cout << "ok" << endl;
}
-BOOST_AUTO_TEST_CASE(append_from_csv)
+QPID_AUTO_TEST_CASE(append_from_csv)
{
- cout << file << ".append_from_csv: " << flush;
+ cout << test_filename << ".append_from_csv: " << flush;
test_case_set tcs;
BOOST_REQUIRE_MESSAGE(check_csv_file(csv_file.c_str()), "Test CSV file \"" << csv_file <<
"\" is missing.");
Modified: store/trunk/cpp/tests/jrnl/jtt/jtt.csv
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jtt.csv 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/jrnl/jtt/jtt.csv 2008-03-05 15:22:04 UTC (rev 1760)
@@ -6,210 +6,3 @@
,,,,,,,,,,,,,,,,,,,,
"Simple message combinations of persistent/deq transientueued/non-dequeued, transactional/non-transactional",,,,,,,,,,,,,,,,,,,,
1,"L",1,1,0,1,0,10,10,0,0,FALSE,FALSE,FALSE,54,1,0,0,0,0,"1 * 10-byte message"
-2,"L",1,10,0,10,0,10,10,0,0,FALSE,FALSE,FALSE,54,1,0,0,0,0,"10 * 10-byte message"
-3,"L",1,1,0,1,0,10,10,0,0,FALSE,TRUE,FALSE,54,1,0,0,0,0,"1 * 10-byte message [transient]"
-4,"L",1,10,0,10,0,10,10,0,0,FALSE,TRUE,FALSE,54,1,0,0,0,0,"10 * 10-byte message [transient]"
-5,"L",1,1,0,1,0,10,10,10,10,FALSE,FALSE,FALSE,64,1,0,0,0,0,"1 * 10-byte message [txn]"
-6,"L",1,10,0,10,0,10,10,10,10,FALSE,FALSE,FALSE,64,1,0,0,0,0,"10 * 10-byte message [txn]"
-7,"L",1,1,0,1,0,10,10,10,10,FALSE,TRUE,FALSE,64,1,0,0,0,0,"1 * 10-byte message [txn transient]"
-8,"L",1,10,0,10,0,10,10,10,10,FALSE,TRUE,FALSE,64,1,0,0,0,0,"10 * 10-byte message [txn transient]"
-9,"L",1,1,0,1,0,10,10,0,0,TRUE,FALSE,FALSE,54,1,32,1,0,0,"1 * 10-byte message [deq]"
-10,"L",1,10,0,10,0,10,10,0,0,TRUE,FALSE,FALSE,54,1,32,1,0,0,"10 * 10-byte message [deq]"
-11,"L",1,1,0,1,0,10,10,0,0,TRUE,TRUE,FALSE,54,1,32,1,0,0,"1 * 10-byte message [deq transient]"
-12,"L",1,10,0,10,0,10,10,0,0,TRUE,TRUE,FALSE,54,1,32,1,0,0,"10 * 10-byte message [deq transient]"
-13,"L",1,1,0,1,0,10,10,10,10,TRUE,FALSE,FALSE,64,1,54,1,46,1,"1 * 10-byte message [deq txn]"
-14,"L",1,10,0,10,0,10,10,10,10,TRUE,FALSE,FALSE,64,1,54,1,46,1,"10 * 10-byte message [deq txn]"
-15,"L",1,1,0,1,0,10,10,10,10,TRUE,TRUE,FALSE,64,1,54,1,46,1,"1 * 10-byte message [txn deq transient]"
-16,"L",1,10,0,10,0,10,10,10,10,TRUE,TRUE,FALSE,64,1,54,1,46,1,"10 * 10-byte message [txn deq transient]"
-17,"L",1,1,0,1,0,10,10,0,0,FALSE,FALSE,TRUE,54,1,0,0,0,0,"1 * 10-byte message [extern]"
-18,"L",1,10,0,10,0,10,10,0,0,FALSE,FALSE,TRUE,54,1,0,0,0,0,"10 * 10-byte message [extern]"
-19,"L",1,1,0,1,0,10,10,0,0,FALSE,TRUE,TRUE,54,1,0,0,0,0,"1 * 10-byte message [transient extern]"
-20,"L",1,10,0,10,0,10,10,0,0,FALSE,TRUE,TRUE,54,1,0,0,0,0,"10 * 10-byte message [transient extern]"
-21,"L",1,1,0,1,0,10,10,10,10,FALSE,FALSE,TRUE,64,1,0,0,0,0,"1 * 10-byte message [txn extern]"
-22,"L",1,10,0,10,0,10,10,10,10,FALSE,FALSE,TRUE,64,1,0,0,0,0,"10 * 10-byte message [txn extern]"
-23,"L",1,1,0,1,0,10,10,10,10,FALSE,TRUE,TRUE,64,1,0,0,0,0,"1 * 10-byte message [txn transient extern]"
-24,"L",1,10,0,10,0,10,10,10,10,FALSE,TRUE,TRUE,64,1,0,0,0,0,"10 * 10-byte message [txn transient extern]"
-25,"L",1,1,0,1,0,10,10,0,0,TRUE,FALSE,TRUE,54,1,32,1,0,0,"1 * 10-byte message [deq extern]"
-26,"L",1,10,0,10,0,10,10,0,0,TRUE,FALSE,TRUE,54,1,32,1,0,0,"10 * 10-byte message [deq extern]"
-27,"L",1,1,0,1,0,10,10,0,0,TRUE,TRUE,TRUE,54,1,32,1,0,0,"1 * 10-byte message [deq transient extern]"
-28,"L",1,10,0,10,0,10,10,0,0,TRUE,TRUE,TRUE,54,1,32,1,0,0,"10 * 10-byte message [deq transient extern]"
-29,"L",1,1,0,1,0,10,10,10,10,TRUE,FALSE,TRUE,64,1,54,1,46,1,"1 * 10-byte message [deq txn extern]"
-30,"L",1,10,0,10,0,10,10,10,10,TRUE,FALSE,TRUE,64,1,54,1,46,1,"10 * 10-byte message [deq txn extern]"
-31,"L",1,1,0,1,0,10,10,10,10,TRUE,TRUE,TRUE,64,1,54,1,46,1,"1 * 10-byte message [txn deq transient extern]"
-32,"L",1,10,0,10,0,10,10,10,10,TRUE,TRUE,TRUE,64,1,54,1,46,1,"10 * 10-byte message [txn deq transient extern]"
-,,,,,,,,,,,,,,,,,,,,
-"Transition from one d-block to two per message",,,,,,,,,,,,,,,,,,,,
-33,"L",1,10,0,10,0,84,84,0,0,FALSE,FALSE,FALSE,128,1,0,0,0,0,"1 dblk exact fit"
-34,"L",1,10,0,10,1,85,85,0,0,FALSE,FALSE,FALSE,129,2,0,0,0,0,"1 dblk + 1 byte"
-35,"L",1,10,0,10,0,58,58,26,26,FALSE,FALSE,FALSE,128,1,0,0,0,0,"1 dblk exact fit [txn]"
-36,"L",1,10,0,10,1,59,59,26,26,FALSE,FALSE,FALSE,129,2,0,0,0,0,"1 dblk + 1 byte [txn]"
-,,,,,,,,,,,,,,,,,,,,
-"Transition from one s-block to two per message",,,,,,,,,,,,,,,,,,,,
-37,"L",1,10,0,10,0,468,468,0,0,FALSE,FALSE,FALSE,512,4,0,0,0,0,"1 sblk exact fit"
-38,"L",1,10,0,10,1,469,469,0,0,FALSE,FALSE,FALSE,513,5,0,0,0,0,"1 sblk + 1 byte"
-39,"L",1,10,0,10,0,442,442,26,26,FALSE,FALSE,FALSE,512,4,0,0,0,0,"1 sblk exact fit [txn]"
-40,"L",1,10,0,10,1,443,443,26,26,FALSE,FALSE,FALSE,513,5,0,0,0,0,"1 sblk + 1 byte [txn]"
-,,,,,,,,,,,,,,,,,,,,
-"Transition from first page to second",,,,,,,,,,,,,,,,,,,,
-41,"L",1,8,0,8,0,4052,4052,0,0,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page"
-42,"L",1,8,1,9,0,4052,4052,0,0,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page"
-43,"L",1,8,0,8,1,4053,4053,0,0,FALSE,FALSE,FALSE,4097,33,0,0,0,0,"1/8 page + 1 byte"
-44,"L",1,8,0,8,0,3796,3796,256,256,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page [txn]"
-45,"L",1,8,1,9,0,3796,3796,256,256,FALSE,FALSE,FALSE,4096,32,0,0,0,0,"1/8 page [txn]"
-46,"L",1,8,0,8,1,3797,3797,256,256,FALSE,FALSE,FALSE,4097,33,0,0,0,0,"1/8 page + 1 byte [txn]"
-47,"L",1,8,0,8,0,3924,3924,0,0,TRUE,FALSE,FALSE,3968,31,32,1,0,0,"1/8 page incl deq [deq]"
-48,"L",1,8,1,9,0,3924,3924,0,0,TRUE,FALSE,FALSE,3968,31,32,1,0,0,"1/8 page incl deq [deq]"
-49,"L",1,8,0,8,1,3925,3925,0,0,TRUE,FALSE,FALSE,3969,32,32,1,0,0,"1/8 page incl deq + 1 byte [deq]"
-50,"L",1,8,0,8,0,3028,3028,256,256,TRUE,FALSE,FALSE,3328,26,300,3,292,3,"1/8 page incl deq & txn [deq txn]"
-51,"L",1,8,1,9,0,3028,3028,256,256,TRUE,FALSE,FALSE,3328,26,300,3,292,3,"1/8 page incl deq & txn [deq txn]"
-52,"L",1,8,0,8,1,3029,3029,256,256,TRUE,FALSE,FALSE,3329,27,300,3,292,3,"1/8 page incl deq & txn + 1 byte [deq txn]"
-,,,,,,,,,,,,,,,,,,,,
-"Page cache rollover (from page 32 back to page 0)",,,,,,,,,,,,,,,,,,,,
-53,"L",1,32,0,32,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
-54,"L",1,32,1,33,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
-55,"L",1,32,0,32,1,32725,32725,0,0,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte"
-56,"L",1.5,22,0,22,0,49108,49108,0,0,FALSE,FALSE,FALSE,49152,384,0,0,0,0,"1.5 pages"
-57,"L",1,32,0,32,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
-58,"L",1,32,1,33,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
-59,"L",1,32,0,32,1,32469,32469,256,256,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte [txn]"
-60,"L",1.5,22,0,22,0,48852,48852,256,256,FALSE,FALSE,FALSE,49152,384,0,0,0,0,"1.5 pages [txn]"
-61,"L",1,32,0,32,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
-62,"L",1,32,1,33,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
-63,"L",1,32,0,32,1,32597,32597,0,0,TRUE,FALSE,FALSE,32641,256,32,1,0,0,"1 page incl deq + 1 byte [deq]"
-64,"L",1.5,22,0,22,0,48980,48980,0,0,TRUE,FALSE,FALSE,49024,383,32,1,0,0,"1.5 pages incl deq [deq]"
-65,"L",1,32,0,32,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
-66,"L",1,32,1,33,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
-67,"L",1,32,0,32,1,31701,31701,256,256,TRUE,FALSE,FALSE,32001,251,300,3,292,3,"1 page incl deq & txn + 1 byte [deq txn]"
-68,"L",1.5,22,0,22,0,48084,48084,256,256,TRUE,FALSE,FALSE,48384,378,300,3,292,3,"1.5 pages incl deq & txn [deq txn]"
-,,,,,,,,,,,,,,,,,,,,
-"File transition (from file 0000 to 0001)",,,,,,,,,,,,,,,,,,,,
-69,"L",1,48,0,48,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
-70,"L",1,48,1,49,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page"
-71,"L",1,48,0,48,1,32725,32725,0,0,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte"
-72,"L",2.5,20,0,20,0,81876,81876,0,0,FALSE,FALSE,FALSE,81920,640,0,0,0,0,"2.5 pages"
-73,"L",1,48,0,48,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
-74,"L",1,48,1,49,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"1 page [txn]"
-75,"L",1,48,0,48,1,32469,32469,256,256,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"1 page + 1 byte [txn]"
-76,"L",2.5,20,0,20,0,81620,81620,256,256,FALSE,FALSE,FALSE,81920,640,0,0,0,0,"2.5 pages [txn]"
-77,"L",1,48,0,48,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
-78,"L",1,48,1,49,0,32596,32596,0,0,TRUE,FALSE,FALSE,32640,255,32,1,0,0,"1 page incl deq [deq]"
-79,"L",1,48,0,48,1,32597,32597,0,0,TRUE,FALSE,FALSE,32641,256,32,1,0,0,"1 page incl deq + 1 byte [deq]"
-80,"L",2.5,20,0,20,0,81748,81748,0,0,TRUE,FALSE,FALSE,81792,639,32,1,0,0,"2.5 pages incl deq [deq]"
-81,"L",1,48,0,48,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
-82,"L",1,48,1,49,0,31700,31700,256,256,TRUE,FALSE,FALSE,32000,250,300,3,292,3,"1 page incl deq & txn [deq txn]"
-83,"L",1,48,0,48,1,31701,31701,256,256,TRUE,FALSE,FALSE,32001,251,300,3,292,3,"1 page incl deq & txn + 1 byte [deq txn]"
-84,"L",2.5,20,0,20,0,80852,80852,256,256,TRUE,FALSE,FALSE,81152,634,300,3,292,3,"2.5 pages incl deq & txn [deq txn]"
-,,,,,,,,,,,,,,,,,,,,
-"File rollover (from file 0007 to 0000) - RHM_WRONLY req'd for auto-dequeue == FALSE",,,,,,,,,,,,,,,,,,,,
-85,"L",0.5,16,0,16,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
-86,"L",0.5,16,1,17,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
-87,"L",0.5,16,0,16,1,786261,786261,0,0,TRUE,FALSE,FALSE,786305,6144,32,1,0,0,"24 pages incl deq + 1 byte [deq]"
-88,"L",0.5,16,0,16,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
-89,"L",0.5,16,1,17,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
-90,"L",0.5,16,0,16,1,785365,785365,256,256,TRUE,FALSE,FALSE,785665,6139,300,3,292,3,"24 pages incl deq & txn + 1 byte [deq txn]"
-91,"L",0.25,32,0,32,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
-92,"L",0.25,32,1,33,0,786260,786260,0,0,TRUE,FALSE,FALSE,786304,6143,32,1,0,0,"24 pages incl deq = ½ file [deq]"
-93,"L",0.25,32,0,32,1,786261,786261,0,0,TRUE,FALSE,FALSE,786305,6144,32,1,0,0,"24 pages incl deq + 1 byte [deq]"
-94,"L",0.25,32,0,32,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
-95,"L",0.25,32,1,33,0,785364,785364,256,256,TRUE,FALSE,FALSE,785664,6138,300,3,292,3,"24 pages incl deq & txn = ½ file [deq txn]"
-96,"L",0.25,32,0,32,1,785365,785365,256,256,TRUE,FALSE,FALSE,785665,6139,300,3,292,3,"24 pages incl deq & txn + 1 byte [deq txn]"
-,,,,,,,,,,,,,,,,,,,,
-"Multi-page messages (large messages) - tests various paths in encoder.",,,,,,,,,,,,,,,,,,,,
-97,"L",1,16,0,16,0,32724,32724,0,0,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"data 1 page"
-98,"L",1,16,0,16,1,32725,32725,0,0,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"data 1 page + 1 byte (tail split; 1 byte over page boundary)"
-99,"L",1,16,0,16,11,32735,32735,0,0,FALSE,FALSE,FALSE,32779,257,0,0,0,0,"data 1 page + 11 bytes (tail split; 11 bytes over page boundary)"
-100,"L",1,16,0,16,12,32736,32736,0,0,FALSE,FALSE,FALSE,32780,257,0,0,0,0,"data 1 page + 12 bytes (tail separated exactly onto next page)"
-101,"L",1,16,0,16,13,32737,32737,0,0,FALSE,FALSE,FALSE,32781,257,0,0,0,0,"data 1 page + 13 bytes (data split; 1 byte over page boundary)"
-102,"L",1,16,0,16,0,32468,32468,256,256,FALSE,FALSE,FALSE,32768,256,0,0,0,0,"data 1 page [txn]"
-103,"L",1,16,0,16,1,32469,32469,256,256,FALSE,FALSE,FALSE,32769,257,0,0,0,0,"data 1 page + 1 byte (tail split; 1 byte over page boundary) [txn]"
-104,"L",1,16,0,16,11,32479,32479,256,256,FALSE,FALSE,FALSE,32779,257,0,0,0,0,"data 1 page + 11 bytes (tail split; 11 bytes over page boundary) [txn]"
-105,"L",1,16,0,16,12,32480,32480,256,256,FALSE,FALSE,FALSE,32780,257,0,0,0,0,"data 1 page + 12 bytes (tail separated exactly onto next page) [txn]"
-106,"L",1,16,0,16,13,32481,32481,256,256,FALSE,FALSE,FALSE,32781,257,0,0,0,0,"data 1 page + 13 bytes (data split; 1 byte over page boundary) [txn]"
-107,"L",2,16,0,16,0,65492,65492,0,0,FALSE,FALSE,FALSE,65536,512,0,0,0,0,"data 2 pages"
-108,"L",2,16,0,16,1,65493,65493,0,0,FALSE,FALSE,FALSE,65537,513,0,0,0,0,"data 2 pages + 1 byte (tail split; 1 byte over page boundary)"
-109,"L",2,16,0,16,11,65503,65503,0,0,FALSE,FALSE,FALSE,65547,513,0,0,0,0,"data 2 pages + 11 bytes (tail split; 11 bytes over page boundary)"
-110,"L",2,16,0,16,12,65504,65504,0,0,FALSE,FALSE,FALSE,65548,513,0,0,0,0,"data 2 pages + 12 bytes (tail separated exactly onto next page)"
-111,"L",2,16,0,16,13,65505,65505,0,0,FALSE,FALSE,FALSE,65549,513,0,0,0,0,"data 2 pages + 13 bytes (data split; 1 byte over page boundary)"
-112,"L",2,16,0,16,0,65236,65236,256,256,FALSE,FALSE,FALSE,65536,512,0,0,0,0,"data 2 pages [txn]"
-113,"L",2,16,0,16,1,65237,65237,256,256,FALSE,FALSE,FALSE,65537,513,0,0,0,0,"data 2 pages + 1 byte (tail split; 1 byte over page boundary) [txn]"
-114,"L",2,16,0,16,11,65247,65247,256,256,FALSE,FALSE,FALSE,65547,513,0,0,0,0,"data 2 pages + 11 bytes (tail split; 11 bytes over page boundary) [txn]"
-115,"L",2,16,0,16,12,65248,65248,256,256,FALSE,FALSE,FALSE,65548,513,0,0,0,0,"data 2 pages + 12 bytes (tail separated exactly onto next page) [txn]"
-116,"L",2,16,0,16,13,65249,65249,256,256,FALSE,FALSE,FALSE,65549,513,0,0,0,0,"data 2 pages + 13 bytes (data split; 1 byte over page boundary) [txn]"
-117,"L",4,16,0,16,0,131028,131028,0,0,FALSE,FALSE,FALSE,131072,1024,0,0,0,0,"data 4 pages"
-118,"L",4,16,0,16,1,131029,131029,0,0,FALSE,FALSE,FALSE,131073,1025,0,0,0,0,"data 4 pages + 1 byte (tail split; 1 byte over page boundary)"
-119,"L",4,16,0,16,11,131039,131039,0,0,FALSE,FALSE,FALSE,131083,1025,0,0,0,0,"data 4 pages + 11 bytes (tail split; 11 bytes over page boundary)"
-120,"L",4,16,0,16,12,131040,131040,0,0,FALSE,FALSE,FALSE,131084,1025,0,0,0,0,"data 4 pages + 12 bytes (tail separated exactly onto next page)"
-121,"L",4,16,0,16,13,131041,131041,0,0,FALSE,FALSE,FALSE,131085,1025,0,0,0,0,"data 4 pages + 13 bytes (data split; 1 byte over page boundary)"
-122,"L",4,16,0,16,0,130772,130772,256,256,FALSE,FALSE,FALSE,131072,1024,0,0,0,0,"data 4 pages [txn]"
-123,"L",4,16,0,16,1,130773,130773,256,256,FALSE,FALSE,FALSE,131073,1025,0,0,0,0,"data 4 pages + 1 byte (tail split; 1 byte over page boundary) [txn]"
-124,"L",4,16,0,16,11,130783,130783,256,256,FALSE,FALSE,FALSE,131083,1025,0,0,0,0,"data 4 pages + 11 bytes (tail split; 11 bytes over page boundary) [txn]"
-125,"L",4,16,0,16,12,130784,130784,256,256,FALSE,FALSE,FALSE,131084,1025,0,0,0,0,"data 4 pages + 12 bytes (tail separated exactly onto next page) [txn]"
-126,"L",4,16,0,16,13,130785,130785,256,256,FALSE,FALSE,FALSE,131085,1025,0,0,0,0,"data 4 pages + 13 bytes (data split; 1 byte over page boundary) [txn]"
-127,"L",3.5,16,0,16,0,114644,114644,0,0,FALSE,FALSE,FALSE,114688,896,0,0,0,0,"data 3.5 pages"
-128,"L",3.5,16,0,16,1,114645,114645,0,0,FALSE,FALSE,FALSE,114689,897,0,0,0,0,"data 3.5 pages + 1 byte"
-129,"L",3.5,16,0,16,0,114388,114388,256,256,FALSE,FALSE,FALSE,114688,896,0,0,0,0,"data 3.5 pages [txn]"
-130,"L",3.5,16,0,16,1,114389,114389,256,256,FALSE,FALSE,FALSE,114689,897,0,0,0,0,"data 3.5 pages + 1 byte [txn]"
-131,"L",1,16,0,16,-1,10,10,32735,32735,FALSE,FALSE,FALSE,32789,257,0,0,0,0,"xid 1 page – 1 byte; data 10 bytes (exact fit) [txn]"
-132,"L",1,16,0,16,0,10,10,32736,32736,FALSE,FALSE,FALSE,32790,257,0,0,0,0,"xid 1 page; data 10 bytes (exact fit) [txn]"
-133,"L",1,16,0,16,1,10,10,32737,32737,FALSE,FALSE,FALSE,32791,257,0,0,0,0,"xid 1 page + 1 byte; data 10 bytes (exact fit) [txn]"
-134,"L",2,16,0,16,-1,10,10,65503,65503,FALSE,FALSE,FALSE,65557,513,0,0,0,0,"xid 2 pages – 1 byte; data 10 bytes (exact fit) [txn]"
-135,"L",2,16,0,16,0,10,10,65504,65504,FALSE,FALSE,FALSE,65558,513,0,0,0,0,"xid 2 pages; data 10 bytes (exact fit) [txn]"
-136,"L",2,16,0,16,1,10,10,65505,65505,FALSE,FALSE,FALSE,65559,513,0,0,0,0,"xid 2 pages + 1 byte; data 10 bytes (exact fit) [txn]"
-137,"L",4,16,0,16,-1,10,10,131039,131039,FALSE,FALSE,FALSE,131093,1025,0,0,0,0,"xid 4 pages – 1 byte; data 10 bytes (exact fit) [txn]"
-138,"L",4,16,0,16,0,10,10,131040,131040,FALSE,FALSE,FALSE,131094,1025,0,0,0,0,"xid 4 pages; data 10 bytes (exact fit) [txn]"
-139,"L",4,16,0,16,1,10,10,131041,131041,FALSE,FALSE,FALSE,131095,1025,0,0,0,0,"xid 4 pages + 1 byte; data 10 bytes (exact fit) [txn]"
-140,"L",3.5,16,0,16,0,10,10,114656,114656,FALSE,FALSE,FALSE,114710,897,0,0,0,0,"xid 3.5 pages; data 10 bytes (exact fit) [txn]"
-141,"L",3.5,16,0,16,1,10,10,114657,114657,FALSE,FALSE,FALSE,114711,897,0,0,0,0,"xid 3.5 pages + 1 byte; data 10 bytes (exact fit) [txn]"
-142,"L",1,16,0,16,-1,10,10,32735,32735,TRUE,FALSE,FALSE,32789,257,32779,257,32771,257,"xid 1 page – 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
-143,"L",1,16,0,16,0,10,10,32736,32736,TRUE,FALSE,FALSE,32790,257,32780,257,32772,257,"xid 1 page for enq rec; data 10 bytes (exact fit) [deq, txn]"
-144,"L",1,16,0,16,1,10,10,32737,32737,TRUE,FALSE,FALSE,32791,257,32781,257,32773,257,"xid 1 page + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
-145,"L",2,16,0,16,-1,10,10,65503,65503,TRUE,FALSE,FALSE,65557,513,65547,513,65539,513,"xid 2 pages – 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
-146,"L",2,16,0,16,0,10,10,65504,65504,TRUE,FALSE,FALSE,65558,513,65548,513,65540,513,"xid 2 pages for enq rec; data 10 bytes (exact fit) [deq, txn]"
-147,"L",2,16,0,16,1,10,10,65505,65505,TRUE,FALSE,FALSE,65559,513,65549,513,65541,513,"xid 2 pages + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
-148,"L",4,16,0,16,-1,10,10,131039,131039,TRUE,FALSE,FALSE,131093,1025,131083,1025,131075,1025,"xid 4 pages – 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
-149,"L",4,16,0,16,0,10,10,131040,131040,TRUE,FALSE,FALSE,131094,1025,131084,1025,131076,1025,"xid 4 pages for enq rec; data 10 bytes (exact fit) [deq, txn]"
-150,"L",4,16,0,16,1,10,10,131041,131041,TRUE,FALSE,FALSE,131095,1025,131085,1025,131077,1025,"xid 4 pages + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
-151,"L",3.5,16,0,16,0,10,10,114656,114656,TRUE,FALSE,FALSE,114710,897,114700,897,114692,897,"xid 3.5 pages for enq rec; data 10 bytes (exact fit) [deq, txn]"
-152,"L",3.5,16,0,16,1,10,10,114657,114657,TRUE,FALSE,FALSE,114711,897,114701,897,114693,897,"xid 3.5 pages + 1 byte for enq rec; data 10 bytes (exact fit) [deq, txn]"
-153,"L",1,16,0,16,-1,10,10,32735,32735,TRUE,FALSE,FALSE,32789,257,32779,257,32771,257,"xid 1 page – 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
-154,"L",1,16,0,16,0,10,10,32736,32736,TRUE,FALSE,FALSE,32790,257,32780,257,32772,257,"xid 1 page for deq rec; data 10 bytes (exact fit) [deq, txn]"
-155,"L",1,16,0,16,1,10,10,32737,32737,TRUE,FALSE,FALSE,32791,257,32781,257,32773,257,"xid 1 page + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
-156,"L",2,16,0,16,-1,10,10,65503,65503,TRUE,FALSE,FALSE,65557,513,65547,513,65539,513,"xid 2 pages – 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
-157,"L",2,16,0,16,0,10,10,65504,65504,TRUE,FALSE,FALSE,65558,513,65548,513,65540,513,"xid 2 pages for deq rec; data 10 bytes (exact fit) [deq, txn]"
-158,"L",2,16,0,16,1,10,10,65505,65505,TRUE,FALSE,FALSE,65559,513,65549,513,65541,513,"xid 2 pages + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
-159,"L",4,16,0,16,-1,10,10,131039,131039,TRUE,FALSE,FALSE,131093,1025,131083,1025,131075,1025,"xid 4 pages – 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
-160,"L",4,16,0,16,0,10,10,131040,131040,TRUE,FALSE,FALSE,131094,1025,131084,1025,131076,1025,"xid 4 pages for deq rec; data 10 bytes (exact fit) [deq, txn]"
-161,"L",4,16,0,16,1,10,10,131041,131041,TRUE,FALSE,FALSE,131095,1025,131085,1025,131077,1025,"xid 4 pages + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
-162,"L",3.5,16,0,16,0,10,10,114656,114656,TRUE,FALSE,FALSE,114710,897,114700,897,114692,897,"xid 3.5 pages for deq rec; data 10 bytes (exact fit) [deq, txn]"
-163,"L",3.5,16,0,16,1,10,10,114657,114657,TRUE,FALSE,FALSE,114711,897,114701,897,114693,897,"xid 3.5 pages + 1 byte for deq rec; data 10 bytes (exact fit) [deq, txn]"
-164,"L",1,16,0,16,-1,10,10,32743,32743,TRUE,FALSE,FALSE,32797,257,32787,257,32779,257,"xid 1 page – 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
-165,"L",1,16,0,16,0,10,10,32744,32744,TRUE,FALSE,FALSE,32798,257,32788,257,32780,257,"xid 1 page for txn rec; data 10 bytes (exact fit) [deq, txn]"
-166,"L",1,16,0,16,1,10,10,32745,32745,TRUE,FALSE,FALSE,32799,257,32789,257,32781,257,"xid 1 page + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
-167,"L",2,16,0,16,-1,10,10,65511,65511,TRUE,FALSE,FALSE,65565,513,65555,513,65547,513,"xid 2 pages – 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
-168,"L",2,16,0,16,0,10,10,65512,65512,TRUE,FALSE,FALSE,65566,513,65556,513,65548,513,"xid 2 pages for txn rec; data 10 bytes (exact fit) [deq, txn]"
-169,"L",2,16,0,16,1,10,10,65513,65513,TRUE,FALSE,FALSE,65567,513,65557,513,65549,513,"xid 2 pages + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
-170,"L",4,16,0,16,-1,10,10,131047,131047,TRUE,FALSE,FALSE,131101,1025,131091,1025,131083,1025,"xid 4 pages – 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
-171,"L",4,16,0,16,0,10,10,131048,131048,TRUE,FALSE,FALSE,131102,1025,131092,1025,131084,1025,"xid 4 pages for txn rec; data 10 bytes (exact fit) [deq, txn]"
-172,"L",4,16,0,16,1,10,10,131049,131049,TRUE,FALSE,FALSE,131103,1025,131093,1025,131085,1025,"xid 4 pages + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
-173,"L",3.5,16,0,16,0,10,10,114664,114664,TRUE,FALSE,FALSE,114718,897,114708,897,114700,897,"xid 3.5 pages for txn rec; data 10 bytes (exact fit) [deq, txn]"
-174,"L",3.5,16,0,16,1,10,10,114665,114665,TRUE,FALSE,FALSE,114719,897,114709,897,114701,897,"xid 3.5 pages + 1 byte for txn rec; data 10 bytes (exact fit) [deq, txn]"
-,,,,,,,,,,,,,,,,,,,,
-"High volume tests of random message lengths - RHM_WRONLY req'd for auto-dequeue == FALSE",,,,,,,,,,,,,,,,,,,,
-#175,"M",1,5000000,0,5000000,0,0,84,0,0,TRUE,FALSE,FALSE,128,1,32,1,0,0,"1 dblk max [deq]"
-#176,"M",3,3000000,0,3000000,0,0,340,0,0,TRUE,FALSE,FALSE,384,3,32,1,0,0,"3 dblks max [deq]"
-#177,"M",10,1600000,0,1600000,0,0,1236,0,0,TRUE,FALSE,FALSE,1280,10,32,1,0,0,"10 dblks max [deq]"
-#178,"M",30,600000,0,600000,0,0,3796,0,0,TRUE,FALSE,FALSE,3840,30,32,1,0,0,"30 dblks max [deq]"
-#179,"M",100,200000,0,200000,0,0,12756,0,0,TRUE,FALSE,FALSE,12800,100,32,1,0,0,"100 dblks max [deq]"
-#180,"M",300,60000,0,60000,0,0,38356,0,0,TRUE,FALSE,FALSE,38400,300,32,1,0,0,"300 dblks max [deq]"
-#181,"M",1000,20000,0,20000,0,0,127956,0,0,TRUE,FALSE,FALSE,128000,1000,32,1,0,0,"1000 dblks max [deq]"
-#182,"M",1,5000000,0,5000000,0,0,100,1,100,TRUE,FALSE,FALSE,244,2,144,2,136,2,"100 bytes xid max + 100 bytes data max [deq txn]"
-#183,"M",3,3000000,0,3000000,0,0,300,1,300,TRUE,FALSE,FALSE,644,6,344,3,336,3,"300 bytes xid max + 300 bytes data max [deq txn]"
-#184,"M",10,1600000,0,1600000,0,0,1000,1,1000,TRUE,FALSE,FALSE,2044,16,1044,9,1036,9,"1000 bytes xid max + 1000 bytes data max [deq txn]"
-#185,"M",30,600000,0,600000,0,0,3000,1,3000,TRUE,FALSE,FALSE,6044,48,3044,24,3036,24,"3000 bytes xid max + 3000 bytes data max [deq txn]"
-#186,"M",100,200000,0,200000,0,0,10000,1,10000,TRUE,FALSE,FALSE,20044,157,10044,79,10036,79,"10000 bytes xid max + 10000 bytes data max [deq txn]"
-#187,"M",300,60000,0,60000,0,0,30000,1,30000,TRUE,FALSE,FALSE,60044,470,30044,235,30036,235,"30000 bytes xid max + 30000 bytes data max [deq txn]"
-#188,"M",1000,20000,0,20000,0,0,100000,1,100000,TRUE,FALSE,FALSE,200044,1563,100044,782,100036,782,"100000 bytes xid max + 100000 bytes data max [deq txn]"
-,,,,,,,,,,,,,,,,,,,,
-"STANDARD PERFORMANCE BENCHMARK: 10,000,000 writes, data=212b (2 dblks)",,,,,,,,,,,,,,,,,,,,
-#189,"M",1,10000000,0,10000000,0,212,212,0,0,TRUE,FALSE,FALSE,256,2,32,1,0,0,"212 bytes data (2 dblks enq + 1 dblk deq)"
-#190,"M",1,10000000,0,10000000,0,148,148,64,64,TRUE,FALSE,FALSE,256,2,108,1,100,1,"148 bytes data + 64 bytes xid (2 dblks enq + 1 dblks deq + 1 dblks txn)"
Modified: store/trunk/cpp/tests/unit_test.h
===================================================================
--- store/trunk/cpp/tests/unit_test.h 2008-03-04 21:50:38 UTC (rev 1759)
+++ store/trunk/cpp/tests/unit_test.h 2008-03-05 15:22:04 UTC (rev 1760)
@@ -22,21 +22,31 @@
*
*/
-// Workaround so we can build against boost 1.33 and boost 1.34.
-// Remove when we no longer need to support 1.33.
-//
+// Workaround so we can build against boost 1.32, 1.33 and boost 1.34.
+// Remove when we no longer need to support 1.32 or 1.33.
+
#include <boost/version.hpp>
-#if (BOOST_VERSION < 103400)
+#if (BOOST_VERSION < 103300)
# include <boost/test/auto_unit_test.hpp>
+# define QPID_AUTO_TEST_SUITE(name)
+# define QPID_AUTO_TEST_CASE(name) BOOST_AUTO_UNIT_TEST(name)
+# define QPID_AUTO_TEST_SUITE_END()
+
+#elif (BOOST_VERSION < 103400)
+
+# include <boost/test/auto_unit_test.hpp>
+
# define QPID_AUTO_TEST_SUITE(name) BOOST_AUTO_TEST_SUITE(name);
+# define QPID_AUTO_TEST_CASE(name) BOOST_AUTO_TEST_CASE(name)
# define QPID_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END();
#else
# define QPID_AUTO_TEST_SUITE(name) BOOST_AUTO_TEST_SUITE(name)
+# define QPID_AUTO_TEST_CASE(name) BOOST_AUTO_TEST_CASE(name)
# define QPID_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
# include <boost/test/unit_test.hpp>
16 years, 10 months
- 1
- 0
rhmessaging commits: r1759 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-03-04 16:50:38 -0500 (Tue, 04 Mar 2008)
New Revision: 1759
Modified:
mgmt/cumin/python/cumin/broker.py
Log:
Avoid an import cycle and remove a duplicate class definition
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2008-03-04 21:50:02 UTC (rev 1758)
+++ mgmt/cumin/python/cumin/broker.py 2008-03-04 21:50:38 UTC (rev 1759)
@@ -707,28 +707,6 @@
return not len(nerrs) and not len(aerrs)
-# XXX I would like to move this to brokergroup.py, once I fix the
-# python import issues
-class BrokerGroupInputSet(CheckboxInputSet):
- def __init__(self, app, name, form):
- super(BrokerGroupInputSet, self).__init__(app, name, form)
-
- param = ListParameter(app, "param", BrokerGroupParameter(app, "item"))
- self.add_parameter(param)
- self.set_parameter(param)
-
- def do_get_items(self, session, model):
- return BrokerGroup.select()
-
- def render_item_value(self, session, group):
- return group.id
-
- def render_item_content(self, session, group):
- return group.name
-
- def render_item_checked_attr(self, session, group):
- return group in self.param.get(session) and "checked=\"checked\""
-
class BrokerEdit(CuminForm, Frame):
def __init__(self, app, name):
super(BrokerEdit, self).__init__(app, name)
@@ -824,3 +802,5 @@
def render_item_content(self, session, id):
return "Unregister Broker '%s'" % BrokerRegistration.get(id).name
+
+from brokergroup import BrokerGroupInputSet
16 years, 10 months
- 1
- 0
rhmessaging commits: r1758 - mgmt/notes.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-03-04 16:50:02 -0500 (Tue, 04 Mar 2008)
New Revision: 1758
Modified:
mgmt/notes/justin-todo.txt
Log:
Todo updates
Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt 2008-03-04 02:56:17 UTC (rev 1757)
+++ mgmt/notes/justin-todo.txt 2008-03-04 21:50:02 UTC (rev 1758)
@@ -6,6 +6,16 @@
* Investigate the double registration printout
+ * Don't let anyone close mgmt clients
+
+ - Waiting on an api change from Ted
+
+ * Put some kind of status on broker
+
+ * Gray out old rates
+
+ * Make it possible to navigate from broker to system
+
Deferred
* Blow up if we try to call set_redirect_url twice in a session
@@ -20,10 +30,6 @@
* Unregistering a broker doesn't disconnect it
- * Don't let anyone close mgmt clients
-
- - Waiting on an api change from Ted
-
* Validate paginator current page and reset as necessary
* Tables: Make column sort disableable
@@ -34,16 +40,12 @@
* Move single object add frames to live under object frames
- * Put some kind of status on broker
-
* Make "act on" and item count in tables line up
* Document what "localhost" is relative to when adding brokers
* Add ability to clear action history
- * Gray out old rates
-
* Duration formatter has problems with very short durations
* Add "slowest views" tracking to cumin-bench
16 years, 10 months
- 1
- 0
rhmessaging commits: r1757 - in mgmt: notes and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-03-03 21:56:17 -0500 (Mon, 03 Mar 2008)
New Revision: 1757
Modified:
mgmt/cumin/python/wooly/tables.py
mgmt/cumin/python/wooly/tables.strings
mgmt/notes/justin-todo.txt
Log:
Add a sort direction indicator to table headings.
Modified: mgmt/cumin/python/wooly/tables.py
===================================================================
--- mgmt/cumin/python/wooly/tables.py 2008-03-03 22:03:18 UTC (rev 1756)
+++ mgmt/cumin/python/wooly/tables.py 2008-03-04 02:56:17 UTC (rev 1757)
@@ -27,13 +27,13 @@
header = column.header_class(self.app, "head", column)
self.set_header(column, header)
+ self.add_child(header)
if self.scolumn.default is None:
self.scolumn.default = column.name
def set_header(self, column, header):
self.headers_by_column[column] = header
- self.add_child(header)
def get_selected_column(self, session):
name = self.scolumn.get(session)
@@ -111,10 +111,12 @@
def render_href(self, session, object):
branch = session.branch()
- if self.column.name == self.parent.scolumn.get(session):
- self.parent.reversed.set(branch,
- not self.parent.reversed.get(session))
+ sel = self.parent.get_selected_column(session)
+ if sel is self.column:
+ self.parent.reversed.set \
+ (branch, not self.parent.reversed.get(session))
+
self.parent.scolumn.set(branch, self.column.name)
return branch.marshal()
@@ -122,9 +124,18 @@
def render_content(self, session, object):
return self.column.get_title(session, object)
- def render_class_attr(self, session, args):
+ def render_class_attr(self, session, object):
return self.column.get_class_attr(session)
+ def render_sort_arrow(self, session, object):
+ sel = self.parent.get_selected_column(session)
+
+ if sel is self.column:
+ if self.parent.reversed.get(session):
+ return "^"
+ else:
+ return "v"
+
class SqlTable(ItemTable):
def __init__(self, app, name):
super(SqlTable, self).__init__(app, name)
Modified: mgmt/cumin/python/wooly/tables.strings
===================================================================
--- mgmt/cumin/python/wooly/tables.strings 2008-03-03 22:03:18 UTC (rev 1756)
+++ mgmt/cumin/python/wooly/tables.strings 2008-03-04 02:56:17 UTC (rev 1757)
@@ -8,4 +8,4 @@
<tr>{cells}</tr>
[ItemTableColumnHeader.html]
-<th {class_attr}><a href="{href}">{content}</a></th>
+<th {class_attr}><a href="{href}">{content} {sort_arrow}</a></th>
Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt 2008-03-03 22:03:18 UTC (rev 1756)
+++ mgmt/notes/justin-todo.txt 2008-03-04 02:56:17 UTC (rev 1757)
@@ -1,11 +1,11 @@
Current
- * Tables: Add sort direction icon
-
* Tables: Make null values in tables dashes, not zeroes
* Get rid of single object confirms
+ * Investigate the double registration printout
+
Deferred
* Blow up if we try to call set_redirect_url twice in a session
16 years, 10 months
- 1
- 0
rhmessaging commits: r1756 - in mgmt: basil/python/basil and 3 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-03-03 17:03:18 -0500 (Mon, 03 Mar 2008)
New Revision: 1756
Modified:
mgmt/
mgmt/basil/python/basil/
mgmt/cumin/python/cumin/
mgmt/cumin/python/wooly/
mgmt/mint/python/mint/
Log:
Darn, svn ignore doesn't doesn't apply to subdirectories. Go back to
just setting it on the right directories.
Property changes on: mgmt
___________________________________________________________________
Name: svn:ignore
- *.pyc
Property changes on: mgmt/basil/python/basil
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Property changes on: mgmt/cumin/python/cumin
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Property changes on: mgmt/cumin/python/wooly
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Property changes on: mgmt/mint/python/mint
___________________________________________________________________
Name: svn:ignore
+ *.pyc
16 years, 10 months
- 1
- 0