Changeset e7da1f 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:

3c8e8b

Parents:

d766b5

git-author:

Frederik Heber <heber@…> (12/16/10 20:23:58)

git-committer:

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

Message:

Moved CacheableTest to Patterns/unittests/CacheableUnitTest.

Location:

src

Files:

• Patterns/unittests/CacheableUnitTest.cpp (moved) (moved from src/unittests/CacheableTest.cpp ) (2 diffs)
• Patterns/unittests/CacheableUnitTest.hpp (moved) (moved from src/unittests/CacheableTest.hpp ) (3 diffs)
• Patterns/unittests/Makefile.am (modified) (2 diffs)
• unittests/Makefile.am (modified) (4 diffs)

src/Patterns/unittests/CacheableUnitTest.cpp

@@ -7 +7 @@
 
 /*
- * CacheableTest.cpp
+ * CacheableUnitTest.cpp
  *
  *  Created on: Feb 2, 2010
@@ -18 +18 @@
 #endif
 
-#include "CacheableTest.hpp"
+#include "CacheableUnitTest.hpp"
 
 #include <cppunit/CompilerOutputter.h>

src/Patterns/unittests/CacheableUnitTest.hpp

@@ -1 +1 @@
 /*
- * CacheableTest.hpp
+ * CacheableUnitTest.hpp
  *
  *  Created on: Feb 2, 2010
@@ -6 +6 @@
  */
 
-#ifndef CACHEABLETEST_HPP_
-#define CACHEABLETEST_HPP_
+#ifndef CACHEABLEUNITTEST_HPP_
+#define CACHEABLEUNITTEST_HPP_
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -29 +29 @@
 };
 
-#endif /* CACHEABLETEST_HPP_ */
+#endif /* CACHEABLEUNITTEST_HPP_ */

src/Patterns/unittests/Makefile.am

@@ -9 +9 @@
 
 TESTS = \
+  CacheableUnitTest \
   SingletonUnitTest
 
@@ -16 +17 @@
 
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
-GSLLIBS = \
-        ../../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
-        ../../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
-        ../../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB)
+
+CacheableUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        CacheableUnitTest.cpp \
+        CacheableUnitTest.hpp \
+        ../Cachable.hpp \
+        ../Observer.cpp \
+        ../Observer.hpp
+CacheableUnitTest_LDADD = $(BOOST_LIB)
 
 SingletonUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         SingletonUnitTest.cpp \
         SingletonUnitTest.hpp
-SingletonUnitTest_LDADD = ../../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la $(BOOST_LIB)
+SingletonUnitTest_LDADD = $(BOOST_LIB)
 
 #AUTOMAKE_OPTIONS = parallel-tests

src/unittests/Makefile.am

@@ -21 +21 @@
   BondGraphUnitTest \
   BoxUnittest \
-  CacheableTest \
   CountBondsUnitTest \
   FormulaUnittest \
@@ -81 +80 @@
   bondgraphunittest.cpp \
   BoxUnittest.cpp \
-  CacheableTest.cpp \
+  ../Patterns/unittests/CacheableUnitTest.cpp \
   CountBondsUnitTest.cpp \
   FormulaUnittest.cpp \
@@ -121 +120 @@
   bondgraphunittest.hpp \
   BoxUnittest.hpp \
-  CacheableTest.hpp \
+  ../Patterns/unittests/CacheableUnitTest.hpp \
   CountBondsUnitTest.hpp \
   FormulaUnittest.hpp \
@@ -173 +172 @@
 BoxUnittest_LDADD = ${ALLLIBS}
 
-CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
-CacheableTest_LDADD = ${ALLLIBS}
-
 CountBondsUnitTest_SOURCES = UnitTestMain.cpp CountBondsUnitTest.cpp CountBondsUnitTest.hpp
 CountBondsUnitTest_LDADD = ${ALLLIBS}