Changeset cd032d for src/unittests/manipulateAtomsTest.cpp

Timestamp:

Mar 11, 2010, 2:46:41 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

68d781

Parents:

a77c96 (diff), ed58ad (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 'StructureRefactoring' into QT4Refactoring

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/defs.hpp

File:

• src/unittests/manipulateAtomsTest.cpp (modified) (6 diffs)

src/unittests/manipulateAtomsTest.cpp

@@ -22 +22 @@
 #include "atom.hpp"
 
+#ifdef HAVE_TESTRUNNER
+#include "UnitTestMain.hpp"
+#endif /*HAVE_TESTRUNNER*/
+
 // Registers the fixture into the 'registry'
 CPPUNIT_TEST_SUITE_REGISTRATION( manipulateAtomsTest );
@@ -30 +34 @@
   AtomStub(int _id) :
   atom(),
-  id(_id),
-  manipulated(false)
+  manipulated(false),
+  id(_id)
   {}
 
@@ -66 +70 @@
 // set up and tear down
 void manipulateAtomsTest::setUp(){
-  World::get();
+  World::getInstance();
   for(int i=0;i<ATOM_COUNT;++i){
     atoms[i]= new AtomStub(i);
-    World::get()->registerAtom(atoms[i]);
+    World::getInstance().registerAtom(atoms[i]);
   }
 }
 void manipulateAtomsTest::tearDown(){
-  World::destroy();
-  ActionRegistry::purgeRegistry();
-}
-
-// some helper functions
-static bool hasAll(std::vector<atom*> atoms,int min, int max, std::set<int> excluded = std::set<int>()){
-  for(int i=min;i<max;++i){
-    if(!excluded.count(i)){
-      std::vector<atom*>::iterator iter;
-      bool res=false;
-      for(iter=atoms.begin();iter!=atoms.end();++iter){
-        res |= (*iter)->getId() == i;
-      }
-      if(!res) {
-        cout << "Atom " << i << " missing in returned list" << endl;
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-static bool hasNoDuplicates(std::vector<atom*> atoms){
-  std::set<int> found;
-  std::vector<atom*>::iterator iter;
-  for(iter=atoms.begin();iter!=atoms.end();++iter){
-    int id = (*iter)->getId();
-    if(found.count(id))
-      return false;
-    found.insert(id);
-  }
-  return true;
+  World::purgeInstance();
+  ActionRegistry::purgeInstance();
 }
 
@@ -115 +89 @@
 
 void manipulateAtomsTest::testManipulateSimple(){
-  ManipulateAtomsProcess *proc = World::get()->manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms());
+  ManipulateAtomsProcess *proc = World::getInstance().manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms());
   proc->call();
-  std::vector<atom*> allAtoms = World::get()->getAllAtoms(AllAtoms());
+  std::vector<atom*> allAtoms = World::getInstance().getAllAtoms(AllAtoms());
   std::vector<atom*>::iterator iter;
   for(iter=allAtoms.begin();iter!=allAtoms.end();++iter){
@@ -128 +102 @@
 
 void manipulateAtomsTest::testManipulateExcluded(){
-  ManipulateAtomsProcess *proc = World::get()->manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
+  ManipulateAtomsProcess *proc = World::getInstance().manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
   proc->call();
-  std::vector<atom*> allAtoms = World::get()->getAllAtoms(AllAtoms());
+  std::vector<atom*> allAtoms = World::getInstance().getAllAtoms(AllAtoms());
   std::vector<atom*>::iterator iter;
   for(iter=allAtoms.begin();iter!=allAtoms.end();++iter){
@@ -145 +119 @@
 void manipulateAtomsTest::testObserver(){
   countObserver *obs = new countObserver();
-  World::get()->signOn(obs);
-  ManipulateAtomsProcess *proc = World::get()->manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
+  World::getInstance().signOn(obs);
+  ManipulateAtomsProcess *proc = World::getInstance().manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
   proc->call();
 
   CPPUNIT_ASSERT_EQUAL(1,obs->count);
-  World::get()->signOff(obs);
+  World::getInstance().signOff(obs);
   delete obs;
 }