Changeset 197e13 for src/UIElements

Timestamp:

Mar 7, 2011, 11:40:27 AM (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:

d09093

Parents:

19290f

git-author:

Frederik Heber <heber@…> (03/02/11 13:31:11)

git-committer:

Frederik Heber <heber@…> (03/07/11 11:40:27)

Message:

Added MenuDescription_ActionRegistry_ConsistenyUnitTest to check whether Actions have menus not listed in MenuDescription.

• Menus may be added to Actions and there is so far no check on whether MenuDescriptions, i.e. the base for the menus of both QtUI and TextUI, knows about this Menu (it needs respective entries in three contained maps).

Location:

src/UIElements/Menu

Files:

• MenuDescription.hpp (modified) (1 diff)
• unittests/Makefile.am (modified) (2 diffs)
• unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp (added)
• unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp (added)

src/UIElements/Menu/MenuDescription.hpp ¶

@@ -28 +28 @@
 class MenuDescription : public Singleton<MenuDescription>
 {
+  //!> unit tests needs to access private maps
   friend class MenuDescriptionTest;
+  //!> unit tests needs to access private maps to check consistency against those stored in ActionRegistry
+  friend class MenuDescription_ActionRegistry_ConsistencyTest;
+
   friend class Singleton<MenuDescription>;
 public:

src/UIElements/Menu/unittests/Makefile.am ¶

@@ -8 +8 @@
 
 TESTS = \
-  MenuDescriptionUnitTest
+  MenuDescriptionUnitTest \
+  MenuDescription_ActionRegistry_ConsistencyUnitTest
 
 
@@ -22 +23 @@
         MenuDescriptionUnitTest.cpp \
         MenuDescriptionUnitTest.hpp \
-        ../MenuDescription.cpp
+        ../MenuDescription.cpp \
+        ../MenuDescription.hpp
 MenuDescriptionUnitTest_LDADD = $(MENULIBS)
 
+MenuDescription_ActionRegistry_ConsistencyUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp \
+        MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp
+MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD = \
+  ../../libMolecuilderUI.la \
+  ../../../Actions/libMolecuilderActions.la \
+        ../../../Graph/libMolecuilderGraph.la \
+        ../../../libMolecuilder.la \
+        ../../../Parser/libMolecuilderParser.la \
+        ../../../Shapes/libMolecuilderShapes.la \
+        ../../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
+        ../../../Exceptions/libMolecuilderExceptions.la \
+        ../../../RandomNumbers/libMolecuilderRandomNumbers.la \
+        ${CodePatterns_LIBS} \
+        $(BOOST_LIB)
+
+
 #AUTOMAKE_OPTIONS = parallel-tests