Changeset 57876b for src/Fragmentation

Timestamp:

May 4, 2012, 2:19:06 PM (13 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:

12d15a

Parents:

02f346

git-author:

Frederik Heber <heber@…> (10/23/11 20:54:34)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:19:06)

Message:

Added serialization unit tests on FragmentJob and FragmentResult.

Location:

src/Fragmentation/Automation

Files:

• FragmentJob.hpp (modified) (2 diffs)
• FragmentResult.hpp (modified) (2 diffs)
• unittests/FragmentJobUnitTest.cpp (added)
• unittests/FragmentJobUnitTest.hpp (added)
• unittests/FragmentResultUnitTest.cpp (added)
• unittests/FragmentResultUnitTest.hpp (added)
• unittests/Makefile.am (modified) (3 diffs)

src/Fragmentation/Automation/FragmentJob.hpp

@@ -21 +21 @@
 #include "types.hpp"
 
+class FragmentJobTest;
+class FragmentQueueTest;
 class FragmentWorker;
 
@@ -31 +33 @@
 class FragmentJob : public JobId
 {
+  //!> allow FragmentQueue unit test access
   friend class FragmentQueueTest;
+  //!> allow own unit test access
+  friend class FragmentJobTest;
 public:
   FragmentJob();

src/Fragmentation/Automation/FragmentResult.hpp

@@ -22 +22 @@
 #include "types.hpp"
 
+class FragmentQueueTest;
+class FragmentResultTest;
+
 /** This class contains the result to a specific FragmentJob.
  *
@@ -27 +30 @@
 class FragmentResult : public JobId
 {
+  //!> allow FragmentQueue unit test access
   friend class FragmentQueueTest;
+  //!> allow own unit test access
+  friend class FragmentResultTest;
 public:
   FragmentResult(const JobId_t id);

src/Fragmentation/Automation/unittests/Makefile.am

@@ -3 +3 @@
 
 FRAGMENTATIONAUTOMATIONTESTSSOURCES = \
+  unittests/FragmentJobUnitTest.cpp \
+  unittests/FragmentResultUnitTest.cpp \
   unittests/FragmentQueueUnitTest.cpp
 
 FRAGMENTATIONAUTOMATIONTESTSHEADERS = \
+  unittests/FragmentJobUnitTest.hpp \
+  unittests/FragmentResultUnitTest.hpp \
   unittests/FragmentQueueUnitTest.hpp
 
 FRAGMENTATIONAUTOMATIONTESTS = \
+  FragmentJobUnitTest \
+  FragmentResultUnitTest \
   FragmentQueueUnitTest
 
@@ -20 +26 @@
   $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
   ${CodePatterns_LIBS}
+
+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 \
+  FragmentJob.cpp \
+  FragmentJob.hpp \
+  JobId.cpp \
+  JobId.hpp
+FragmentJobUnitTest_LDADD = \
+  ${FRAGMENTATIONLIBS} \
+  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 
 FragmentQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
@@ -36 +55 @@
 FragmentQueueUnitTest_LDADD = $(FRAGMENTATIONAUTOMATIONLIBS)
 
+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 \
+  FragmentResult.cpp \
+  FragmentResult.hpp \
+  JobId.cpp \
+  JobId.hpp
+FragmentResultUnitTest_LDADD = \
+  ${FRAGMENTATIONLIBS} \
+  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
+
 
 #AUTOMAKE_OPTIONS = parallel-tests