Use CHECK instead of REQUIRE in test suite. (Ticket #250)
This commit is contained in:
parent
661e4f0da5
commit
518f4bac1a
9 changed files with 47 additions and 47 deletions
|
|
@ -56,7 +56,7 @@ TEST (create_nowrite)
|
|||
{
|
||||
lumiera_backend_init ();
|
||||
LumieraFile file = lumiera_file_new (",tmp-fileheader", LUMIERA_FILE_READONLY);
|
||||
REQUIRE(file);
|
||||
CHECK(file);
|
||||
|
||||
LUMIERA_FILE_RDLOCK_SECTION (NOBUG_ON, file)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ TEST (basic)
|
|||
|
||||
TEST (memory_collection_mockup)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
CHECK (argv[2]);
|
||||
lumiera_resourcecollector_init ();
|
||||
|
||||
lumiera_resourcecollector_register_handler (LUMIERA_RESOURCE_MEMORY, test_memory_handler, NULL);
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ TEST (init)
|
|||
|
||||
TEST (configitem_simple)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
CHECK (argv[2]);
|
||||
|
||||
LumieraConfigitem item;
|
||||
|
||||
|
|
@ -83,9 +83,9 @@ TEST (lookup)
|
|||
|
||||
TEST (change_value)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
REQUIRE (argv[4]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
CHECK (argv[4]);
|
||||
|
||||
const char* value;
|
||||
|
||||
|
|
@ -112,8 +112,8 @@ TEST (change_value)
|
|||
|
||||
TEST (basic_set_get)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
|
||||
if (!lumiera_config_set (argv[2], argv[3]))
|
||||
printf ("failure setting first time '%s%s': %s\n", argv[2], argv[3], lumiera_error ());
|
||||
|
|
@ -135,8 +135,8 @@ TEST (basic_set_get)
|
|||
|
||||
TEST (number_get)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
|
||||
long long number = 0;
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ TEST (number_get)
|
|||
|
||||
TEST (number_get_nodefault)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
CHECK (argv[2]);
|
||||
|
||||
long long number = 0;
|
||||
|
||||
|
|
@ -168,8 +168,8 @@ TEST (number_get_nodefault)
|
|||
|
||||
TEST (number_set)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
|
||||
signed long long number = atoll (argv[3]);
|
||||
|
||||
|
|
@ -187,8 +187,8 @@ TEST (number_set)
|
|||
|
||||
TEST (string_get)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
|
||||
const char* string;
|
||||
|
||||
|
|
@ -205,8 +205,8 @@ TEST (string_get)
|
|||
|
||||
TEST (string_set)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
|
||||
if (!lumiera_config_string_set (argv[2], &argv[3]))
|
||||
printf ("failed setting string '%s=%s': %s\n", argv[2], argv[3], lumiera_error ());
|
||||
|
|
@ -223,8 +223,8 @@ TEST (string_set)
|
|||
|
||||
TEST (word_get)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
|
||||
const char* word;
|
||||
|
||||
|
|
@ -241,8 +241,8 @@ TEST (word_get)
|
|||
|
||||
TEST (word_set)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
|
||||
if (!lumiera_config_word_set (argv[2], &argv[3]))
|
||||
printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ());
|
||||
|
|
@ -259,7 +259,7 @@ TEST (word_set)
|
|||
|
||||
TEST (configitem_simple_ctor_dtor)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
CHECK (argv[2]);
|
||||
|
||||
LumieraConfigitem item;
|
||||
|
||||
|
|
@ -271,7 +271,7 @@ TEST (configitem_simple_ctor_dtor)
|
|||
|
||||
TEST (configitem_simple_content_check)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
CHECK (argv[2]);
|
||||
|
||||
LumieraConfigitem item;
|
||||
|
||||
|
|
@ -300,9 +300,9 @@ TEST (configitem_simple_content_check)
|
|||
|
||||
TEST (wordlist_get_nth)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
REQUIRE (argv[4]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
CHECK (argv[4]);
|
||||
|
||||
if (!lumiera_config_wordlist_set (argv[2], &argv[3]))
|
||||
printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ());
|
||||
|
|
@ -317,9 +317,9 @@ TEST (wordlist_get_nth)
|
|||
|
||||
TEST (wordlist_find)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
REQUIRE (argv[4]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
CHECK (argv[4]);
|
||||
|
||||
if (!lumiera_config_wordlist_set (argv[2], &argv[3]))
|
||||
printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ());
|
||||
|
|
@ -334,11 +334,11 @@ TEST (wordlist_find)
|
|||
|
||||
TEST (wordlist_replace)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
REQUIRE (argv[4]);
|
||||
REQUIRE (argv[5]);
|
||||
REQUIRE (argv[6]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
CHECK (argv[4]);
|
||||
CHECK (argv[5]);
|
||||
CHECK (argv[6]);
|
||||
|
||||
if (!lumiera_config_wordlist_set (argv[2], &argv[3]))
|
||||
printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ());
|
||||
|
|
@ -356,10 +356,10 @@ TEST (wordlist_replace)
|
|||
|
||||
TEST (wordlist_add)
|
||||
{
|
||||
REQUIRE (argv[2]);
|
||||
REQUIRE (argv[3]);
|
||||
REQUIRE (argv[4]);
|
||||
REQUIRE (argv[5]);
|
||||
CHECK (argv[2]);
|
||||
CHECK (argv[3]);
|
||||
CHECK (argv[4]);
|
||||
CHECK (argv[5]);
|
||||
|
||||
if (!lumiera_config_wordlist_set (argv[2], &argv[3]))
|
||||
printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ());
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ namespace test {
|
|||
void
|
||||
verify_cleanup (PTimeline aTimeline_in_session)
|
||||
{
|
||||
REQUIRE (1 < aTimeline_in_session.use_count(), "test object should still be attached to session");
|
||||
CHECK (1 < aTimeline_in_session.use_count(), "test object should still be attached to session");
|
||||
Session::current.reset();
|
||||
aTimeline_in_session->detach(); // should be a no-op and not cause any invalid access
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ namespace test{
|
|||
|
||||
~Probe()
|
||||
{
|
||||
REQUIRE (siz == mySiz_, "using wrong type information for de-allocation");
|
||||
CHECK (siz == mySiz_, "using wrong type information for de-allocation");
|
||||
for (uint i=0; i<siz; ++i)
|
||||
checksum -= myCrap_[i];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,14 +112,14 @@ namespace test {
|
|||
bool
|
||||
start (lumiera::Option&, Subsys::SigTerm termination)
|
||||
{
|
||||
REQUIRE (!(isUp_|started_|didRun_), "attempt to start %s twice!", cStr(*this));
|
||||
CHECK (!(isUp_|started_|didRun_), "attempt to start %s twice!", cStr(*this));
|
||||
|
||||
string startSpec (extractID ("start",spec_));
|
||||
CHECK (!isnil (startSpec));
|
||||
|
||||
if ("true"==startSpec) //----simulate successful subsystem start
|
||||
{
|
||||
REQUIRE (!started_);
|
||||
CHECK (!started_);
|
||||
|
||||
Thread (id_, bind (&MockSys::run, this, termination))
|
||||
.sync(); // run-status handshake
|
||||
|
|
@ -281,8 +281,8 @@ namespace test {
|
|||
|
||||
MockSys unit ("one", "start(true), run(true).");
|
||||
SubsystemRunner runner(dummyOpt);
|
||||
REQUIRE (!unit.isRunning());
|
||||
REQUIRE (!unit.didRun());
|
||||
CHECK (!unit.isRunning());
|
||||
CHECK (!unit.didRun());
|
||||
|
||||
runner.maybeRun (unit);
|
||||
bool emergency = runner.wait();
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ namespace test{
|
|||
virtual void
|
||||
run (Arg)
|
||||
{
|
||||
REQUIRE (ourVictim.checkAllEqual());
|
||||
CHECK (ourVictim.checkAllEqual());
|
||||
{
|
||||
HavocThread threads[NUM_THREADS] SIDEEFFECT;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ namespace test{
|
|||
virtual void
|
||||
run (Arg)
|
||||
{
|
||||
REQUIRE (0 == checksum_);
|
||||
CHECK (0 == checksum_);
|
||||
|
||||
TypedAllocationManager allocator;
|
||||
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ namespace lumiera
|
|||
callTrampoline (TAR& obj, TOOL& tool)
|
||||
{
|
||||
// cast down to real implementation type
|
||||
REQUIRE (INSTANCEOF (TOOLImpl, &tool));
|
||||
CHECK (INSTANCEOF (TOOLImpl, &tool));
|
||||
TOOLImpl& toolObj = static_cast<TOOLImpl&> (tool);
|
||||
|
||||
// trigger (compile time) overload resolution
|
||||
|
|
|
|||
Loading…
Reference in a new issue