Moved littletest to new version

Sebastiano Merlino · Sebastiano Merlino · commit 61ce32fd9193 · 2012-11-22T21:41:43.000+01:00
diff --git a/test/littletest.hpp b/test/littletest.hpp
@@ -30,8 +30,6 @@
 #include <sys/time.h>
 #include <vector>
 
-#define littletest_version 1_0
-
 #define WARN 0
 #define CHECK 1
 #define ASSERT 2
@@ -329,9 +327,9 @@ class suite
             static_cast<suite_impl*>(this)->set_up();
         }
 
-        void suite_tier_down()
+        void suite_tear_down()
         {
-            static_cast<suite_impl*>(this)->tier_down();
+            static_cast<suite_impl*>(this)->tear_down();
         }
 
         suite() { }
@@ -360,7 +358,7 @@ struct test_runner
             last_checkpoint_line(-1),
             good_time_total(0.0),
             total_set_up_time(0.0),
-            total_tier_down_time(0.0),
+            total_tear_down_time(0.0),
             total_time(0.0)
         {
         }
@@ -394,7 +392,7 @@ struct test_runner
             std::cout << "Total run time: " << total_time << std::endl;
             std::cout << "Total time spent in tests: " << good_time_total << " ms" << std::endl;
             std::cout << "Average set up time: " << (total_set_up_time / test_counter) << " ms" << std::endl;
-            std::cout << "Average tier down time: " << (total_tier_down_time / test_counter) << " ms" << std::endl;
+            std::cout << "Average tear down time: " << (total_tear_down_time / test_counter) << " ms" << std::endl;
         }
 
         void add_failure()
@@ -424,9 +422,9 @@ struct test_runner
             total_set_up_time += t;
         }
 
-        void add_tier_down_time(double t)
+        void add_tear_down_time(double t)
         {
-            total_tier_down_time += t;
+            total_tear_down_time += t;
         }
 
         void add_total_time(double t)
@@ -473,7 +471,7 @@ struct test_runner
         int failures_counter;
         double good_time_total;
         double total_set_up_time;
-        double total_tier_down_time;
+        double total_tear_down_time;
         double total_time;
 };
 
