ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small cleanup, replace try-catch by VERIFY_ERROR macro

Browse source
This commit is contained in:
Fischlurch 2010-12-03 02:28:29 +01:00
parent 56ceca398b
commit d1c64dd1c0
1 changed files with 26 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
tests/lib/scoped-holder-test.cpp
View file

@ -23,7 +23,9 @@
#include "lib/test/run.hpp" #include "lib/test/run.hpp"
#include "lib/test/test-helper.hpp"
#include "lib/util.hpp" #include "lib/util.hpp"
#include "lib/error.hpp"
#include "lib/scoped-holder.hpp" #include "lib/scoped-holder.hpp"
#include "testdummy.hpp" #include "testdummy.hpp"
@ -38,6 +40,7 @@ namespace test{
using ::Test; using ::Test;
using util::isnil; using util::isnil;
using lumiera::error::LUMIERA_ERROR_LOGIC;
using std::map; using std::map;
using std::cout; using std::cout;
@ -105,8 +108,8 @@ namespace test{
TRACE (test, "holder at %p", &holder); TRACE (test, "holder at %p", &holder);
TRACE (test, "object at %p", holder.get() ); TRACE (test, "object at %p", holder.get() );
TRACE (test, "size(object) = %u", sizeof(*holder)); TRACE (test, "size(object) = %lu", sizeof(*holder));
TRACE (test, "size(holder) = %u", sizeof(holder)); TRACE (test, "size(holder) = %lu", sizeof(holder));
} }
ASSERT (0==checksum); ASSERT (0==checksum);
} }
@ -157,60 +160,34 @@ namespace test{
ASSERT (holder); ASSERT (holder);
long currSum = checksum; long currSum = checksum;
void* adr = holder.get(); void* adr = holder.get();
try
{
holder2 = holder;
NOTREACHED ();
}
catch (lumiera::error::Logic&)
{
ASSERT (holder);
ASSERT (!holder2);
ASSERT (holder.get()==adr);
ASSERT (checksum==currSum);
}
try VERIFY_ERROR(LOGIC, holder2 = holder );
{ ASSERT (holder);
holder = holder2; ASSERT (!holder2);
NOTREACHED (); ASSERT (holder.get()==adr);
} ASSERT (checksum==currSum);
catch (lumiera::error::Logic&)
{ VERIFY_ERROR(LOGIC, holder = holder2 );
ASSERT (holder); ASSERT (holder);
ASSERT (!holder2); ASSERT (!holder2);
ASSERT (holder.get()==adr); ASSERT (holder.get()==adr);
ASSERT (checksum==currSum); ASSERT (checksum==currSum);
}
create_contained_object (holder2); create_contained_object (holder2);
ASSERT (holder2); ASSERT (holder2);
ASSERT (checksum != currSum); ASSERT (checksum != currSum);
currSum = checksum; currSum = checksum;
try
{ VERIFY_ERROR(LOGIC, holder = holder2 );
holder = holder2; ASSERT (holder);
NOTREACHED (); ASSERT (holder2);
} ASSERT (holder.get()==adr);
catch (lumiera::error::Logic&) ASSERT (checksum==currSum);
{
ASSERT (holder);
ASSERT (holder2);
ASSERT (holder.get()==adr);
ASSERT (checksum==currSum);
}
try VERIFY_ERROR(LOGIC, HO holder3 (holder2) );
{ ASSERT (holder);
HO holder3 (holder2); ASSERT (holder2);
NOTREACHED (); ASSERT (checksum==currSum);
}
catch (lumiera::error::Logic&)
{
ASSERT (holder);
ASSERT (holder2);
ASSERT (checksum==currSum);
}
} }
ASSERT (0==checksum); ASSERT (0==checksum);
} }