Changeset 690741 for src/Actions/unittests

Timestamp:

Sep 19, 2013, 8:23:52 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:

a6ceab

Parents:

1d3563

git-author:

Frederik Heber <heber@…> (08/16/13 11:47:48)

git-committer:

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

Message:

Added getListOfActions() and getActionsTrait() to completely wrap ActionRegistry.

Location:

src/Actions/unittests

Files:

• ActionRegistryUnitTest.cpp (modified) (2 diffs)
• ActionRegistryUnitTest.hpp (modified) (2 diffs)

src/Actions/unittests/ActionRegistryUnitTest.cpp

@@ -61 +61 @@
 void ActionRegistryTest::setUp()
 {
-  AR = &ActionQueue::getInstance().getActionRegistry();
 };
 
@@ -74 +73 @@
   std::map <std::string, std::string> result;
 
-  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(),
-          "Short form "+toString((iter->second)->Traits.getShortForm())+
-          " for action "+toString(iter->first)+" already present from "+
-          std::string(result[(iter->second)->Traits.getShortForm()])+"!");
-      result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();
+  ActionQueue &AQ = ActionQueue::getInstance();
+  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
+  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
+      iter != tokens.end(); ++iter) {
+    const ActionTrait &CurrentTrait = AQ.getActionsTrait(*iter);
+    if (CurrentTrait.hasShortForm()) {
+      ASSERT(result.find(CurrentTrait.getShortForm()) == result.end(),
+          "Short form "+toString(CurrentTrait.getShortForm())+
+          " for action "+toString(*iter)+" already present from "+
+          std::string(result[CurrentTrait.getShortForm()])+"!");
+      result[CurrentTrait.getShortForm()] = *iter;
     }
   }

src/Actions/unittests/ActionRegistryUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-namespace MoleCuilder {
-class ActionRegistry;
-};
-
 /********************************************** Test classes **************************************/
 
@@ -33 +29 @@
       void tearDown();
       void CheckDoublyUsedShortforms();
-
-private:
-      MoleCuilder::ActionRegistry *AR;
 };