Changeset 727:aada518af30f in lemon-0.x for src/test

Timestamp:

07/22/04 16:21:46 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@982

Message:

• Better Makefile.am. (I hope.)
• Some more tests

Location:

src/test

Files:

• Makefile.am (modified) (1 diff)
• error_test.cc (modified) (2 diffs)
• test_tools_fail.cc (added)
• test_tools_pass.cc (added)
• xy_test.cc (modified) (3 diffs)

src/test/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-check_PROGRAMS = graph_test dijkstra_test time_measure_test 
+noinst_HEADERS = test_tools.h
+
+check_PROGRAMS = graph_test dijkstra_test time_measure_test error_test xy_test \
+        test_tools_pass test_tools_fail
 
 TESTS = $(check_PROGRAMS)
-XFAIL_TESTS =
+XFAIL_TESTS = test_tools_fail
 
-graph_test_SOURCES = graph_test.cc test_tools.h
-dijkstra_test_SOURCES = dijkstra_test.cc test_tools.h
+graph_test_SOURCES = graph_test.cc
+dijkstra_test_SOURCES = dijkstra_test.cc
 time_measure_test_SOURCES = time_measure_test.cc
+error_test_SOURCES = error_test.cc
+xy_test_SOURCES = xy_test.cc
+test_tools_pass_SOURCES = test_tools_pass.cc
+test_tools_fail_SOURCES = test_tools_fail.cc
+

src/test/error_test.cc

@@ -2 +2 @@
 
 #include <hugo/error.h>
-
+#include "test_tools.h"
 using namespace hugo;
 using std::cout;
@@ -22 +22 @@
 
 int main() {
-  bool no_errors = false;
-
   try {
-    cout << "Trying a faulty function\n";
     faulty_fn();
-    no_errors = true;
-    cout << "FAILED!\n";
+    check(false, "A faulty function did not fail.");
   }
   catch(const Exception &e) {
-    cout << "E: " << e.what() << endl;
+    cout << "Exeption = \"" << e.what() << "\" (Right behaviour)" << endl;
   }
 
   try {
-    cout << "Trying a function throwing Exception\n";
     exception_fn();
-    no_errors = true;
-    cout << "FAILED!\n";
+    check(false, "The function did not throw Exception.");
   }
   catch(const Exception &e) {
-    cout << "E: " << e.what() << endl;
+    cout << "Exeption = \"" << e.what() << "\" (Right behaviour)" << endl;
   }
 
   try {
-    cout << "Trying a function using FIXME\n";
     unfinished_fn();
-    no_errors = true;
-    cout << "FAILED!\n";
+    check(false, "FIXME macro does not work.");
   }
   catch(const Exception &e) {
-    cout << "E: " << e.what() << endl;
+    cout << "Exeption = \"" << e.what() << "\" (Right behaviour)" << endl;
   }
 
-  return no_errors ? 1 : 0;
+  return 0;
 }

src/test/xy_test.cc

@@ -1 +1 @@
 #include <hugo/xy.h>
 #include <iostream>
+#include "test_tools.h"
+
 using namespace std;
 using namespace hugo;
-
-bool passed = true;
-
-void check(bool rc, char *msg="") {
-  passed = passed && rc;
-  if(!rc) {
-    std::cerr << "Test failed! ("<< msg << ")" << std::endl; \
- 
-
-  }
-}
-
-
-
 int main()
 {
@@ -29 +17 @@
 
         seged = a+b;
-        check(seged.x==4 && seged.y==6);
+        check(seged.x==4 && seged.y==6, "Wrong vector addition");
 
         seged = a-b;
         check(seged.x==-2 && seged.y==-2, "a-b");
 
-        check(a.normSquare()==5);
+        check(a.normSquare()==5,"Wrong norm calculation");
         check(a*b==11, "a*b");
 
@@ -59 +47 @@
 
         seged.x=2;seged.y=3;
-        check(doboz1.inside(seged),"Inside? Should be.");
+        check(doboz1.inside(seged),"Inside? It should be.");
 
         seged.x=1;seged.y=3;
-        check(doboz1.inside(seged),"Inside? Should be.");
+        check(doboz1.inside(seged),"Inside? It should be.");
 
         seged.x=0;seged.y=3;
-        check(!doboz1.inside(seged),"Inside? Should not be.");
+        check(!doboz1.inside(seged),"Inside? It should not be.");
 
         BB doboz2(seged);
-        check(!doboz2.empty(), "empty? Should not be. Constructed from 1 point.");
+        check(!doboz2.empty(),
+              "empty? Should not be. Constructed from 1 point.");
 
         doboz2 += doboz1;
-        check(doboz2.inside(seged),"Inside? Should be. Incremented a box with an other.");
-
-        cout << (passed ? "All tests passed." : "Some of the tests failed!!!")
-             << endl;
-
-        return passed ? 0 : 1;
-
+        check(doboz2.inside(seged),
+              "Not inside? It should be. Incremented a box with an other.");
 }