Changeset 571d04

Timestamp:

Mar 28, 2012, 3:17:38 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:

84721b

Parents:

735940

git-author:

Frederik Heber <heber@…> (01/18/12 20:25:30)

git-committer:

Frederik Heber <heber@…> (03/28/12 15:17:38)

Message:

Renamed ShapeUnitTest -> BaseShapesUnitTest.

Location:

src/Shapes/unittests

Files:

• BaseShapesUnitTest.cpp (moved) (moved from src/Shapes/unittests/ShapeUnitTest.cpp ) (8 diffs)
• BaseShapesUnitTest.hpp (moved) (moved from src/Shapes/unittests/ShapeUnitTest.hpp ) (4 diffs)
• Makefile.am (modified) (2 diffs)

src/Shapes/unittests/BaseShapesUnitTest.cpp

@@ -7 +7 @@
 
 /*
- * ShapeUnittest.cpp
+ * BaseShapesUnitTest.cpp
  *
  *  Created on: Jun 18, 2010
@@ -28 +28 @@
 #endif /*HAVE_TESTRUNNER*/
 
+#include "CodePatterns/Assert.hpp"
+
 #include "Helpers/defs.hpp"
 #include "LinearAlgebra/Vector.hpp"
@@ -33 +35 @@
 #include "Shapes/Shape.hpp"
 
-#include "ShapeUnitTest.hpp"
+#include "BaseShapesUnitTest.hpp"
 
 // Registers the fixture into the 'registry'
-CPPUNIT_TEST_SUITE_REGISTRATION( ShapeUnittest );
-
-void ShapeUnittest::setUp()
+CPPUNIT_TEST_SUITE_REGISTRATION( BaseShapesTest );
+
+void BaseShapesTest::setUp()
 {
+  // failing asserts should be thrown
+  ASSERT_DO(Assert::Throw);
+
   v000 =  0*unitVec[0]+0*unitVec[1]+0*unitVec[2];
   v100 =  1*unitVec[0]+0*unitVec[1]+0*unitVec[2];
@@ -69 +74 @@
 }
 
-void ShapeUnittest::tearDown()
+void BaseShapesTest::tearDown()
 {}
 
 
-void ShapeUnittest::baseShapesTest(){
+void BaseShapesTest::baseShapesTest(){
   CPPUNIT_ASSERT(!Nowhere().isInside(v000));
   CPPUNIT_ASSERT(!Nowhere().isInside(v100));
@@ -191 +196 @@
 }
 
-void ShapeUnittest::surfaceTest(){
+void BaseShapesTest::surfaceTest(){
   CPPUNIT_ASSERT(!Nowhere().isOnSurface(v000));
   CPPUNIT_ASSERT(!Nowhere().isOnSurface(v100));
@@ -277 +282 @@
 }
 
-void ShapeUnittest::assignmentTest(){
+void BaseShapesTest::assignmentTest(){
   Shape s1 = Nowhere();
   s1 = Everywhere();
@@ -342 +347 @@
 }
 
-void ShapeUnittest::operatorTest(){
+void BaseShapesTest::operatorTest(){
   {
     Shape s1 = !Nowhere();
@@ -644 +649 @@
 }
 
-void ShapeUnittest::PointsOnSurfaceTest(){
+void BaseShapesTest::PointsOnSurfaceTest(){
   Shape s = Sphere();
   const size_t N = 200;

src/Shapes/unittests/BaseShapesUnitTest.hpp

@@ -1 +1 @@
 /*
- * ShapeUnittest.hpp
+ * BaseShapesUnitTest.hpp
  *
  *  Created on: Jun 18, 2010
@@ -6 +6 @@
  */
 
-#ifndef SHAPEUNITTEST_HPP_
-#define SHAPEUNITTEST_HPP_
+#ifndef BASESHAPESUNITTEST_HPP_
+#define BASESHAPESUNITTEST_HPP_
 
 // include config.h
@@ -22 +22 @@
 #include "LinearAlgebra/Vector.hpp"
 
-class ShapeUnittest : public CppUnit::TestFixture
+class BaseShapesTest : public CppUnit::TestFixture
 {
-  CPPUNIT_TEST_SUITE( ShapeUnittest) ;
+  CPPUNIT_TEST_SUITE( BaseShapesTest) ;
   CPPUNIT_TEST ( baseShapesTest );
   CPPUNIT_TEST ( surfaceTest );
@@ -74 +74 @@
 };
 
-#endif /* SHAPEUNITTEST_HPP_ */
+#endif /* BASESHAPESUNITTEST_HPP_ */

src/Shapes/unittests/Makefile.am

@@ -4 +4 @@
 
 SHAPETESTSSOURCES = \
-        ../Shapes/unittests/ShapeUnitTest.cpp
+        ../Shapes/unittests/BaseShapesUnitTest.cpp
 
 SHAPETESTSHEADERS= \
-        ../Shapes/unittests/ShapeUnitTest.hpp
+        ../Shapes/unittests/BaseShapesUnitTest.hpp
 
 SHAPETESTS = \
-  ShapeUnittest
+  BaseShapesUnitTest
   
 TESTS += $(SHAPETESTS)
@@ -22 +22 @@
 #       $(BOOST_LIB)
 
-ShapeUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ../Shapes/unittests/ShapeUnitTest.cpp \
-        ../Shapes/unittests/ShapeUnitTest.hpp
-nodist_ShapeUnittest_SOURCES = \
+BaseShapesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../Shapes/unittests/BaseShapesUnitTest.cpp \
+        ../Shapes/unittests/BaseShapesUnitTest.hpp
+nodist_BaseShapesUnitTest_SOURCES = \
         ../Helpers/defs.hpp \
         ../Helpers/defs.cpp
-ShapeUnittest_LDADD = $(SHAPELIBS)
+BaseShapesUnitTest_LDADD = $(SHAPELIBS)