|
Last change
on this file since 25a549 was 075729, checked in by Frederik Heber <heber@…>, 15 years ago |
|
Merge branch 'Analysis_PairCorrelation' into StructureRefactoring
Conflicts:
molecuilder/src/Makefile.am
molecuilder/src/World.cpp
molecuilder/src/World.hpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/log.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/periodentafel.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/gslvectorunittest.cpp
molecuilder/src/unittests/logunittest.cpp
molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
molecuilder/src/vector.cpp
molecuilder/tests/Tesselations/defs.in
Conflicts have been many and too numerous to listen here, just the few general cases
- new molecule() replaced by World::getInstance().createMolecule()
- new atom() replaced by World::getInstance().createAtom() where appropriate.
- Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
- DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
- ...
Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.
This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.
It configures, compiles and runs all test cases and the test suite without errors.
Signed-off-by: Frederik Heber <heber@…>
|
-
Property mode
set to
100644
|
|
File size:
1.4 KB
|
| Line | |
|---|
| 1 | /*
|
|---|
| 2 | * logunittest.cpp
|
|---|
| 3 | */
|
|---|
| 4 |
|
|---|
| 5 |
|
|---|
| 6 | using namespace std;
|
|---|
| 7 |
|
|---|
| 8 | #include <cppunit/CompilerOutputter.h>
|
|---|
| 9 | #include <cppunit/extensions/TestFactoryRegistry.h>
|
|---|
| 10 | #include <cppunit/ui/text/TestRunner.h>
|
|---|
| 11 |
|
|---|
| 12 | #include "logunittest.hpp"
|
|---|
| 13 | #include "log.hpp"
|
|---|
| 14 | #include "defs.hpp"
|
|---|
| 15 | #include "verbose.hpp"
|
|---|
| 16 |
|
|---|
| 17 | #ifdef HAVE_TESTRUNNER
|
|---|
| 18 | #include "UnitTestMain.hpp"
|
|---|
| 19 | #endif /*HAVE_TESTRUNNER*/
|
|---|
| 20 |
|
|---|
| 21 | /********************************************** Test classes **************************************/
|
|---|
| 22 |
|
|---|
| 23 | // Registers the fixture into the 'registry'
|
|---|
| 24 | CPPUNIT_TEST_SUITE_REGISTRATION( LogTest );
|
|---|
| 25 |
|
|---|
| 26 |
|
|---|
| 27 | void LogTest::setUp()
|
|---|
| 28 | {
|
|---|
| 29 | };
|
|---|
| 30 |
|
|---|
| 31 | void LogTest::tearDown()
|
|---|
| 32 | {
|
|---|
| 33 | logger::purgeInstance();
|
|---|
| 34 | errorLogger::purgeInstance();
|
|---|
| 35 | };
|
|---|
| 36 |
|
|---|
| 37 | /**
|
|---|
| 38 | * UnitTest for log()
|
|---|
| 39 | */
|
|---|
| 40 | void LogTest::logTest()
|
|---|
| 41 | {
|
|---|
| 42 | logger::getInstance().setVerbosity(2);
|
|---|
| 43 | DoLog(0) && (Log() << Verbose(0) << "Verbosity level is set to 2." << endl);
|
|---|
| 44 | DoLog(0) && (Log() << Verbose(0) << "Test level 0" << endl);
|
|---|
| 45 | DoLog(1) && (Log() << Verbose(1) << "Test level 1" << endl);
|
|---|
| 46 | DoLog(2) && (Log() << Verbose(2) << "Test level 2" << endl);
|
|---|
| 47 | DoLog(3) && (Log() << Verbose(3) << "Test level 3" << endl);
|
|---|
| 48 | DoLog(4) && (Log() << Verbose(4) << "Test level 4" << endl);
|
|---|
| 49 |
|
|---|
| 50 | DoLog(0) && (Log() << Verbose(0) << "Output a log message." << endl);
|
|---|
| 51 | DoeLog(0) && (eLog()<< Verbose(0) << "Output an error message." << endl);
|
|---|
| 52 | setVerbosity(3);
|
|---|
| 53 | DoLog(4) && (Log() << Verbose(4) << "This should not be printed." << endl);
|
|---|
| 54 | DoeLog(4) && (eLog()<< Verbose(4) << "This should not be printed." << endl);
|
|---|
| 55 | };
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
