Changeset 3139b2 for src/Actions/unittests

Timestamp:

Nov 7, 2011, 12:24:02 PM (14 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:

6ca7b9

Parents:

c20b35

git-author:

Frederik Heber <heber@…> (09/26/11 13:38:55)

git-committer:

Frederik Heber <heber@…> (11/07/11 12:24:02)

Message:

Renamed ActionTrait and ActionTraits.

• the specialized Trait contains multiple OptionTraits, hence is now called ActionTrait_s_, where its base class (that just has the OptionTrait for itself) is called ActionTrait.
• This caused many changes in other Action related files.

Location:

src/Actions/unittests

Files:

• ActionRegistryUnitTest.cpp (modified) (1 diff)
• ActionSequenceUnitTest.cpp (modified) (7 diffs)
• AtomsCalculationUnitTest.cpp (modified) (3 diffs)

src/Actions/unittests/ActionRegistryUnitTest.cpp

@@ -27 +27 @@
 
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 #include "Actions/OptionRegistry.hpp"
 #include "Actions/OptionTrait.hpp"

src/Actions/unittests/ActionSequenceUnitTest.cpp

@@ -46 +46 @@
 {
 public:
-  canUndoActionStub(const ActionTraits &_trait):
+  canUndoActionStub(const ActionTrait &_trait):
     Action(_trait,false){}
   virtual ~canUndoActionStub(){}
@@ -78 +78 @@
 {
 public:
-  cannotUndoActionStub(const ActionTraits &_trait) :
+  cannotUndoActionStub(const ActionTrait &_trait) :
     Action(_trait,false){}
   virtual ~cannotUndoActionStub(){}
@@ -110 +110 @@
 {
 public:
-  wasCalledActionStub(const ActionTraits &_trait) :
+  wasCalledActionStub(const ActionTrait &_trait) :
       Action(_trait,false),
       called(false)
@@ -157 +157 @@
   UIFactory::makeUserInterface("Dummy");
   // create some necessary stubs used in this test
-  ActionTraits canUndoTrait("canUndoActionStub");
-  ActionTraits cannotUndoTrait("cannotUndoActionStub");
+  ActionTrait canUndoTrait("canUndoActionStub");
+  ActionTrait cannotUndoTrait("cannotUndoActionStub");
   positive1 = new canUndoActionStub(canUndoTrait);
   positive2 = new canUndoActionStub(canUndoTrait);
@@ -164 +164 @@
   negative2 = new cannotUndoActionStub(cannotUndoTrait);
 
-  ActionTraits wasCalledTrait("wasCalledActionStub");
+  ActionTrait wasCalledTrait("wasCalledActionStub");
   shouldCall1 = new wasCalledActionStub(wasCalledTrait);
   shouldCall2 = new wasCalledActionStub(wasCalledTrait);
@@ -264 +264 @@
 void ActionSequenceTest::doesUndoTest(){
   ActionSequence *sequence = new ActionSequence();
-  ActionTraits wasCalledTrait("wasCalledActionStub");
+  ActionTrait wasCalledTrait("wasCalledActionStub");
   wasCalledActionStub *wasCalled1 = new wasCalledActionStub(wasCalledTrait);
   wasCalledActionStub *wasCalled2 = new wasCalledActionStub(wasCalledTrait);
@@ -270 +270 @@
   sequence->addAction(wasCalled2);
 
-  ActionTraits MakroTrait("Test MakroAction");
+  ActionTrait MakroTrait("Test MakroAction");
   MakroAction act(MakroTrait,sequence,false);
 

src/Actions/unittests/AtomsCalculationUnitTest.cpp

@@ -31 +31 @@
 #include "Actions/AtomsCalculation_impl.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 
 #include "World.hpp"
@@ -91 +91 @@
 
 void AtomsCalculationTest::testCalculateSimple(){
-  ActionTraits FooTrait("FOO");
+  ActionTrait FooTrait("FOO");
   AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),FooTrait,AllAtoms());
   std::vector<atomId_t> allIds = (*calc)();
@@ -99 +99 @@
 
 void AtomsCalculationTest::testCalculateExcluded(){
-  ActionTraits FooTrait("FOO");
+  ActionTrait FooTrait("FOO");
   atomId_t excluded = atomIds[ATOM_COUNT/2];
   AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),FooTrait,AllAtoms() && !AtomById(excluded));