livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed llinstancetracker unit test

meow-7.2.2
Richard Linden 2013-10-18 09:50:26 -07:00
parent 9f097380b8
commit 4170ef8ecc
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llcommon/tests/llinstancetracker_test.cpp
View File

@ -194,20 +194,21 @@ namespace tut
{
set_test_name("delete Keyed with outstanding instance_iter");
std::string what;
Keyed* keyed = new Keyed("one");
Keyed* keyed = new Keyed("delete Keyed with outstanding instance_iter");
{
WrapLL_ERRS wrapper;
WrapLLErrs wrapper;
Keyed::instance_iter i(Keyed::beginInstances());
try
{
delete keyed;
}
catch (const WrapLL_ERRS::FatalException& e)
catch (const WrapLLErrs::FatalException& e)
{
what = e.what();
}
}
ensure(! what.empty());
delete keyed;
}
template<> template<>
@ -215,15 +216,15 @@ namespace tut
{
set_test_name("delete Keyed with outstanding key_iter");
std::string what;
Keyed* keyed = new Keyed("one");
Keyed* keyed = new Keyed("delete Keyed with outstanding key_it");
{
WrapLL_ERRS wrapper;
WrapLLErrs wrapper;
Keyed::key_iter i(Keyed::beginKeys());
try
{
delete keyed;
}
catch (const WrapLL_ERRS::FatalException& e)
catch (const WrapLLErrs::FatalException& e)
{
what = e.what();
}
@ -238,13 +239,13 @@ namespace tut
std::string what;
Unkeyed* unkeyed = new Unkeyed;
{
WrapLL_ERRS wrapper;
WrapLLErrs wrapper;
Unkeyed::instance_iter i(Unkeyed::beginInstances());
try
{
delete unkeyed;
}
catch (const WrapLL_ERRS::FatalException& e)
catch (const WrapLLErrs::FatalException& e)
{
what = e.what();
}

8
indra/llcommon/tests/wrapllerrs.h
View File

@ -46,9 +46,9 @@
// replicate, but better to reuse
extern void wouldHaveCrashed(const std::string& message);
struct WrapLL_ERRS
struct WrapLLErrs
{
WrapLL_ERRS():
WrapLLErrs():
// Resetting Settings discards the default Recorder that writes to
// stderr. Otherwise, expected llerrs (LL_ERRS) messages clutter the
// console output of successful tests, potentially confusing things.
@ -57,10 +57,10 @@ struct WrapLL_ERRS
mPriorFatal(LLError::getFatalFunction())
{
// Make LL_ERRS call our own operator() method
LLError::setFatalFunction(boost::bind(&WrapLL_ERRS::operator(), this, _1));
LLError::setFatalFunction(boost::bind(&WrapLLErrs::operator(), this, _1));
}
~WrapLL_ERRS()
~WrapLLErrs()
{
LLError::setFatalFunction(mPriorFatal);
LLError::restoreSettings(mPriorErrorSettings);