Changeset c0bccb for src

Timestamp:

Dec 16, 2010, 11:32:21 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:

deddf6

Parents:

85949a

git-author:

Frederik Heber <heber@…> (12/16/10 22:12:19)

git-committer:

Frederik Heber <heber@…> (12/16/10 23:32:21)

Message:

Moved SingletonTest to Patterns/unittests/SingletonUnitTest.

Location:

src

Files:

• Patterns/Singleton_impl.hpp (modified) (1 diff)
• Patterns/unittests/Makefile.am (added)
• Patterns/unittests/SingletonUnitTest.cpp (moved) (moved from src/unittests/SingletonTest.cpp ) (2 diffs)
• Patterns/unittests/SingletonUnitTest.hpp (moved) (moved from src/unittests/SingletonTest.hpp ) (3 diffs)
• unittests/Makefile.am (modified) (5 diffs)

src/Patterns/Singleton_impl.hpp

@@ -9 +9 @@
 #define SINGLETON_IMPL_HPP_
 
+#include "Helpers/Assert.hpp"
 #include "Patterns/Singleton.hpp"
 

src/Patterns/unittests/SingletonUnitTest.cpp

@@ -7 +7 @@
 
 /*
- * SingletonTest.cpp
+ * SingletonUnitTest.cpp
  *
  *  Created on: Mar 11, 2010
@@ -18 +18 @@
 #endif
 
-#include "SingletonTest.hpp"
+#include "SingletonUnitTest.hpp"
 
 #include <cppunit/CompilerOutputter.h>

src/Patterns/unittests/SingletonUnitTest.hpp

@@ -1 +1 @@
 /*
- * SingletonTest.hpp
+ * SingletonUnitTest.hpp
  *
  *  Created on: Mar 11, 2010
@@ -6 +6 @@
  */
 
-#ifndef SINGLETONTEST_HPP_
-#define SINGLETONTEST_HPP_
+#ifndef SINGLETONUNITTEST_HPP_
+#define SINGLETONUNITTEST_HPP_
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -24 +24 @@
 };
 
-#endif /* SINGLETONTEST_HPP_ */
+#endif /* SINGLETONUNITTEST_HPP_ */

src/unittests/Makefile.am

@@ -1 +1 @@
 # PLEASE adhere to the alphabetical ordering in this Makefile!
 # Also indentation by a single tab
+
+SUBDIRS = \
+        ../Patterns/unittests
 
 INCLUDES = -I$(top_srcdir)/src
@@ -41 +44 @@
   Registry \
   ShapeUnittest \
-  SingletonTest \
   SubspaceFactorizerUnitTest \
   TesselationUnitTest \
@@ -102 +104 @@
   RegistryUnitTest.cpp \
   ShapeUnittest.cpp \
-  SingletonTest.cpp \
+  ../Patterns/unittests/SingletonUnitTest.cpp \
   tesselationunittest.cpp \
   tesselation_boundarytriangleunittest.cpp \
@@ -141 +143 @@
   PlaneUnittest.hpp \
   RegistryUnitTest.hpp \
-  SingletonTest.hpp \
+  ShapeUnittest.hpp \
+  ../Patterns/unittests/SingletonUnitTest.hpp \
+  stackclassunittest.hpp \
   tesselationunittest.hpp \
   tesselation_boundarytriangleunittest.hpp \
@@ -245 +249 @@
 ShapeUnittest_LDADD = ${ALLLIBS}
 
-SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
-SingletonTest_LDADD = ${ALLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
-
 SubspaceFactorizerUnitTest_SOURCES = UnitTestMain.cpp SubspaceFactorizerUnittest.cpp SubspaceFactorizerUnittest.hpp
 SubspaceFactorizerUnitTest_LDADD = ${GSLLIBS}