Changeset a2c4f3 for src

Timestamp:

Dec 16, 2010, 11:47:44 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:

41396a

Parents:

6c9adc

git-author:

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

git-committer:

Frederik Heber <heber@…> (12/16/10 23:47:44)

Message:

Moved ObserverTest to Patterns/unittests/ObserverUnitTest.

Location:

src

Files:

• Patterns/unittests/Makefile.am (modified) (2 diffs)
• Patterns/unittests/ObserverUnitTest.cpp (moved) (moved from src/unittests/ObserverTest.cpp ) (4 diffs)
• Patterns/unittests/ObserverUnitTest.hpp (moved) (moved from src/unittests/ObserverTest.hpp )
• unittests/Makefile.am (modified) (4 diffs)

src/Patterns/unittests/Makefile.am

@@ -10 +10 @@
 TESTS = \
   CacheableUnitTest \
+  ObserverUnitTest \
   SingletonUnitTest
 
@@ -23 +24 @@
         ../Cachable.hpp \
         ../Observer.cpp \
-        ../Observer.hpp
+        ../Observer.hpp \
+        ../ObserverIterator.hpp
 CacheableUnitTest_LDADD = $(BOOST_LIB)
+
+ObserverUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ObserverUnitTest.cpp \
+        ObserverUnitTest.hpp \
+        ../Observer.cpp \
+        ../Observer.hpp \
+        ../ObserverIterator.hpp
+ObserverUnitTest_LDADD = $(BOOST_LIB)
 
 SingletonUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

src/Patterns/unittests/ObserverUnitTest.cpp

@@ -18 +18 @@
 #endif
 
-#include "ObserverTest.hpp"
-
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -31 +29 @@
 #include <iostream>
 
-using namespace std;
+#include "ObserverUnitTest.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -245 +243 @@
       SimpleObservable *content = new SimpleObservable();
       content->signOn(this);
-      theSet.insert(make_pair(i,content));
+      theSet.insert(std::make_pair(i,content));
     }
   }
@@ -462 +460 @@
 
 void ObserverTest::CircleDetectionTest() {
-  cout << endl << "Warning: the next test involved methods that can produce infinite loops." << endl;
-  cout << "Errors in this methods can not be checked using the CPPUNIT_ASSERT Macros." << endl;
-  cout << "Instead tests are run on these methods to see if termination is assured" << endl << endl;
-  cout << "If this test does not complete in a few seconds, kill the test-suite and fix the Error in the circle detection mechanism" << endl;
-
-  cout << endl << endl << "The following errors displayed by the observer framework can be ignored" << endl;
+  std::cout << std::endl << "Warning: the next test involved methods that can produce infinite loops." << std::endl;
+  std::cout << "Errors in this methods can not be checked using the CPPUNIT_ASSERT Macros." << std::endl;
+  std::cout << "Instead tests are run on these methods to see if termination is assured" << std::endl << std::endl;
+  std::cout << "If this test does not complete in a few seconds, kill the test-suite and fix the Error in the circle detection mechanism" << std::endl;
+
+  std::cout << std::endl << std::endl << "The following errors displayed by the observer framework can be ignored" << std::endl;
 
   // make this Observable its own subject. NEVER DO THIS IN ACTUAL CODE

src/unittests/Makefile.am

@@ -28 +28 @@
   LinkedCellUnitTest \
   ListOfBondsUnitTest \
-  ObserverTest \
   ParserCommonUnitTest \
   ParserTremoloUnitTest \
@@ -88 +87 @@
   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
   ../Descriptors/unittests/MoleculeDescriptorUnitTest.cpp \
-  ObserverTest.cpp \
+  ../Patterns/unittests/ObserverUnitTest.cpp \
   ParserCommonUnitTest.cpp \
   ParserTremoloUnitTest.cpp \
@@ -128 +127 @@
   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
   ../Descriptors/unittests/MoleculeDescriptorUnitTest.hpp \
-  ObserverTest.hpp \
+  ../Patterns/unittests/ObserverUnitTest.hpp \
   periodentafelTest.hpp \
   ParserCommonUnitTest.hpp \
@@ -177 +176 @@
 ListOfBondsUnitTest_LDADD = ${ALLLIBS}
 
-ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
-ObserverTest_LDADD = ${ALLLIBS}
-
 ParserCommonUnitTest_SOURCES = UnitTestMain.cpp ParserCommonUnitTest.cpp ParserCommonUnitTest.hpp
 ParserCommonUnitTest_LDADD = ${ALLLIBS}