Changeset fb255d for src/Fragmentation/Automation/unittests

Timestamp:

Jul 2, 2012, 7:54:10 AM (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:

2344a3

Parents:

d6b12c

git-author:

Frederik Heber <heber@…> (02/29/12 17:39:33)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:10)

Message:

WorkerPool is now observable.

• this is preparatory for allowing FragmentScheduler to contact idle Workers and sending them possibly present jobs.
• added NotificationObserver in unit test.

Location:

src/Fragmentation/Automation/unittests

Files:

• Makefile.am (modified) (2 diffs)
• WorkerPoolUnitTest.cpp (modified) (8 diffs)
• WorkerPoolUnitTest.hpp (modified) (2 diffs)

src/Fragmentation/Automation/unittests/Makefile.am

@@ -143 +143 @@
 
 WorkerPoolUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-WorkerPoolUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+WorkerPoolUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} -I$(top_srcdir)/src
 WorkerPoolUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
   unittests/WorkerPoolUnitTest.cpp \
@@ -150 +150 @@
   Pool/WorkerPool.hpp \
   WorkerAddress.cpp \
-  WorkerAddress.hpp
+  WorkerAddress.hpp \
+  $(top_srcdir)/src/unittests/stubs/ObserverStub.cpp \
+  $(top_srcdir)/src/unittests/stubs/ObserverStub.hpp
 WorkerPoolUnitTest_LDADD = \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

src/Fragmentation/Automation/unittests/WorkerPoolUnitTest.cpp

@@ -27 +27 @@
 
 #include "CodePatterns/Assert.hpp"
+#include "CodePatterns/Observer/Channels.hpp"
 #include "Pool/WorkerPool.hpp"
 #include "WorkerAddress.hpp"
@@ -38 +39 @@
 
 #include "stubs/FragmentJobStub.hpp"
+#include "unittests/stubs/ObserverStub.hpp"
 
 // Registers the fixture into the 'registry'
@@ -49 +51 @@
 
   pool = new WorkerPool();
+  addobserver = new NotificationObserver(pool->getChannel(WorkerPool::WorkerAdded));
+  removeobserver = new NotificationObserver(pool->getChannel(WorkerPool::WorkerRemoved));
+  idleobserver = new NotificationObserver(pool->getChannel(WorkerPool::WorkerIdle));
+
+  // and sign on
+  pool->signOn(addobserver, WorkerPool::WorkerAdded);
+  pool->signOn(removeobserver, WorkerPool::WorkerRemoved);
+  pool->signOn(idleobserver, WorkerPool::WorkerIdle);
 }
 
 void WorkerPoolTest::tearDown()
 {
+  pool->signOff(addobserver, WorkerPool::WorkerAdded);
+  pool->signOff(removeobserver, WorkerPool::WorkerRemoved);
+  pool->signOff(idleobserver, WorkerPool::WorkerIdle);
+
+  delete removeobserver;
+  delete addobserver;
+  delete idleobserver;
   delete pool;
 }
@@ -68 +85 @@
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->pool.size() );
+  CPPUNIT_ASSERT( addobserver->wasNotified );
+  CPPUNIT_ASSERT( !removeobserver->wasNotified );
+  CPPUNIT_ASSERT( idleobserver->wasNotified );
+  addobserver->wasNotified = false;
+  idleobserver->wasNotified = false;
 
   // remove non-present worker
   std::cout << "The following error message is intended and does not indicate a failure." << std::endl;
   CPPUNIT_ASSERT( !pool->removeWorker(otheraddress) );
+  CPPUNIT_ASSERT( !addobserver->wasNotified );
+  CPPUNIT_ASSERT( !removeobserver->wasNotified );
+  CPPUNIT_ASSERT( !idleobserver->wasNotified );
 
   // check for presence
@@ -82 +107 @@
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->pool.size() );
+  CPPUNIT_ASSERT( !addobserver->wasNotified );
+  CPPUNIT_ASSERT( removeobserver->wasNotified );
+  CPPUNIT_ASSERT( !idleobserver->wasNotified );
+  removeobserver->wasNotified = false;
 }
 
@@ -96 +125 @@
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->pool.size() );
+  CPPUNIT_ASSERT( addobserver->wasNotified );
+  CPPUNIT_ASSERT( !removeobserver->wasNotified );
+  CPPUNIT_ASSERT( idleobserver->wasNotified );
+  addobserver->wasNotified = false;
+  idleobserver->wasNotified = false;
 
   // unmark and check
@@ -120 +154 @@
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->idle_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->busy_queue.size() );
+  CPPUNIT_ASSERT( !addobserver->wasNotified );
+  CPPUNIT_ASSERT( !removeobserver->wasNotified );
+  CPPUNIT_ASSERT( !idleobserver->wasNotified );
 
   // unmark and check
@@ -126 +163 @@
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->idle_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
+  CPPUNIT_ASSERT( !addobserver->wasNotified );
+  CPPUNIT_ASSERT( !removeobserver->wasNotified );
+  CPPUNIT_ASSERT( idleobserver->wasNotified );
 }

src/Fragmentation/Automation/unittests/WorkerPoolUnitTest.hpp

@@ -18 +18 @@
 
 class WorkerPool;
+class NotificationObserver;
 
 /********************************************** Test classes **************************************/
@@ -36 +37 @@
 private:
       WorkerPool *pool;
+      NotificationObserver *addobserver;
+      NotificationObserver *removeobserver;
+      NotificationObserver *idleobserver;
 };