Ignore:
Timestamp:
Jun 13, 2012, 5:39:01 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:
7951b9
Parents:
e5d7970
git-author:
Frederik Heber <heber@…> (05/09/12 18:40:56)
git-committer:
Frederik Heber <heber@…> (06/13/12 17:39:01)
Message:

Added ParameterExceptions, is caught by Dialog::checkAll() for the moment.

Location:
src/Parameters/unittests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • src/Parameters/unittests/ContinuousValueTest.cpp

    re5d7970 re45c1d  
    113113    test.set(4);
    114114    CPPUNIT_ASSERT_EQUAL(true, test.ValueSet);
    115 #ifndef NDEBUG
    116115    std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    117     CPPUNIT_ASSERT_THROW(test.setValidRange(range<int>(1,3)), Assert::AssertionFailure);
    118 #else
    119     test.setValidRange(range<int>(1,3));
    120 #endif
    121 #ifndef NDEBUG
     116    CPPUNIT_ASSERT_THROW(test.setValidRange(range<int>(1,3)), ParameterValueException);
     117
    122118    // no value is not set
    123119    std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    124     CPPUNIT_ASSERT_THROW(test.get(), Assert::AssertionFailure);
    125 #endif
     120    CPPUNIT_ASSERT_THROW(test.get(), ParameterValueException);
     121
    126122    // value gets invalidated in either case
    127123    CPPUNIT_ASSERT_EQUAL(false, test.ValueSet);
    … …  
    137133  Value<int> test(*ValidIntRange);
    138134
    139   // unset calling of get, throws
    140 #ifndef NDEBUG
    141   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    142   CPPUNIT_ASSERT_THROW(test.getAsString(), Assert::AssertionFailure);
    143 #endif
    144 
    145   // setting invalid, throws
    146 #ifndef NDEBUG
    147   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    148   CPPUNIT_ASSERT_THROW(test.setAsString(toString(5)), Assert::AssertionFailure);
    149 #endif
    150 #ifndef NDEBUG
    151   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    152   CPPUNIT_ASSERT_THROW(test.setAsString(toString(0)), Assert::AssertionFailure);
    153 #endif
     135  // unset calling of get, throws ParameterValueException
     136  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     137  CPPUNIT_ASSERT_THROW(test.getAsString(), ParameterValueException);
     138
     139  // setting invalid, throws ParameterValueException
     140  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     141  CPPUNIT_ASSERT_THROW(test.setAsString(toString(5)), ParameterValueException);
     142  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     143  CPPUNIT_ASSERT_THROW(test.setAsString(toString(0)), ParameterValueException);
    154144
    155145  CPPUNIT_ASSERT_EQUAL(false, test.ValueSet);
    … …  
    170160  Value<int> test(*ValidIntRange);
    171161
    172   // unset calling of get, throws
    173 #ifndef NDEBUG
    174   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    175   CPPUNIT_ASSERT_THROW(test.get(), Assert::AssertionFailure);
    176 #endif
    177 
    178   // setting invalid, throws
    179 #ifndef NDEBUG
    180   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    181   CPPUNIT_ASSERT_THROW(test.set(5), Assert::AssertionFailure);
    182 #endif
    183 #ifndef NDEBUG
    184   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    185   CPPUNIT_ASSERT_THROW(test.set(0), Assert::AssertionFailure);
    186 #endif
     162  // unset calling of get, throws ParameterValueException
     163  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     164  CPPUNIT_ASSERT_THROW(test.get(), ParameterValueException);
     165
     166  // setting invalid, throws ParameterValueException
     167  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     168  CPPUNIT_ASSERT_THROW(test.set(5), ParameterValueException);
     169  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     170  CPPUNIT_ASSERT_THROW(test.set(0), ParameterValueException);
    187171
    188172  // checking all valid ones
    … …  
    331315    test.set(Vector(4,4,4));
    332316    CPPUNIT_ASSERT_EQUAL(true, test.ValueSet);
    333 #ifndef NDEBUG
    334317    std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    335     CPPUNIT_ASSERT_THROW(test.setValidRange(range<Vector>(Vector(1,1,1),Vector(3,3,3))), Assert::AssertionFailure);
    336 #else
    337     test.setValidRange(range<Vector>(Vector(1,1,1),Vector(3,3,3)));
    338 #endif
    339 #ifndef NDEBUG
     318    CPPUNIT_ASSERT_THROW(test.setValidRange(range<Vector>(Vector(1,1,1),Vector(3,3,3))), ParameterValueException);
     319
    340320    // no value is not set
    341321    std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    342     CPPUNIT_ASSERT_THROW(test.get(), Assert::AssertionFailure);
    343 #endif
     322    CPPUNIT_ASSERT_THROW(test.get(), ParameterException);
     323
    344324    // value gets invalidated in either case
    345325    CPPUNIT_ASSERT_EQUAL(false, test.ValueSet);
    … …  
    390370
    391371  // unset calling of get, throws
    392 #ifndef NDEBUG
    393   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    394   CPPUNIT_ASSERT_THROW(test.get(), Assert::AssertionFailure);
    395 #endif
     372  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     373  CPPUNIT_ASSERT_THROW(test.get(), ParameterValueException);
    396374
    397375  // setting invalid, throws
    398 #ifndef NDEBUG
    399   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    400   CPPUNIT_ASSERT_THROW(test.set(Vector(5,0,0)), Assert::AssertionFailure);
    401 #endif
    402 #ifndef NDEBUG
    403   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    404   CPPUNIT_ASSERT_THROW(test.set(Vector(5,20,5)), Assert::AssertionFailure);
    405 #endif
     376  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     377  CPPUNIT_ASSERT_THROW(test.set(Vector(5,0,0)), ParameterValueException);
     378  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     379  CPPUNIT_ASSERT_THROW(test.set(Vector(5,20,5)), ParameterValueException);
    406380
    407381  CPPUNIT_ASSERT_EQUAL(false, test.ValueSet);

  • src/Parameters/unittests/DiscreteValueTest.cpp

    re5d7970 re45c1d  
    2424#include <cppunit/ui/text/TestRunner.h>
    2525
     26#include "Parameters/ParameterExceptions.hpp"
    2627#include "Parameters/Value.hpp"
    2728
    … …  
    128129  // adding same value, throws assertion
    129130  const size_t size_before = dynamic_cast<DiscreteValidator<int> &>(test.getValidator()).getValidValues().size();
    130 #ifndef NDEBUG
    131131  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    132132  for (int i=1; i<=6;++i)
    133     CPPUNIT_ASSERT_THROW(dynamic_cast<DiscreteValidator<int> &>(test.getValidator()).appendValidValue(i), Assert::AssertionFailure);
    134 #endif
     133    CPPUNIT_ASSERT_THROW(dynamic_cast<DiscreteValidator<int> &>(test.getValidator()).appendValidValue(i), ParameterValidatorException);
    135134  CPPUNIT_ASSERT_EQUAL( size_before, dynamic_cast<DiscreteValidator<int> &>(test.getValidator()).getValidValues().size() );
    136135
    … …  
    157156
    158157  // unset calling of get, throws
    159 #ifndef NDEBUG
    160   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    161   CPPUNIT_ASSERT_THROW(test.get(), Assert::AssertionFailure);
    162 #endif
     158  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     159  CPPUNIT_ASSERT_THROW(test.get(), ParameterValueException);
    163160
    164161  // setting invalid, throws
    165 #ifndef NDEBUG
    166   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    167   CPPUNIT_ASSERT_THROW(test.set(4), Assert::AssertionFailure);
    168 #endif
    169 #ifndef NDEBUG
    170   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    171   CPPUNIT_ASSERT_THROW(test.set(0), Assert::AssertionFailure);
    172 #endif
     162  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     163  CPPUNIT_ASSERT_THROW(test.set(4), ParameterValueException);
     164  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     165  CPPUNIT_ASSERT_THROW(test.set(0), ParameterValueException);
    173166
    174167  // checking all valid ones
    … …  
    189182
    190183  // unset calling of get, throws
    191 #ifndef NDEBUG
    192   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    193   CPPUNIT_ASSERT_THROW(test.getAsString(), Assert::AssertionFailure);
    194 #endif
     184  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     185  CPPUNIT_ASSERT_THROW(test.getAsString(), ParameterValueException);
    195186
    196187  // setting invalid, throws
    197 #ifndef NDEBUG
    198   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    199   CPPUNIT_ASSERT_THROW(test.setAsString(toString(4)), Assert::AssertionFailure);
    200 #endif
    201 #ifndef NDEBUG
    202   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
    203   CPPUNIT_ASSERT_THROW(test.setAsString(toString(0)), Assert::AssertionFailure);
    204 #endif
     188  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     189  CPPUNIT_ASSERT_THROW(test.setAsString(toString(4)), ParameterValueException);
     190  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
     191  CPPUNIT_ASSERT_THROW(test.setAsString(toString(0)), ParameterValueException);
    205192
    206193  // checking all valid ones

  • src/Parameters/unittests/Makefile.am

    re5d7970 re45c1d  
    3434        ../Parameters/unittests/ContinuousValueTest.cpp \
    3535        ../Parameters/unittests/ContinuousValueTest.hpp \
     36        ../Parameters/ParameterExceptions.hpp \
    3637        ../Parameters/StreamOperators.hpp \
    3738        ../Parameters/Validators/DiscreteValidator.hpp \
    … …  
    8182        ../Parameters/unittests/DiscreteValueTest.cpp \
    8283        ../Parameters/unittests/DiscreteValueTest.hpp \
     84        ../Parameters/ParameterExceptions.hpp \
    8385        ../Parameters/Validators/DiscreteValidator.hpp \
    8486        ../Parameters/Validators/DiscreteValidator_impl.hpp \
Note: See TracChangeset for help on using the changeset viewer.