@@ -492,7 +490,7 @@ class test : public test_base
 {
         virtual void run_test(test_runner* tr)
         {
-            double set_up_duration = 0.0, tier_down_duration = 0.0, test_duration = 0.0;
+            double set_up_duration = 0.0, tear_down_duration = 0.0, test_duration = 0.0;
             timeval before, after;
             try
             {
@@ -544,21 +542,21 @@ class test : public test_base
             try
             {
                 gettimeofday(&before, NULL);
-                static_cast<test_impl* >(this)->suite_tier_down();
+                static_cast<test_impl* >(this)->suite_tear_down();
                 gettimeofday(&after, NULL);
-                tier_down_duration = calculate_duration(&before, &after);
-                tr->add_tier_down_time(tier_down_duration);
+                tear_down_duration = calculate_duration(&before, &after);
+                tr->add_tear_down_time(tear_down_duration);
             }
             catch(std::exception& e)
             {
-                std::cout << "Exception during " << static_cast<test_impl* >(this)->name  << " tier down" << std::endl;
+                std::cout << "Exception during " << static_cast<test_impl* >(this)->name  << " tear down" << std::endl;
                 std::cout << e.what() << std::endl;
             }
             catch(...)
             {
-                std::cout << "Exception during " << static_cast<test_impl* >(this)->name  << " tier down" << std::endl;
+                std::cout << "Exception during " << static_cast<test_impl* >(this)->name  << " tear down" << std::endl;
             }
-            double total = set_up_duration + test_duration + tier_down_duration;
+            double total = set_up_duration + test_duration + tear_down_duration;
             tr->add_total_time(total);
         }
     protected:

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@`
`30`	`30`	`#include <sys/time.h>`
`31`	`31`	`#include <vector>`
`32`	`32`
`33`		`-#define littletest_version 1_0`
`34`		`-`
`35`	`33`	`#define WARN 0`
`36`	`34`	`#define CHECK 1`
`37`	`35`	`#define ASSERT 2`
`@@ -329,9 +327,9 @@ class suite`
`329`	`327`	`static_cast<suite_impl*>(this)->set_up();`
`330`	`328`	`}`
`331`	`329`
`332`		`- void suite_tier_down()`
	`330`	`+ void suite_tear_down()`
`333`	`331`	`{`
`334`		`- static_cast<suite_impl*>(this)->tier_down();`
	`332`	`+ static_cast<suite_impl*>(this)->tear_down();`
`335`	`333`	`}`
`336`	`334`
`337`	`335`	`suite() { }`
`@@ -360,7 +358,7 @@ struct test_runner`
`360`	`358`	`last_checkpoint_line(-1),`
`361`	`359`	`good_time_total(0.0),`
`362`	`360`	`total_set_up_time(0.0),`
`363`		`- total_tier_down_time(0.0),`
	`361`	`+ total_tear_down_time(0.0),`
`364`	`362`	`total_time(0.0)`
`365`	`363`	`{`
`366`	`364`	`}`
`@@ -394,7 +392,7 @@ struct test_runner`
`394`	`392`	`std::cout << "Total run time: " << total_time << std::endl;`
`395`	`393`	`std::cout << "Total time spent in tests: " << good_time_total << " ms" << std::endl;`
`396`	`394`	`std::cout << "Average set up time: " << (total_set_up_time / test_counter) << " ms" << std::endl;`
`397`		`- std::cout << "Average tier down time: " << (total_tier_down_time / test_counter) << " ms" << std::endl;`
	`395`	`+ std::cout << "Average tear down time: " << (total_tear_down_time / test_counter) << " ms" << std::endl;`
`398`	`396`	`}`
`399`	`397`
`400`	`398`	`void add_failure()`
`@@ -424,9 +422,9 @@ struct test_runner`
`424`	`422`	`total_set_up_time += t;`
`425`	`423`	`}`
`426`	`424`
`427`		`- void add_tier_down_time(double t)`
	`425`	`+ void add_tear_down_time(double t)`
`428`	`426`	`{`
`429`		`- total_tier_down_time += t;`
	`427`	`+ total_tear_down_time += t;`
`430`	`428`	`}`
`431`	`429`
`432`	`430`	`void add_total_time(double t)`
`@@ -473,7 +471,7 @@ struct test_runner`
`473`	`471`	`int failures_counter;`
`474`	`472`	`double good_time_total;`
`475`	`473`	`double total_set_up_time;`
`476`		`- double total_tier_down_time;`
	`474`	`+ double total_tear_down_time;`
`477`	`475`	`double total_time;`
`478`	`476`	`};`
`479`	`477`
`@@ -492,7 +490,7 @@ class test : public test_base`
`492`	`490`	`{`
`493`	`491`	`virtual void run_test(test_runner* tr)`
`494`	`492`	`{`
`495`		`- double set_up_duration = 0.0, tier_down_duration = 0.0, test_duration = 0.0;`
	`493`	`+ double set_up_duration = 0.0, tear_down_duration = 0.0, test_duration = 0.0;`
`496`	`494`	`timeval before, after;`
`497`	`495`	`try`
`498`	`496`	`{`
`@@ -544,21 +542,21 @@ class test : public test_base`
`544`	`542`	`try`
`545`	`543`	`{`
`546`	`544`	`gettimeofday(&before, NULL);`
`547`		`- static_cast<test_impl* >(this)->suite_tier_down();`
	`545`	`+ static_cast<test_impl* >(this)->suite_tear_down();`
`548`	`546`	`gettimeofday(&after, NULL);`
`549`		`- tier_down_duration = calculate_duration(&before, &after);`
`550`		`- tr->add_tier_down_time(tier_down_duration);`
	`547`	`+ tear_down_duration = calculate_duration(&before, &after);`
	`548`	`+ tr->add_tear_down_time(tear_down_duration);`
`551`	`549`	`}`
`552`	`550`	`catch(std::exception& e)`
`553`	`551`	`{`
`554`		`- std::cout << "Exception during " << static_cast<test_impl* >(this)->name << " tier down" << std::endl;`
	`552`	`+ std::cout << "Exception during " << static_cast<test_impl* >(this)->name << " tear down" << std::endl;`
`555`	`553`	`std::cout << e.what() << std::endl;`
`556`	`554`	`}`
`557`	`555`	`catch(...)`
`558`	`556`	`{`
`559`		`- std::cout << "Exception during " << static_cast<test_impl* >(this)->name << " tier down" << std::endl;`
	`557`	`+ std::cout << "Exception during " << static_cast<test_impl* >(this)->name << " tear down" << std::endl;`
`560`	`558`	`}`
`561`		`- double total = set_up_duration + test_duration + tier_down_duration;`
	`559`	`+ double total = set_up_duration + test_duration + tear_down_duration;`
`562`	`560`	`tr->add_total_time(total);`
`563`	`561`	`}`
`564`	`562`	`protected:`