Changeset a10cc0 for JobMarket/src/unittests

Timestamp:

Jul 6, 2012, 10:18:46 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, Candidate_v1.7.0, Candidate_v1.7.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:

7da5cd

Parents:

7546b0

git-author:

Frederik Heber <heber@…> (05/18/12 14:37:17)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:46)

Message:

Moved all Fragmentation/Automation into new subpackage JobMarket.

• adapted most files (which have been copied from sub-package LinearAlgebra).
• adapted all Makefile.ams to splitting.
• unit tests are ok.
• there is one very strange issue: Whereas for LinearAlgebra in its header files a prefix of "LinearAlgebra/" is _not_ required (and even has been removed when LinearAlgebra was placed in its own folder), the same does not hold for "JobMarket/". Here, we have to use both includes, one with the prefix and one without.
• NOTE: We force libJobMarket to be linked with c++ linker via dummy.cxx file.
• Removed all reference to FRAGMENT... in JobMarket's Makefile.am.

Location:

JobMarket/src/unittests

Files:

• FragmentJobUnitTest.cpp (moved) (moved from src/Fragmentation/Automation/unittests/FragmentJobUnitTest.cpp )
• FragmentJobUnitTest.hpp (moved) (moved from src/Fragmentation/Automation/unittests/FragmentJobUnitTest.hpp )
• FragmentQueueUnitTest.cpp (moved) (moved from src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp ) (1 diff)
• FragmentQueueUnitTest.hpp (moved) (moved from src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.hpp )
• FragmentResultUnitTest.cpp (moved) (moved from src/Fragmentation/Automation/unittests/FragmentResultUnitTest.cpp )
• FragmentResultUnitTest.hpp (moved) (moved from src/Fragmentation/Automation/unittests/FragmentResultUnitTest.hpp )
• Makefile.am (moved) (moved from src/Fragmentation/Automation/unittests/Makefile.am ) (9 diffs)
• OperationQueueUnitTest.cpp (moved) (moved from src/Fragmentation/Automation/unittests/OperationQueueUnitTest.cpp )
• OperationQueueUnitTest.hpp (moved) (moved from src/Fragmentation/Automation/unittests/OperationQueueUnitTest.hpp )
• SystemCommandJobUnitTest.cpp (moved) (moved from src/Fragmentation/Automation/unittests/SystemCommandJobUnitTest.cpp )
• SystemCommandJobUnitTest.hpp (moved) (moved from src/Fragmentation/Automation/unittests/SystemCommandJobUnitTest.hpp )
• UnitTestMain.cpp (added)
• WorkerAddressUnitTest.cpp (moved) (moved from src/Fragmentation/Automation/unittests/WorkerAddressUnitTest.cpp )
• WorkerAddressUnitTest.hpp (moved) (moved from src/Fragmentation/Automation/unittests/WorkerAddressUnitTest.hpp )
• WorkerPoolUnitTest.cpp (moved) (moved from src/Fragmentation/Automation/unittests/WorkerPoolUnitTest.cpp )
• WorkerPoolUnitTest.hpp (moved) (moved from src/Fragmentation/Automation/unittests/WorkerPoolUnitTest.hpp )
• stubs/AsyncOperationStub.hpp (moved) (moved from src/Fragmentation/Automation/unittests/stubs/AsyncOperationStub.hpp )
• stubs/FragmentJobStub.cpp (moved) (moved from src/Fragmentation/Automation/unittests/stubs/FragmentJobStub.cpp )
• stubs/FragmentJobStub.hpp (moved) (moved from src/Fragmentation/Automation/unittests/stubs/FragmentJobStub.hpp )
• stubs/FragmentResultStub.cpp (moved) (moved from src/Fragmentation/Automation/unittests/stubs/FragmentResultStub.cpp )
• stubs/ObserverStub.cpp (added)
• stubs/ObserverStub.hpp (added)

JobMarket/src/unittests/FragmentQueueUnitTest.cpp

@@ -38 +38 @@
 
 #include "stubs/FragmentJobStub.hpp"
-#include "unittests/stubs/ObserverStub.hpp"
+#include "stubs/ObserverStub.hpp"
 
 // Registers the fixture into the 'registry'

