Changeset 2700983 for tests/regression/Options

Timestamp:

Feb 7, 2011, 10:25:51 AM (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:

b5ad39

Parents:

d445e4

git-author:

Frederik Heber <heber@…> (02/02/11 17:35:28)

git-committer:

Frederik Heber <heber@…> (02/07/11 10:25:51)

Message:

Extended regression testsuite structure of Options from standard_options.

• most of the stuff is from standard_options, placed each into own folder and each test into its own module.

Location:

tests/regression/Options

Files:

• BondLengthTable/testsuite-options-bond-length-table.at (added)
• ElementsDb/testsuite-options-elements-db.at (added)
• ElementsDb/testsuite-options-no-elements-db.at (added)
• Empty/pre/empty.conf (moved) (moved from tests/regression/Simple_configuration/6/pre/empty.conf )
• Empty/testsuite-options-empty-configs.at (added)
• FastParsing/testsuite-options-fast-parsing.at (added)
• Help/testsuite-options-help.at (added)
• InvalidCommands/pre/test.conf (moved) (moved from tests/regression/Simple_configuration/7/pre/test.conf )
• InvalidCommands/testsuite-options-invalid-commands.at (added)
• SetDefaultName/testsuite-options-set-default-name.at (added)
• Verbosity/testsuite-options-verbosity.at (added)
• Warranty/testsuite-options-warranty.at (added)
• testsuite-options.at (modified) (1 diff)

tests/regression/Options/testsuite-options.at

@@ -1 +1 @@
 AT_BANNER([MoleCuilder - standard options])
-# 1. verbosity
-AT_SETUP([Standard Options - verbosity with Undo/Redo])
-AT_KEYWORDS([options])
-AT_CHECK([pwd],[ignore],[ignore])
-AT_CHECK([../../molecuilder -v 9], 0, [stdout], [ignore])
-AT_CHECK([grep "Setting verbosity from .* to 9" stdout], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder -v 9 --undo], 0, [stdout], [ignore])
-AT_CHECK([grep "Setting verbosity from 9 to .*" stdout], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder -v 9 --undo --redo], 0, [stdout], [ignore])
-AT_CHECK([grep "Setting verbosity from .* to 9" stdout], 0, [ignore], [ignore])
-AT_CLEANUP
 
-# 2. help screen
-AT_SETUP([Standard Options - help screen])
-AT_KEYWORDS([options])
-AT_CHECK([../../molecuilder -h], 0, [stdout], [ignore])
-AT_CHECK([fgrep "help screen" stdout], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder --help], 0, [stdout], [ignore])
-AT_CHECK([fgrep "help screen" stdout], 0, [ignore], [ignore])
-AT_CLEANUP
-AT_SETUP([Standard Options - warranty screen])
-AT_KEYWORDS([options])
-AT_CHECK([../../molecuilder --warranty], 0, [stdout], [ignore])
-AT_CHECK([fgrep "statement concerning warranty" stdout], 0, [ignore], [ignore])
-AT_CHECK([fgrep "WITHOUT ANY WARRANTY" stdout], 0, [ignore], [ignore])
-AT_CLEANUP
+# verbosity
+m4_include([Options/Verbosity/testsuite-options-verbosity.at])
 
-# 3. no element database
-AT_SETUP([Standard Options - no element database])
-AT_KEYWORDS([options])
-AT_CHECK([../../molecuilder -e], 134, [ignore], [stderr])
-AT_CLEANUP
+# warranty screen
+m4_include([Options/Warranty/testsuite-options-warranty.at])
 
-# 4. element database
-AT_SETUP([Standard Options - element database])
-AT_KEYWORDS([options])
-AT_DATA([elements.db], [[#      Covalent        radius  of      each    element in      Angstroem       from    CSD     (binding        is:     [Rcov(A)+Rcov(B)-t,Rcov(A)+Rcov(B)+t]   with    t       =       0.4A
-#Element        Name    Symbol  Period  Group   Block   Atomic  Number  AtomicWeight    Covalent        Radius  vdW     Radius
-Hydrogen        H       1       1       s       1       1.008   0.23    1.09
-Helium  He      1       18      p       2       4.003   1.5     1.4
-]])
-AT_CHECK([../../molecuilder -i test.conf -e ./], 0, [stdout], [stderr])
-AT_CHECK([grep -E "Using.*as elements database." stdout], 0, [ignore], [ignore])
-AT_CHECK([fgrep "Element list loaded successfully." stdout], 0, [ignore], [ignore])
-AT_CHECK([fgrep "Something went wrong while parsing the other databases!" stderr], 0, [ignore], [ignore])
-AT_CLEANUP
+# help screen
+m4_include([Options/Help/testsuite-options-help.at])
 
-# 5. bond length database
-AT_SETUP([Standard Options - bond length table])
-AT_KEYWORDS([options])
-AT_DATA([bondlength.db], [[# bond length database
-        1       2
-1       1.      0.
-2       0.      0.
-]])
-AT_CHECK([../../molecuilder -i test.conf -g bondlength.db], 0, [stdout], [stderr])
-AT_CHECK([grep -E "Using.*as bond length table." stdout], 0, [ignore], [ignore])
-AT_CLEANUP
+# element database
+m4_include([Options/ElementsDb/testsuite-options-no-elements-db.at])
+m4_include([Options/ElementsDb/testsuite-options-elements-db.at])
 
-# 6. fast trajectories
-AT_SETUP([Standard Options - fast trajectories])
-AT_KEYWORDS([options])
-AT_CHECK([../../molecuilder -i test.conf -n 1], 0, [stdout], [stderr])
-AT_CHECK([fgrep "I won't parse trajectories" stdout], 0, [ignore], [ignore])
-AT_CLEANUP
-AT_SETUP([Standard Options - fast trajectories with Undo/Redo])
-AT_KEYWORDS([options])
-AT_CHECK([../../molecuilder -i test.conf -n 1 --undo], 0, [stdout], [stderr])
-AT_CHECK([fgrep "I will parse trajectories." stdout], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder -i test.conf -n 1 --undo --redo], 0, [stdout], [stderr])
-AT_CHECK([grep -c "I won't parse trajectories" stdout], 0, 2
-, [ignore])
-AT_CLEANUP
+# bond length database
+m4_include([Options/BondLengthTable/testsuite-options-bond-length-table.at])
 
-# 7. molecule default name
-AT_SETUP([Standard Options - molecule default name])
-AT_KEYWORDS([options])
-AT_CHECK([../../molecuilder -i test.conf -X test], 0, [stdout], [stderr])
-AT_CHECK([fgrep "Default name of new molecules set to test." stdout], 0, [ignore], [ignore])
-AT_CLEANUP
-AT_SETUP([Standard Options - molecule default name with Undo/Redo])
-AT_KEYWORDS([options])
-AT_CHECK([../../molecuilder -i test.conf -X test --undo], 0, [stdout], [stderr])
-AT_CHECK([fgrep "Default name of new molecules set to none." stdout], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder -i test.conf -X test --undo --redo], 0, [stdout], [stderr])
-AT_CHECK([fgrep "Default name of new molecules set to test." stdout], 0, [ignore], [ignore])
-AT_CLEANUP
+# fast trajectory parsing
+m4_include([Options/FastParsing/testsuite-options-fast-parsing.at])
+
+# molecule default name
+m4_include([Options/SetDefaultName/testsuite-options-set-default-name.at])
+
+# test that all desire parameters and count how many complain
+m4_include([Options/Empty/testsuite-options-empty-configs.at])
+
+# test that all need parameters and count how many complain
+m4_include([Options/InvalidCommands/testsuite-options-invalid-commands.at])
+