Changeset 6367dd 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:

d649b7

Parents:

b5b01e

git-author:

Frederik Heber <heber@…> (08/19/13 16:17:07)

git-committer:

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

Message:

ActionHistory now is part of ActionQueue.

• TESTFIX: changes to Actions unit tests due to ActionHistory inside ActionQueue.

Location:

src/Actions/unittests

Files:

• ActionSequenceUnitTest.cpp (modified) (4 diffs)
• ManipulateAtomsUnitTest.cpp (modified) (3 diffs)

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"
@@ -156 +155 @@
 void ActionSequenceTest::setUp(){
   hasDescriptor = false;
-  ActionHistory::init();
+  // setup ActionHistory
+  ActionQueue::getInstance();
   // TODO: find a way to really reset the factory to a clean state in tear-down
   if(!hasDescriptor){
@@ -190 +190 @@
   delete shouldNotCall2;
 
-  ActionHistory::purgeInstance();
   ActionQueue::purgeInstance();
   {
@@ -285 +284 @@
   CPPUNIT_ASSERT_EQUAL(true,wasCalled2->wasCalled());
 
-  ActionHistory::getInstance().undoLast();
+  ActionQueue::getInstance().undoLast();
 
   CPPUNIT_ASSERT_EQUAL(false,wasCalled1->wasCalled());

src/Actions/unittests/ManipulateAtomsUnitTest.cpp

@@ -44 +44 @@
 #include "Actions/ManipulateAtomsProcess.hpp"
 #include "Actions/ActionQueue.hpp"
-#include "Actions/ActionHistory.hpp"
 
 #include "World.hpp"
@@ -105 +104 @@
 void manipulateAtomsTest::setUp(){
   hasDescriptor = false;
-  ActionHistory::init();
   World::getInstance();
+
+  // setup ActionHistory
+  ActionQueue::getInstance();
+
   // TODO: find a way to really reset the factory to a clean state in tear-down
   if(!hasDescriptor){
@@ -121 +123 @@
   World::purgeInstance();
   ActionQueue::purgeInstance();
-  ActionHistory::purgeInstance();
   {
     UIFactory::purgeInstance();