Changeset 543ce4 for molecuilder/src/unittests/bondgraphunittest.cpp

Timestamp:

Nov 4, 2009, 7:56:04 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

4ef101, aa8542

Parents:

ec70ec

Message:

Huge change from ofstream * (const) out --> Log().

• first shift was done via regular expressions
• then via error messages from the code
• note that class atom, class element and class molecule kept in parts their output stream, was they print to file.
• make check runs fine
• MISSING: Verbosity is not fixed for everything (i.e. if no endl; is present and next has Verbose(0) ...)

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/unittests/bondgraphunittest.cpp (modified) (2 diffs)

molecuilder/src/unittests/bondgraphunittest.cpp

@@ -104 +104 @@
 void BondGraphTest::LoadTableTest()
 {
-  CPPUNIT_ASSERT_EQUAL( true , BG->LoadBondLengthTable((ofstream *)&cout, *filename) );
+  CPPUNIT_ASSERT_EQUAL( true , BG->LoadBondLengthTable(*filename) );
   CPPUNIT_ASSERT_EQUAL( 1., BG->GetBondLength(0,0) );
   CPPUNIT_ASSERT_EQUAL( 1.2, BG->GetBondLength(0,1) );
@@ -117 +117 @@
   atom *Runner = TestMolecule->end->previous;
   CPPUNIT_ASSERT( TestMolecule->end != Walker );
-  CPPUNIT_ASSERT_EQUAL( true , BG->LoadBondLengthTable((ofstream *)&cout, *filename) );
-  CPPUNIT_ASSERT_EQUAL( true , BG->ConstructBondGraph((ofstream *)&cout, TestMolecule) );
+  CPPUNIT_ASSERT_EQUAL( true , BG->LoadBondLengthTable(*filename) );
+  CPPUNIT_ASSERT_EQUAL( true , BG->ConstructBondGraph(TestMolecule) );
   CPPUNIT_ASSERT_EQUAL( true , Walker->IsBondedTo(Runner) );
 };