Changeset 455573 for src/Actions/unittests

Timestamp:

Apr 18, 2011, 12:45:06 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:

4217e7

Parents:

ca2cfa

git-author:

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

git-committer:

Frederik Heber <heber@…> (04/18/11 12:45:06)

Message:

Large Commit: SUBDIRS in src/Makefile.am replaced by include.

• This should let make decide on the dependencies automatically.
• We had to change each Makefile.am due to different relative location now.
• FIX: convenience libs were not created due to lib_LT... instead of noinst_LT... (thanks, Ralf!)
• FIX: convenience libs cannot pass on dependencies on real libs, these (seemingly: libLinearAlgebra) have to be re-specified.
• FIX: RANDOMSOURCE/HEADER were still present to include in libMolecuilder although RandomNumbers have been outsourced for some time already.
• this should make it a lot easier for unit tests to get away with the massive dependencies because we may now include single libs and can construct stubs in replacement.

Location:

src/Actions/unittests

Files:

• ActionRegistryUnitTest.cpp (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)

src/Actions/unittests/ActionRegistryUnitTest.cpp

@@ -53 +53 @@
 
   ActionRegistry &AR = ActionRegistry::getInstance();
-  for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
+  for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter) {
     if ((iter->second)->Traits.hasShortForm()) {
       ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),
@@ -61 +61 @@
       result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();
     }
+  }
 }

src/Actions/unittests/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
+ACTIONTESTSSOURCES = \
+        ../Actions/unittests/ActionRegistryUnitTest.cpp \
+        ../Actions/unittests/ActionSequenceUnitTest.cpp \
+        ../Actions/unittests/AtomsCalculationUnitTest.cpp \
+        ../Actions/unittests/ManipulateAtomsUnitTest.cpp
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+ACTIONTESTSHEADERS = \
+        ../Actions/unittests/ActionRegistryUnitTest.hpp \
+        ../Actions/unittests/ActionSequenceUnitTest.hpp \
+        ../Actions/unittests/AtomsCalculationUnitTest.hpp \
+        ../Actions/unittests/ManipulateAtomsUnitTest.hpp
 
-TESTS = \
+ACTIONTESTS = \
   ActionRegistryUnitTest \
   ActionSequenceUnitTest \
@@ -13 +20 @@
   ManipulateAtomsUnitTest
 
-check_PROGRAMS = $(TESTS) 
-noinst_PROGRAMS = $(TESTS)
+TESTS += $(ACTIONTESTS)
+check_PROGRAMS += $(ACTIONTESTS) 
+noinst_PROGRAMS += $(ACTIONTESTS)
 
-BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
-GSLLIBS = \
-        ../../Shapes/libMolecuilderShapes.la \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
-ALLLIBS = \
-        ../../UIElements/libMolecuilderUI.la \
-        ../../Actions/libMolecuilderActions.la \
-        ${PARSERLIBS} \
-        ../../libMolecuilder.la \
-        ${GSLLIBS}
-
-PARSERLIBS = ../../Parser/libMolecuilderParser.la
-UILIBS = ../../UIElements/libMolecuilderUI.la  
-
+ACTIONLIBS = \
+        ../libMolecuilderUI.la
 
 ActionRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ActionRegistryUnitTest.cpp \
-        ActionRegistryUnitTest.hpp
-ActionRegistryUnitTest_LDADD = ${ALLLIBS}
+        ../Actions/unittests/ActionRegistryUnitTest.cpp \
+        ../Actions/unittests/ActionRegistryUnitTest.hpp
+ActionRegistryUnitTest_LDADD = ${ACTIONLIBS}
 
 ActionSequenceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ActionSequenceUnitTest.cpp \
-        ActionSequenceUnitTest.hpp
-ActionSequenceUnitTest_LDADD = ${ALLLIBS}
+        ../Actions/unittests/ActionSequenceUnitTest.cpp \
+        ../Actions/unittests/ActionSequenceUnitTest.hpp
+ActionSequenceUnitTest_LDADD = ${ACTIONLIBS}
 
 AtomsCalculationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        AtomsCalculationUnitTest.cpp \
-        AtomsCalculationUnitTest.hpp
-AtomsCalculationUnitTest_LDADD = ${ALLLIBS}
+        ../Actions/unittests/AtomsCalculationUnitTest.cpp \
+        ../Actions/unittests/AtomsCalculationUnitTest.hpp
+AtomsCalculationUnitTest_LDADD = ${ACTIONLIBS}
 
 ManipulateAtomsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ManipulateAtomsUnitTest.cpp \
-        ManipulateAtomsUnitTest.hpp
-ManipulateAtomsUnitTest_LDADD = ${ALLLIBS}
+        ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
+        ../Actions/unittests/ManipulateAtomsUnitTest.hpp
+ManipulateAtomsUnitTest_LDADD = ${ACTIONLIBS}