From 518f4bac1a303cbdee49d6222c835f2069afb2cc Mon Sep 17 00:00:00 2001
From: Stefan Kangas <skangas@skangas.se>
Date: Fri, 10 Dec 2010 03:00:17 +0100
Subject: [PATCH] Use CHECK instead of REQUIRE in test suite.  (Ticket #250)

---
 tests/backend/test-fileheader.c               |  2 +-
 tests/backend/test-resourcecollector.c        |  2 +-
 tests/common/test-config.c                    | 72 +++++++++----------
 .../session/session-element-tracker-test.cpp  |  2 +-
 tests/lib/del-stash-test.cpp                  |  2 +-
 tests/lib/subsystem-runner-test.cpp           |  8 +--
 tests/lib/sync-locking-test.cpp               |  2 +-
 tests/lib/typed-allocation-manager-test.cpp   |  2 +-
 tests/lib/visitingtoolconcept.cpp             |  2 +-
 9 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/tests/backend/test-fileheader.c b/tests/backend/test-fileheader.c
index 5b206c7da..ca14b545a 100644
--- a/tests/backend/test-fileheader.c
+++ b/tests/backend/test-fileheader.c
@@ -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)
     {
diff --git a/tests/backend/test-resourcecollector.c b/tests/backend/test-resourcecollector.c
index f0d0f5dda..d555eb282 100644
--- a/tests/backend/test-resourcecollector.c
+++ b/tests/backend/test-resourcecollector.c
@@ -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);
diff --git a/tests/common/test-config.c b/tests/common/test-config.c
index f90441a8e..d89f09216 100644
--- a/tests/common/test-config.c
+++ b/tests/common/test-config.c
@@ -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 ());
diff --git a/tests/components/proc/mobject/session/session-element-tracker-test.cpp b/tests/components/proc/mobject/session/session-element-tracker-test.cpp
index c7e90b96b..7561f40d4 100644
--- a/tests/components/proc/mobject/session/session-element-tracker-test.cpp
+++ b/tests/components/proc/mobject/session/session-element-tracker-test.cpp
@@ -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
         }
diff --git a/tests/lib/del-stash-test.cpp b/tests/lib/del-stash-test.cpp
index f09500b98..dbe325be2 100644
--- a/tests/lib/del-stash-test.cpp
+++ b/tests/lib/del-stash-test.cpp
@@ -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];
           }
diff --git a/tests/lib/subsystem-runner-test.cpp b/tests/lib/subsystem-runner-test.cpp
index ec827dffc..10da60ac7 100644
--- a/tests/lib/subsystem-runner-test.cpp
+++ b/tests/lib/subsystem-runner-test.cpp
@@ -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();
diff --git a/tests/lib/sync-locking-test.cpp b/tests/lib/sync-locking-test.cpp
index 8ed1d9bbc..30734a759 100644
--- a/tests/lib/sync-locking-test.cpp
+++ b/tests/lib/sync-locking-test.cpp
@@ -176,7 +176,7 @@ namespace test{
       virtual void
       run (Arg)
         {
-          REQUIRE (ourVictim.checkAllEqual());
+          CHECK (ourVictim.checkAllEqual());
           {
             HavocThread threads[NUM_THREADS]   SIDEEFFECT;
           } 
diff --git a/tests/lib/typed-allocation-manager-test.cpp b/tests/lib/typed-allocation-manager-test.cpp
index f0e701504..8593c3a98 100644
--- a/tests/lib/typed-allocation-manager-test.cpp
+++ b/tests/lib/typed-allocation-manager-test.cpp
@@ -86,7 +86,7 @@ namespace test{
       virtual void
       run (Arg) 
         {
-          REQUIRE (0 == checksum_);
+          CHECK (0 == checksum_);
           
           TypedAllocationManager allocator;
           
diff --git a/tests/lib/visitingtoolconcept.cpp b/tests/lib/visitingtoolconcept.cpp
index 21effbf41..302bd3a6d 100644
--- a/tests/lib/visitingtoolconcept.cpp
+++ b/tests/lib/visitingtoolconcept.cpp
@@ -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