Changeset dc5413 for molecuilder/src/unittests/atomsCalculationTest.cpp

Timestamp:

Feb 26, 2010, 1:57:01 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

78b9d9, d50264

Parents:

e65cc0 (diff), 45cc89 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'FreddiesRefactoring' into StructureRefactoring

Conflicts:

molecuilder/src/Patterns/Observer.cpp
molecuilder/src/World.cpp
molecuilder/src/boundary.cpp
molecuilder/src/molecule_dynamics.cpp
molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/AnalysisPairCorrelationUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/listofbondsunittest.cpp

File:

• molecuilder/src/unittests/atomsCalculationTest.cpp (modified) (4 diffs)

molecuilder/src/unittests/atomsCalculationTest.cpp

@@ -63 +63 @@
 
 // some helper functions
-bool hasAll(std::vector<int> ids,int min, int max, std::set<int> excluded = std::set<int>()){
+static bool hasAll(std::vector<int> ids,int min, int max, std::set<int> excluded = std::set<int>()){
   for(int i=min;i<max;++i){
     if(!excluded.count(i)){
@@ -80 +80 @@
 }
 
-bool hasNoDuplicates(std::vector<int> ids){
+static bool hasNoDuplicates(std::vector<int> ids){
   std::set<int> found;
   std::vector<int>::iterator iter;
@@ -92 +92 @@
 }
 
-void operation(atom* _atom){
+static void operation(atom* _atom){
   AtomStub *atom = dynamic_cast<AtomStub*>(_atom);
   assert(atom);
@@ -116 +116 @@
   CPPUNIT_ASSERT_EQUAL((size_t)(ATOM_COUNT-1),allIds.size());
 }
-
-/********************************************** Main routine **************************************/
-
-int main(int argc, char **argv)
-{
-  // Get the top level suite from the registry
-  CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-
-  // Adds the test to the list of test to run
-  CppUnit::TextUi::TestRunner runner;
-  runner.addTest( suite );
-
-  // Change the default outputter to a compiler error format outputter
-  runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(),
-                                                       std::cerr ) );
-  // Run the tests.
-  bool wasSucessful = runner.run();
-
-  // Return error code 1 if the one of test failed.
-  return wasSucessful ? 0 : 1;
-};