JobMarket/src/unittests/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
+MOSTLYCLEANFILES =
+bin_PROGRAMS =
+TESTS =
+check_PROGRAMS =
+noinst_PROGRAMS =
+noinst_LTLIBRARIES =
+lib_LTLIBRARIES =
+
+INCLUDES = -I$(top_srcdir)/src/JobMarket
+
+AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
+AM_CPPFLAGS = $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
+
 FRAGMENTATIONAUTOMATIONTESTSSOURCES = \
-  unittests/FragmentJobUnitTest.cpp \
-  unittests/FragmentResultUnitTest.cpp \
-  unittests/FragmentQueueUnitTest.cpp \
-  unittests/OperationQueueUnitTest.cpp \
-  unittests/SystemCommandJobUnitTest.cpp \
-  unittests/WorkerAddressUnitTest.cpp \
-  unittests/WorkerPoolUnitTest.cpp
+  FragmentJobUnitTest.cpp \
+  FragmentResultUnitTest.cpp \
+  FragmentQueueUnitTest.cpp \
+  OperationQueueUnitTest.cpp \
+  SystemCommandJobUnitTest.cpp \
+  WorkerAddressUnitTest.cpp \
+  WorkerPoolUnitTest.cpp
   
 FRAGMENTATIONAUTOMATIONTESTSHEADERS = \
-  unittests/FragmentJobUnitTest.hpp \
-  unittests/FragmentResultUnitTest.hpp \
-  unittests/FragmentQueueUnitTest.hpp \
-  unittests/OperationQueueUnitTest.hpp \
-  unittests/SystemCommandJobUnitTest.hpp \
-  unittests/WorkerAddressUnitTest.hpp \
-  unittests/WorkerPoolUnitTest.hpp
+  FragmentJobUnitTest.hpp \
+  FragmentResultUnitTest.hpp \
+  FragmentQueueUnitTest.hpp \
+  OperationQueueUnitTest.hpp \
+  SystemCommandJobUnitTest.hpp \
+  WorkerAddressUnitTest.hpp \
+  WorkerPoolUnitTest.hpp
 
 FRAGMENTATIONAUTOMATIONTESTS = \
@@ -35 +48 @@
 
 FRAGMENTATIONAUTOMATIONLIBS = \
-  libMolecuilderFragmentJobs.la \
+  ../JobMarket/libJobMarketJobs.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
@@ -43 +56 @@
 FragmentJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 FragmentJobUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
-FragmentJobUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  unittests/FragmentJobUnitTest.cpp \
-  unittests/FragmentJobUnitTest.hpp \
-  unittests/stubs/FragmentResultStub.cpp \
-  unittests/stubs/FragmentJobStub.cpp \
-  unittests/stubs/FragmentJobStub.hpp \
-  JobId.cpp \
-  JobId.hpp \
-  Jobs/FragmentJob.cpp \
-  Jobs/FragmentJob.hpp \
-  Results/FragmentResult.hpp
+FragmentJobUnitTest_SOURCES = UnitTestMain.cpp \
+  FragmentJobUnitTest.cpp \
+  FragmentJobUnitTest.hpp \
+  stubs/FragmentResultStub.cpp \
+  stubs/FragmentJobStub.cpp \
+  stubs/FragmentJobStub.hpp
 FragmentJobUnitTest_LDADD = \
+  ../JobMarket/libJobMarketJobs.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
@@ -61 +70 @@
 FragmentQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 FragmentQueueUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} -I$(top_srcdir)/src
-FragmentQueueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  unittests/FragmentQueueUnitTest.cpp \
-  unittests/FragmentQueueUnitTest.hpp \
-  unittests/stubs/FragmentJobStub.cpp \
-  unittests/stubs/FragmentJobStub.hpp \
-  $(top_srcdir)/src/unittests/stubs/ObserverStub.cpp \
-  $(top_srcdir)/src/unittests/stubs/ObserverStub.hpp
+FragmentQueueUnitTest_SOURCES = UnitTestMain.cpp \
+  FragmentQueueUnitTest.cpp \
+  FragmentQueueUnitTest.hpp \
+  stubs/FragmentJobStub.cpp \
+  stubs/FragmentJobStub.hpp \
+  stubs/ObserverStub.cpp \
+  stubs/ObserverStub.hpp
 FragmentQueueUnitTest_LDADD = \
