Changeset 3c8e8b 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:

fff54f

Parents:

e7da1f

git-author:

Frederik Heber <heber@…> (12/16/10 20:29:04)

git-committer:

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

Message:

Moved atomsCalculationTest to Actions/unittests/AtomsCalculationUnitTest.

Location:

src

Files:

• Actions/unittests/AtomsCalculationUnitTest.cpp (moved) (moved from src/unittests/atomsCalculationTest.cpp ) (6 diffs)
• Actions/unittests/AtomsCalculationUnitTest.hpp (moved) (moved from src/unittests/atomsCalculationTest.hpp ) (4 diffs)
• Actions/unittests/Makefile.am (modified) (2 diffs)
• unittests/Makefile.am (modified) (4 diffs)

src/Actions/unittests/AtomsCalculationUnitTest.cpp

@@ -7 +7 @@
 
 /*
- * atomsCalculationTest.cpp
+ * AtomsCalculationUnitTest.cpp
  *
  *  Created on: Feb 19, 2010
@@ -18 +18 @@
 #endif
 
-#include "atomsCalculationTest.hpp"
+#include "AtomsCalculationUnitTest.hpp"
 
 #include <cppunit/CompilerOutputter.h>
@@ -42 +42 @@
 
 // Registers the fixture into the 'registry'
-CPPUNIT_TEST_SUITE_REGISTRATION( atomsCalculationTest );
+CPPUNIT_TEST_SUITE_REGISTRATION( AtomsCalculationTest );
 
 // set up and tear down
-void atomsCalculationTest::setUp(){
+void AtomsCalculationTest::setUp(){
   World::getInstance();
   for(int i=0;i<ATOM_COUNT;++i){
@@ -52 +52 @@
   }
 }
-void atomsCalculationTest::tearDown(){
+void AtomsCalculationTest::tearDown(){
   World::purgeInstance();
   ActionRegistry::purgeInstance();
@@ -88 +88 @@
 }
 
-void atomsCalculationTest::testCalculateSimple(){
+void AtomsCalculationTest::testCalculateSimple(){
   ActionTraits FooTrait("FOO");
   AtomsCalculation<atomId_t> *calc = World::getInstance().calcOnAtoms<atomId_t>(boost::bind(&atom::getId,_1),FooTrait,AllAtoms());
@@ -96 +96 @@
 }
 
-void atomsCalculationTest::testCalculateExcluded(){
+void AtomsCalculationTest::testCalculateExcluded(){
   ActionTraits FooTrait("FOO");
   atomId_t excluded = atomIds[ATOM_COUNT/2];

src/Actions/unittests/AtomsCalculationUnitTest.hpp

@@ -1 +1 @@
 /*
- * atomsCalculationTest.hpp
+ * AtomsCalculationUnitTest.hpp
  *
  *  Created on: Feb 19, 2010
@@ -6 +6 @@
  */
 
-#ifndef ATOMSCALCULATIONTEST_HPP_
-#define ATOMSCALCULATIONTEST_HPP_
+#ifndef ATOMSCALCULATIONUNITTEST_HPP_
+#define ATOMSCALCULATIONUNITTEST_HPP_
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -18 +18 @@
 class atom;
 
-class atomsCalculationTest :  public CppUnit::TestFixture
+class AtomsCalculationTest :  public CppUnit::TestFixture
 {
-  CPPUNIT_TEST_SUITE( atomsCalculationTest );
+  CPPUNIT_TEST_SUITE( AtomsCalculationTest );
   CPPUNIT_TEST ( testCalculateSimple );
   CPPUNIT_TEST ( testCalculateExcluded );
@@ -37 +37 @@
 };
 
-#endif /* ATOMSCALCULATIONTEST_HPP_ */
+#endif /* ATOMSCALCULATIONUNITTEST_HPP_ */

src/Actions/unittests/Makefile.am

@@ -10 +10 @@
 TESTS = \
   ActionRegistryUnitTest \
-  ActionSequenceUnitTest
+  ActionSequenceUnitTest \
+  AtomsCalculationUnitTest
 
 check_PROGRAMS = $(TESTS) 
@@ -42 +43 @@
 ActionSequenceUnitTest_LDADD = ${UILIBS} ${ALLLIBS}
 
+AtomsCalculationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        AtomsCalculationUnitTest.cpp \
+        AtomsCalculationUnitTest.hpp
+AtomsCalculationUnitTest_LDADD = ${ALLLIBS}
+
 
 #AUTOMAKE_OPTIONS = parallel-tests

src/unittests/Makefile.am

@@ -18 +18 @@
   AnalysisCorrelationToSurfaceUnitTest \
   AnalysisPairCorrelationUnitTest \
-  atomsCalculationTest \
   BondGraphUnitTest \
   BoxUnittest \
@@ -77 +76 @@
   AnalysisPairCorrelationUnitTest.cpp \
   ../Descriptors/unittests/AtomDescriptorUnitTest.cpp \
-  atomsCalculationTest.cpp \
+  ../Actions/unittests/AtomsCalculationUnitTest.cpp \
   bondgraphunittest.cpp \
   BoxUnittest.cpp \
@@ -117 +116 @@
   AnalysisPairCorrelationUnitTest.hpp \
   ../Descriptors/unittests/AtomDescriptorUnitTest.hpp \
-  atomsCalculationTest.hpp \
+  ../Actions/unittests/AtomsCalculationUnitTest.hpp \
   bondgraphunittest.hpp \
   BoxUnittest.hpp \
@@ -163 +162 @@
 AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
 
-atomsCalculationTest_SOURCES = UnitTestMain.cpp atomsCalculationTest.cpp atomsCalculationTest.hpp
-atomsCalculationTest_LDADD = ${ALLLIBS}
-
 BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
 BondGraphUnitTest_LDADD = ${ALLLIBS}