Changeset 628577 for src/Actions/unittests

Timestamp:

Sep 19, 2013, 8:23:51 PM (11 years ago)

Author:

Frederik Heber <heber@…>

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, 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:

1d3563

Parents:

732507

git-author:

Frederik Heber <heber@…> (08/16/13 10:32:17)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:51)

Message:

Introduced ActionQueue which contains internal ActionRegistry.

• ActionQueue inherits ActionRegistry' singleton status.
• replaced all occurrences of AR::getInstance() by wrapper through AQ.

Location:

src/Actions/unittests

Files:

• ActionRegistryUnitTest.cpp (modified) (4 diffs)
• ActionRegistryUnitTest.hpp (modified) (2 diffs)
• ActionSequenceUnitTest.cpp (modified) (2 diffs)
• AtomsCalculationUnitTest.cpp (modified) (2 diffs)
• ManipulateAtomsUnitTest.cpp (modified) (2 diffs)

src/Actions/unittests/ActionRegistryUnitTest.cpp

@@ -41 +41 @@
 #include <typeinfo>
 
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionTrait.hpp"
@@ -60 +61 @@
 void ActionRegistryTest::setUp()
 {
-  ActionRegistry::getInstance();
+  AR = &ActionQueue::getInstance().getActionRegistry();
 };
 
@@ -66 +67 @@
 void ActionRegistryTest::tearDown()
 {
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
 };
 
@@ -73 +74 @@
   std::map <std::string, std::string> result;
 
-  ActionRegistry &AR = ActionRegistry::getInstance();
-  for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter) {
+  for (ActionRegistry::const_iterator iter = AR->getBeginIter(); iter != AR->getEndIter(); ++iter) {
     if ((iter->second)->Traits.hasShortForm()) {
       ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),

src/Actions/unittests/ActionRegistryUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
+namespace MoleCuilder {
+class ActionRegistry;
+};
 
 /********************************************** Test classes **************************************/
@@ -32 +35 @@
 
 private:
+      MoleCuilder::ActionRegistry *AR;
 };
 

src/Actions/unittests/ActionSequenceUnitTest.cpp

@@ -40 +40 @@
 #include "ActionSequenceUnitTest.hpp"
 #include "Actions/Action.hpp"
+#include "Actions/ActionHistory.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionSequence.hpp"
 #include "Actions/MakroAction.hpp"
-#include "Actions/ActionHistory.hpp"
-#include "Actions/ActionRegistry.hpp"
 
 #include "stubs/DummyUI.hpp"
@@ -191 +191 @@
 
   ActionHistory::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
   {
     UIFactory::purgeInstance();

src/Actions/unittests/AtomsCalculationUnitTest.cpp

@@ -45 +45 @@
 #include "Actions/AtomsCalculation.hpp"
 #include "Actions/AtomsCalculation_impl.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 
@@ -71 +71 @@
 void AtomsCalculationTest::tearDown(){
   World::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
 }
 

src/Actions/unittests/ManipulateAtomsUnitTest.cpp

@@ -43 +43 @@
 #include "Descriptors/AtomIdDescriptor.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionHistory.hpp"
 
@@ -120 +120 @@
 void manipulateAtomsTest::tearDown(){
   World::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
   ActionHistory::purgeInstance();
   {