Changeset 1245

Timestamp:

Mar 17, 2008, 1:50:37 PM (16 years ago)

Author:

Peter

Message:

working in #223

File:

• trunk/test/rnd_test.cc (modified) (4 diffs)

trunk/test/rnd_test.cc

@@ -25 +25 @@
 */
 
+#include "Suite.h"
+
 #include "yat/random/random.h"
 #include "yat/statistics/Histogram.h"
@@ -32 +34 @@
 #include <fstream>
 
-int main(const int argc,const char* argv[])
+int main(int argc, char* argv[])
 {
   using namespace theplu::yat::random;
-  std::ostream* message;
-  if (argc>1 && argv[1]==std::string("-v"))
-    message = &std::cerr;
-  else {
-    message = new std::ofstream("/dev/null");
-    if (argc>1)
-      std::cout << "rnd_test -v : for printing extra information\n";
-  }
-  *message << "testing rnd" << std::endl;
-  bool ok = true;
+  theplu::yat::test::Suite suite(argc, argv);
+  suite.err() << "testing rnd" << std::endl;
 
   RNG* rng=RNG::instance();
@@ -50 +44 @@
 
   // testing that minimal integer is zero for the generator
-  *message << "Checking that RNG minimum value is zero" << std::endl;
+  suite.err() << "Checking that RNG minimum value is zero" << std::endl;
   if (rng->min()){
-    *message << "Error: rng->min is not zero" << std::endl;
-    ok = false;
+    suite.err() << "Error: rng->min is not zero" << std::endl;
+    suite.add(false);
   }
 
-  *message << "Checking that all random generator can be constructed"
-           << std::endl;
+  suite.err() << "Checking that all random generator can be constructed"
+              << std::endl;
   theplu::yat::statistics::Histogram histogram(0,100,1000);
   DiscreteGeneral dg(histogram);
@@ -67 +61 @@
   Gaussian g;
 
-  if (message!=&std::cerr)
-    delete message;
-
-  return (ok ? 0 : -1);
+  return suite.return_value();
 }