Changeset a7d753 for src/Parser/unittests

Timestamp:

Oct 17, 2011, 2:36:47 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:

84e752

Parents:

3308b6

git-author:

Frederik Heber <heber@…> (09/30/11 09:32:43)

git-committer:

Frederik Heber <heber@…> (10/17/11 14:36:47)

Message:

Extended DiscreteValue to ContinuousValue and added ValueInterface for both.

• new template class ContinuousValue representing a continous value with a valid range.
• in order to store both DiscreteValue and ContinuousValue as parameters, both have a common interface ValueInterface that works in string only.
• both classes have extensive unit tests.

Location:

src/Parser/unittests

Files:

• ContinuousValueUnitTest.cpp (added)
• ContinuousValueUnitTest.hpp (added)
• DiscreteValueUnitTest.cpp (modified) (6 diffs)
• DiscreteValueUnitTest.hpp (modified) (3 diffs)
• Makefile.am (modified) (4 diffs)

src/Parser/unittests/DiscreteValueUnitTest.cpp

@@ -26 +26 @@
 #include "Parser/DiscreteValue.hpp"
 
+#include "CodePatterns/toString.hpp"
+
 #ifdef HAVE_TESTRUNNER
 #include "UnitTestMain.hpp"
@@ -73 +75 @@
 }
 
-/** Unit test for isValid.
- *
- */
-void DiscreteValueTest::isValidTest()
+/** Unit test for isValidValue.
+ *
+ */
+void DiscreteValueTest::isValidValueTest()
 {
   // create instance
@@ -83 +85 @@
   // checking valid values
   for (int i=1; i<=3;++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));
+    CPPUNIT_ASSERT_EQUAL(true, test.isValidValue(i));
+
+  // checking invalid values
+  for (int i=-10; i<=0;++i)
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
   for (int i=4; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
+}
+
+/** Unit test for isValid.
+ *
+ */
+void DiscreteValueTest::isValidTest()
+{
+  // create instance
+  DiscreteValue<int> test(ValidValues);
+
+  // 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)));
+  for (int i=4; i<=0;++i)
+    CPPUNIT_ASSERT_EQUAL(false, test.isValid(toString(i)));
 }
 
@@ -102 +123 @@
   // adding values 4,5,6
   for (int i=4; i<=6;++i) {
-    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
     test.appendValidValue(i);
-    CPPUNIT_ASSERT_EQUAL(true, test.isValid(i));
+    CPPUNIT_ASSERT_EQUAL(true, test.isValidValue(i));
   }
 
   // adding same value, throws assertion
+  const size_t size_before = test.ValidValues.size();
 #ifndef NDEBUG
   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
@@ -113 +135 @@
     CPPUNIT_ASSERT_THROW(test.appendValidValue(i), Assert::AssertionFailure);
 #endif
+  CPPUNIT_ASSERT_EQUAL( size_before, test.ValidValues.size() );
 
   // checking valid values
   for (int i=1; i<=6;++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));
+    CPPUNIT_ASSERT_EQUAL(true, test.isValidValue(i));
+
+  // checking invalid values
+  for (int i=-10; i<=0;++i)
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
 
   // checking invalid values
   for (int i=7; i<=10;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
 }
 
@@ -144 +167 @@
 #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(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);
+  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);
 #endif
 
   // checking all valid ones
   for (int i=1; i<=3;++i) {
-    test.set(i);
-    CPPUNIT_ASSERT_EQUAL(i, test.get());
-  }
-}
-
-
-
+    test.set(toString(i));
+    CPPUNIT_ASSERT_EQUAL(toString(i), test.get());
+  }
+
+}
+
+/** Unit test for setValue and getValue.
+ *
+ */
+void DiscreteValueTest::settergetterValueTest()
+{
+  // create instance
+  DiscreteValue<int> test(ValidValues);
+
+  // unset calling of get, throws
+#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.getValue(), Assert::AssertionFailure);
+#endif
+
+  // setting invalid, throws
+#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.setValue(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.setValue(0), Assert::AssertionFailure);
+#endif
+
+  // checking all valid ones
+  for (int i=1; i<=3;++i) {
+    test.setValue(i);
+    CPPUNIT_ASSERT_EQUAL(i, test.getValue());
+  }
+}

src/Parser/unittests/DiscreteValueUnitTest.hpp

@@ -14 +14 @@
 
 #include <cppunit/extensions/HelperMacros.h>
-#include <string>
+
+#include <vector>
 
 class DiscreteValueTest :  public CppUnit::TestFixture
@@ -20 +21 @@
   CPPUNIT_TEST_SUITE( DiscreteValueTest ) ;
   CPPUNIT_TEST ( findIndexOfValueTest );
+  CPPUNIT_TEST ( isValidValueTest );
   CPPUNIT_TEST ( isValidTest );
   CPPUNIT_TEST ( appendValidValueTest );
   CPPUNIT_TEST ( settergetterTest );
+  CPPUNIT_TEST ( settergetterValueTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -30 +33 @@
 
   void findIndexOfValueTest();
+  void isValidValueTest();
   void isValidTest();
   void appendValidValueTest();
   void settergetterTest();
+  void settergetterValueTest();
 
 private:

src/Parser/unittests/Makefile.am

@@ -4 +4 @@
 
 PARSERTESTSSOURCES = \
+  ../Parser/unittests/ContinuousValueUnitTest.cpp \
   ../Parser/unittests/DiscreteValueUnitTest.cpp \
         ../Parser/unittests/ParserMpqcUnitTest.cpp \
@@ -12 +13 @@
 
 PARSERTESTSHEADERS = \
+  ../Parser/unittests/ContinuousValueUnitTest.hpp \
   ../Parser/unittests/DiscreteValueUnitTest.hpp \
         ../Parser/unittests/ParserMpqcUnitTest.hpp \
@@ -20 +22 @@
 
 PARSERTESTS = \
+        ContinuousValueUnitTest \
   DiscreteValueUnitTest \
   ParserMpqcUnitTest \
@@ -38 +41 @@
 
 
+ContinuousValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+  ../Parser/unittests/ContinuousValueUnitTest.cpp \
+  ../Parser/unittests/ContinuousValueUnitTest.hpp \
+  ../Parser/ContinuousValue.hpp \
+  ../Parser/ContinuousValue_impl.hpp
+#ContinuousValueUnitTest_LDADD
+ 
 DiscreteValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
   ../Parser/unittests/DiscreteValueUnitTest.cpp \