Changeset 67e2b3 for src/unittests

Timestamp:

Mar 24, 2010, 4:26:21 PM (15 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, 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:

5b0b98

Parents:

ce1d8c

Message:

Added methods that allow bookkeeping of actions for undo/redo methods

File:

• src/unittests/ActionSequenceTest.cpp (modified) (4 diffs)

src/unittests/ActionSequenceTest.cpp

@@ -35 +35 @@
   virtual ~canUndoActionStub(){}
 
-  virtual void call(){}
-  virtual void undo(){}
+  virtual ActionState* performCall(){
+    return Action::success;
+  }
+  virtual ActionState* performUndo(ActionState*){
+    return Action::success;
+  }
+  virtual ActionState* performRedo(ActionState*){
+    return Action::success;
+  }
   virtual bool canUndo(){
+    return true;
+  }
+  virtual bool shouldUndo(){
     return true;
   }
@@ -48 +58 @@
   virtual ~cannotUndoActionStub(){}
 
-  virtual void call(){}
-  virtual void undo(){}
+  virtual ActionState* performCall(){
+    return Action::success;
+  }
+  virtual ActionState* performUndo(ActionState*){
+    return Action::success;
+  }
+  virtual ActionState* performRedo(ActionState*){
+    return Action::success;
+  }
   virtual bool canUndo(){
     return false;
+  }
+  virtual bool shouldUndo(){
+   return true;
   }
 };
@@ -64 +84 @@
   virtual ~wasCalledActionStub(){}
 
-  virtual void call(){
+  virtual ActionState* performCall(){
     called = true;
-  }
-  virtual void undo(){
+    return Action::success;
+  }
+  virtual ActionState* performUndo(ActionState*){
     called = false;
+    return Action::success;
+  }
+  virtual ActionState* performRedo(ActionState*){
+    called = true;
+    return Action::success;
   }
   virtual bool canUndo(){
+    return true;
+  }
+  virtual bool shouldUndo(){
     return true;
   }
@@ -185 +214 @@
   sequence->addAction(shouldCall2);
 
-  sequence->callAll();
-
-  sequence->removeLastAction();
-  sequence->removeLastAction();
-
-  sequence->undoAll();
+  ActionSequence::stateSet states = sequence->callAll();
+
+  sequence->removeLastAction();
+  sequence->removeLastAction();
+
+  sequence->undoAll(states);
 
   CPPUNIT_ASSERT_EQUAL(true,shouldCall1->wasCalled());