Changeset 99f4ee for src/unittests

Timestamp:

Jan 2, 2012, 1:34:58 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:

4a8169

Parents:

9ed706

git-author:

Frederik Heber <heber@…> (12/21/11 18:02:07)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:34:58)

Message:

Class Box is now also an Observable.

• it has two channels to notify about changes in its Matrix and boundary conditions.

Location:

src/unittests

Files:

• BoxUnitTest.cpp (modified) (2 diffs)
• BoxUnitTest.hpp (modified) (2 diffs)
• Makefile.am (modified) (3 diffs)
• stubs/ObserverStub.cpp (moved) (moved from src/Atom/unittests/stubs/ObserverStub.cpp ) (2 diffs)
• stubs/ObserverStub.hpp (moved) (moved from src/Atom/unittests/stubs/ObserverStub.hpp )

src/unittests/BoxUnitTest.cpp

@@ -28 +28 @@
 
 #include "BoxUnitTest.hpp"
+
+#include "stubs/ObserverStub.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -1617 +1619 @@
 
 }
+
+/** Unit test on whether observer is working.
+ *
+ */
+void BoxUnittest::ObserverTest()
+{
+  // create some observers
+  UpdateCountObserver *observer_general = new UpdateCountObserver();
+  NotificationObserver *observer_matrix = new NotificationObserver(
+      unitBox->getChannel(Box::MatrixChanged));
+  NotificationObserver *observer_bc = new NotificationObserver(
+      unitBox->getChannel(Box::BoundaryConditionsChanged));
+  CPPUNIT_ASSERT_EQUAL((int)0, observer_general->updates);
+  CPPUNIT_ASSERT_EQUAL(false, observer_matrix->wasNotified);
+  CPPUNIT_ASSERT_EQUAL(false, observer_bc->wasNotified);
+  unitBox->signOn(observer_general);
+  unitBox->signOn(observer_matrix, Box::MatrixChanged);
+  unitBox->signOn(observer_bc, Box::BoundaryConditionsChanged);
+
+  // create update MatrixChanged
+  unitBox->setM(*unit);
+  CPPUNIT_ASSERT_EQUAL((int)1, observer_general->updates);
+  CPPUNIT_ASSERT_EQUAL(true, observer_matrix->wasNotified);
+  CPPUNIT_ASSERT_EQUAL(false, observer_bc->wasNotified);
+  observer_matrix->wasNotified = false;
+
+  // create update BoundaryConditionsChanged
+  unitBox->setCondition(0, Box::Wrap);
+  CPPUNIT_ASSERT_EQUAL((int)2, observer_general->updates);
+  CPPUNIT_ASSERT_EQUAL(false, observer_matrix->wasNotified);
+  CPPUNIT_ASSERT_EQUAL(true, observer_bc->wasNotified);
+
+  // remove observers again
+  unitBox->signOff(observer_general);
+  unitBox->signOff(observer_matrix, Box::MatrixChanged);
+  unitBox->signOff(observer_bc, Box::BoundaryConditionsChanged);
+  delete observer_general;
+  delete observer_matrix;
+  delete observer_bc;
+}

src/unittests/BoxUnitTest.hpp

@@ -30 +30 @@
   CPPUNIT_TEST ( BoundaryIgnoreTest );
   CPPUNIT_TEST ( BoundaryMixedTest );
+  CPPUNIT_TEST ( ObserverTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -43 +44 @@
   void BoundaryIgnoreTest();
   void BoundaryMixedTest();
+  void ObserverTest();
 
   RealSpaceMatrix *unit;

src/unittests/Makefile.am

@@ -73 +73 @@
         $(UIELEMENTSCOMMANDLINEPARSERTESTSSOURCES) \
         ${UIELEMENTSMENUTESTSSOURCES} \
+        stubs/ObserverStub.cpp \
   BoxUnitTest.cpp \
   FormulaUnitTest.cpp \
@@ -93 +94 @@
         $(UIELEMENTSCOMMANDLINEPARSERTESTSHEADERS) \
         ${UIELEMENTSMENUTESTSHEADERS} \
+        stubs/ObserverStub.hpp \
   BoxUnitTest.hpp \
   FormulaUnitTest.hpp \
@@ -101 +103 @@
 BoxUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         BoxUnitTest.cpp \
-        BoxUnitTest.hpp
+        BoxUnitTest.hpp \
+        stubs/ObserverStub.cpp \
+        stubs/ObserverStub.hpp  
 BoxUnitTest_LDADD = \
         ../libMolecuilder.la \

src/unittests/stubs/ObserverStub.cpp

@@ -43 +43 @@
 }
 
+/*********** NotificationObserver **************/
+
 NotificationObserver::NotificationObserver(Notification_ptr notification) :
   Observer("NotificationObserver"),
@@ -48 +50 @@
   wasNotified(false)
 {}
-
-/*********** NotificationObserver **************/
 
 NotificationObserver::~NotificationObserver()