Changeset 6682

Timestamp:

03/08/10 11:42:36 (18 months ago)

Author:

westram

Message:

• execute "slow" tests after other tests
• flagged save/load DB test as slow

Location:

trunk

Files:

• ARBDB/ad_save_load.cxx (modified) (1 diff)
• UNIT_TESTER/README.txt (modified) (1 diff)
• UNIT_TESTER/UnitTester.cxx (modified) (2 diffs)
• UNIT_TESTER/sym2testcode.pl (modified) (1 diff)

trunk/ARBDB/ad_save_load.cxx

@@ -1351 +1351 @@
 #define TEST_loadsave_CLEANUP() TEST_ASSERT(system("rm -f [ab]2[ab]*.* master.* slave.* renamed.* fast.* fast2b.* TEST_loadsave.ARF") == 0)
 
-void TEST_loadsave() {
+void TEST_SLOW_loadsave() {
     TEST_loadsave_CLEANUP();
 

trunk/UNIT_TESTER/README.txt

@@ -40 +40 @@
    Failing tests:
 
-          If you have some broken behavior that you cannot fix now, please do NOT leave
-          the test as "failing". Instead change TEST_ASSERT into
+      If you have some broken behavior that you cannot fix now, please do NOT leave
+      the test as "failing". Instead change TEST_ASSERT into
 
-              TEST_ASSERT_BROKEN(failing_condition);
+          TEST_ASSERT_BROKEN(failing_condition);
 
-          That will print a warning as reminder as long as the condition fails.
-          When the behavior was fixed (so that the condition is fulfilled now),
-          it will abort the test as failed!
-          Just change TEST_ASSERT_BROKEN back into TEST_ASSERT then.
+      That will print a warning as reminder as long as the condition fails.
+      When the behavior was fixed (so that the condition is fulfilled now),
+      it will abort the test as failed!
+      Just change TEST_ASSERT_BROKEN back into TEST_ASSERT then.
+
 
    Missing tests:
 
-           You may drop a reminder like
+      You may drop a reminder like
 
-               MISSING_TEST(describe what is missing);
+          MISSING_TEST(describe what is missing);
 
-           which will appear as warning during test run.
+      which will appear as warning during test run.
+
+
+   Order of tests:
+
+      Tests are executed in the order they appear in the code.
+      Multiple Files are sorted alphabethically.
+
+      Tests with names starting with 'TEST_SLOW_' are executed after
+      all other tests. These are meant to indicate "slow" tests
+      (i.e. tests which need more than a second to execute)
 
 

trunk/UNIT_TESTER/UnitTester.cxx

@@ -18 +18 @@
 #include <cstdlib>
 #include <cstdio>
+#include <cstring>
 
 #include <sys/time.h>
@@ -152 +153 @@
     }
 
+    if (duration_ms_this>1000) {                    // long test duration
+        if (strlen(test.name) <= 10 || memcmp(test.name, "TEST_SLOW_", 10) != 0) {
+            fprintf(stderr, "%s: Warning: Name of slow tests shall start with TEST_SLOW_ (it'll be run after other tests)\n",
+                    test.location);
+        }
+    }
+
     return result == TEST_OK;
 }

trunk/UNIT_TESTER/sym2testcode.pl

@@ -141 +141 @@
   } keys %$id_r;
 
+  # sort TEST_SLOW_ to the end
+  {
+    my @tests_fast = ();
+    my @tests_slow = ();
+
+    foreach (@tests) {
+      if (/^TEST_SLOW_/) { push @tests_slow, $_; }
+      else { push @tests_fast, $_; }
+    }
+
+    @tests = @tests_fast;
+    push @tests, @tests_slow;
+  }
+
   my $code = '';