Changeset 266875 for src/unittests

Timestamp:

Feb 4, 2011, 6:56:38 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:

72d108

Parents:

15f6e9

git-author:

Frederik Heber <heber@…> (02/01/11 11:09:17)

git-committer:

Frederik Heber <heber@…> (02/04/11 18:56:38)

Message:

FIX: ParserError did not adhere to naming convention.

• excepetions are suffixed with ...Exception.
• also, ParseError does not suggest that it is a _formula_ parser error.
• renamed to FormulaStringParseException.

File:

• src/unittests/FormulaUnitTest.cpp (modified) (1 diff)

src/unittests/FormulaUnitTest.cpp

@@ -246 +246 @@
   }
   {
-    CPPUNIT_ASSERT_THROW(Formula formula("74107"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("  "),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("nAcL"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("NAcL"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("Na Cl"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("1NaCl"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("Mag"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("AgCl)"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("(Na"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("(Mag)"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("MgCl2)"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("((MgCl2)"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("(MgCl2))"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("(MgCl2]"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("[MgCl2)"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("N(aCl"),ParseError);
-    CPPUNIT_ASSERT_THROW(Formula formula("Na()Cl"),ParseError);
+    CPPUNIT_ASSERT_THROW(Formula formula("74107"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("  "),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("nAcL"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("NAcL"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("Na Cl"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("1NaCl"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("Mag"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("AgCl)"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("(Na"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("(Mag)"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("MgCl2)"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("((MgCl2)"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("(MgCl2))"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("(MgCl2]"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("[MgCl2)"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("N(aCl"),FormulaStringParseException);
+    CPPUNIT_ASSERT_THROW(Formula formula("Na()Cl"),FormulaStringParseException);
   }