-  libMolecuilderFragmentJobs.la \
+  ../JobMarket/libJobMarketJobs.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
@@ -76 +85 @@
 FragmentResultUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 FragmentResultUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
-FragmentResultUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  unittests/FragmentResultUnitTest.cpp \
-  unittests/FragmentResultUnitTest.hpp
+FragmentResultUnitTest_SOURCES = UnitTestMain.cpp \
+  FragmentResultUnitTest.cpp \
+  FragmentResultUnitTest.hpp
 FragmentResultUnitTest_LDADD = \
-  libMolecuilderFragmentJobs.la \
+        ../JobMarket/libJobMarketJobs.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
@@ -87 +96 @@
 OperationQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 OperationQueueUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
-OperationQueueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  unittests/OperationQueueUnitTest.cpp \
-  unittests/OperationQueueUnitTest.hpp \
-  unittests/stubs/AsyncOperationStub.hpp
+OperationQueueUnitTest_SOURCES = UnitTestMain.cpp \
+  OperationQueueUnitTest.cpp \
+  OperationQueueUnitTest.hpp \
+  stubs/AsyncOperationStub.hpp
 OperationQueueUnitTest_LDADD = \
-  libMolecuilderFragmentationOperations.la \
-  libMolecuilderFragmentationAutomationHelper.la \
+        ../JobMarket/libJobMarket.la \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
   ${CodePatterns_LIBS}
@@ -99 +107 @@
 SystemCommandJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 SystemCommandJobUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
-SystemCommandJobUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  unittests/SystemCommandJobUnitTest.cpp \
-  unittests/SystemCommandJobUnitTest.hpp \
-  Results/FragmentResult.cpp \
-  Results/FragmentResult.hpp \
-  Jobs/FragmentJob.cpp \
-  Jobs/FragmentJob.hpp \
-  Jobs/SystemCommandJob.cpp \
-  Jobs/SystemCommandJob.hpp \
-  JobId.cpp \
-  JobId.hpp
+SystemCommandJobUnitTest_SOURCES = UnitTestMain.cpp \
+  SystemCommandJobUnitTest.cpp \
+  SystemCommandJobUnitTest.hpp
 SystemCommandJobUnitTest_LDADD = \
+        ../JobMarket/libJobMarketJobs.la \
+  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
+  $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS) \
   $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
-  $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS) \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
   ${CodePatterns_LIBS}
@@ -119 +120 @@
 WorkerAddressUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 WorkerAddressUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
-WorkerAddressUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  unittests/WorkerAddressUnitTest.cpp \
-  unittests/WorkerAddressUnitTest.hpp \
-  WorkerAddress.cpp \
-  WorkerAddress.hpp
+WorkerAddressUnitTest_SOURCES = UnitTestMain.cpp \
+  WorkerAddressUnitTest.cpp \
+  WorkerAddressUnitTest.hpp
 WorkerAddressUnitTest_LDADD = \
+        ../JobMarket/libJobMarketHelper.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
@@ -131 +131 @@
 WorkerPoolUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 WorkerPoolUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} -I$(top_srcdir)/src
-WorkerPoolUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  unittests/WorkerPoolUnitTest.cpp \
-  unittests/WorkerPoolUnitTest.hpp \
-  Pool/WorkerPool.cpp \
-  Pool/WorkerPool.hpp \
-  WorkerAddress.cpp \
-  WorkerAddress.hpp \
-  $(top_srcdir)/src/unittests/stubs/ObserverStub.cpp \
-  $(top_srcdir)/src/unittests/stubs/ObserverStub.hpp
+WorkerPoolUnitTest_SOURCES = UnitTestMain.cpp \
+  WorkerPoolUnitTest.cpp \
+  WorkerPoolUnitTest.hpp \
+  stubs/ObserverStub.cpp \
+  stubs/ObserverStub.hpp
 WorkerPoolUnitTest_LDADD = \
+        ../JobMarket/libJobMarket.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \