Changeset dbb533 for src/Parameters/unittests/DiscreteValueTest.cpp

Timestamp:

Apr 17, 2012, 11:39:19 AM (14 years ago)

Author:

Michael Ankele <ankele@…>

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, Candidate_v1.7.0, 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:

c513b7

Parents:

c68409

git-author:

Michael Ankele <ankele@…> (04/10/12 11:52:53)

git-committer:

Michael Ankele <ankele@…> (04/17/12 11:39:19)

Message:

updated Parameters' unittests

• renamed "xxxUnitTest" -> "xxxTest" (to evade naming conflicts)
• removed string operations
• fixed missing template <T>s

File:

• src/Parameters/unittests/DiscreteValueTest.cpp (moved) (moved from src/Parameters/unittests/DiscreteValueUnitTest.cpp ) (5 diffs)

src/Parameters/unittests/DiscreteValueTest.cpp

@@ -7 +7 @@
 
 /*
- * DiscreteValueUnitTest.cpp
+ * DiscreteValueTest.cpp
  *
  *  Created on: Sep 28, 2011
@@ -18 +18 @@
 #endif
 
-#include "DiscreteValueUnitTest.hpp"
+#include "DiscreteValueTest.hpp"
 
 #include <cppunit/CompilerOutputter.h>
@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Parser/Parameters/DiscreteValue.hpp"
-
-#include "CodePatterns/toString.hpp"
+#include "Parameters/DiscreteValue.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -104 +102 @@
   // checking valid values
   for (int i=1; i<=3;++i)
-    CPPUNIT_ASSERT_EQUAL(true, test.isValid(toString(i)));
-
-  // checking invalid values
-  for (int i=-10; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValid(toString(i)));
+    CPPUNIT_ASSERT_EQUAL(true, test.isValid(i));
+
+  // checking invalid values
+  for (int i=-10; i<=0;++i)
+    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
   for (int i=4; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValid(toString(i)));
+    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
 }
 
@@ -167 +165 @@
 #ifndef NDEBUG
   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.set(toString(4)), Assert::AssertionFailure);
-#endif
-#ifndef NDEBUG
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.set(toString(0)), Assert::AssertionFailure);
+  CPPUNIT_ASSERT_THROW(test.set(4), Assert::AssertionFailure);
+#endif
+#ifndef NDEBUG
+  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW(test.set(0), Assert::AssertionFailure);
 #endif
 
   // checking all valid ones
   for (int i=1; i<=3;++i) {
-    test.set(toString(i));
-    CPPUNIT_ASSERT_EQUAL(toString(i), test.get());
+    test.set(i);
+    CPPUNIT_ASSERT_EQUAL(i, test.get());
   }