Changeset 10aee4 for src/Actions/unittests

Timestamp:

Aug 5, 2015, 7:12:24 AM (9 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:

c307ba

Parents:

94232b

git-author:

Frederik Heber <heber@…> (08/03/15 09:25:02)

git-committer:

Frederik Heber <heber@…> (08/05/15 07:12:24)

Message:

Cleaned up ActionQueue's interface: Actions are always cloned.

• Action's dstor needs to be public as we have a clone() function.
• ActionRegistrys' (and AQ's) getActionByName now returns const ref. We must not return a ptr as it may not get deleted elsewhere. We are handing out prototypes.
• queueAction(action*,...) is private to prevent leakage, queueAction(string, ...) is the public interface.
• some other small functions are now private, too.
• MakroActions now need to clone() the prototype on prepare() and delete them on unprepare().
• ActionSequence deletes contained actions.
• FIX: ActionSequenceUnitTest cannot check on not-called property of removed actions anymore as these are gone now (they are deleted on removal and they are cloned on insertion).
• DOCU: Updated documentation on Actions.

File:

• src/Actions/unittests/ActionSequenceUnitTest.cpp (modified) (6 diffs)

src/Actions/unittests/ActionSequenceUnitTest.cpp

@@ -239 +239 @@
     {
       ActionSequence *sequence = new ActionSequence();
-      sequence->addAction(positive1);
-      sequence->addAction(positive2);
+      sequence->addAction(positive1->clone());
+      sequence->addAction(positive2->clone());
       CPPUNIT_ASSERT_EQUAL( true, sequence->canUndo() );
       delete sequence;
@@ -246 +246 @@
     {
       ActionSequence *sequence = new ActionSequence();
-      sequence->addAction(positive1);
-      sequence->addAction(negative2);
+      sequence->addAction(positive1->clone());
+      sequence->addAction(negative2->clone());
       CPPUNIT_ASSERT_EQUAL( false, sequence->canUndo() );
       delete sequence;
@@ -253 +253 @@
     {
       ActionSequence *sequence = new ActionSequence();
-      sequence->addAction(negative1);
-      sequence->addAction(positive2);
+      sequence->addAction(negative1->clone());
+      sequence->addAction(positive2->clone());
       CPPUNIT_ASSERT_EQUAL( false, sequence->canUndo() );
       delete sequence;
@@ -260 +260 @@
     {
       ActionSequence *sequence = new ActionSequence();
-      sequence->addAction(negative1);
-      sequence->addAction(negative2);
+      sequence->addAction(negative1->clone());
+      sequence->addAction(negative2->clone());
       CPPUNIT_ASSERT_EQUAL( false, sequence->canUndo() );
       delete sequence;
@@ -273 +273 @@
     CPPUNIT_ASSERT_EQUAL( true, sequence->canUndo() );
     // if only a positive action is contained it can be undone
-    sequence->addAction(positive1);
+    sequence->addAction(positive1->clone());
     CPPUNIT_ASSERT_EQUAL( true, sequence->canUndo() );
     // the single negative action should block the process
-    sequence->addAction(negative1);
+    sequence->addAction(negative1->clone());
     CPPUNIT_ASSERT_EQUAL( false, sequence->canUndo() );
     // after removing the negative action all is well again
-    sequence->removeLastAction();
+    delete sequence->removeLastAction();
     CPPUNIT_ASSERT_EQUAL( true, sequence->canUndo() );
     delete sequence;
@@ -287 +287 @@
 void ActionSequenceTest::doesCallTest(){
   ActionSequence *sequence = new ActionSequence();
-  sequence->addAction(shouldCall1);
-  sequence->addAction(shouldCall2);
-  sequence->addAction(shouldNotCall1);
-  sequence->addAction(shouldNotCall2);
-  sequence->removeLastAction();
-  sequence->removeLastAction();
+  sequence->addAction(shouldCall1->clone());
+  sequence->addAction(shouldCall2->clone());
+  sequence->addAction(shouldNotCall1->clone());
+  sequence->addAction(shouldNotCall2->clone());
+  delete sequence->removeLastAction();
+  delete sequence->removeLastAction();
 
   sequence->callAll();
 
-  CPPUNIT_ASSERT_EQUAL(true,shouldCall1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(true,shouldCall2->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(false,shouldNotCall1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(false,shouldNotCall2->wasCalled());
+  ActionSequence::actionSet::const_iterator iter = sequence->actions.begin();
+  CPPUNIT_ASSERT_EQUAL(true,dynamic_cast<wasCalledActionStub *>(*iter++)->wasCalled());
+  CPPUNIT_ASSERT_EQUAL(true,dynamic_cast<wasCalledActionStub *>(*iter++)->wasCalled());
+  CPPUNIT_ASSERT( iter == sequence->actions.end() );
 
   delete sequence;