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

Timestamp:

07/22/04 16:21:46 (21 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

File:

• src/test/xy_test.cc (modified) (3 diffs)

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.");
 }