Changeset b9c486 for src/Fragmentation/Automation/unittests

Timestamp:

May 4, 2012, 2:19:07 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:

778abb

Parents:

402bde

git-author:

Frederik Heber <heber@…> (02/16/12 16:14:38)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:19:07)

Message:

Added getAllResults() to FragmentQueue.

• added convenience function ::IsPresentResult().
• this is to replace FragmentSchedulder::getResults() which relies on jobs being filled still.
• added unit test on getAllResults().

Location:

src/Fragmentation/Automation/unittests

Files:

• FragmentQueueUnitTest.cpp (modified) (1 diff)
• FragmentQueueUnitTest.hpp (modified) (2 diffs)

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -234 +234 @@
 #endif
 }
+
+/** UnitTest for working ResultMap
+ */
+void FragmentQueueTest::AllResultsTest()
+{
+  // prepare a job
+  FragmentJob testJob;
+  testJob.setId(1);
+  testJob.outputfile = std::string("do something");
+  FragmentJob anothertestJob;
+  anothertestJob.setId(2);
+  anothertestJob.outputfile = std::string("do something else");
+
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->pushJob(testJob) );
+  CPPUNIT_ASSERT_NO_THROW( queue->pushJob(anothertestJob) );
+#else
+  queue->pushJob(testJob);
+  queue->pushJob(anothertestJob);
+#endif
+
+  // check that no results are returned.
+  {
+    const std::vector<FragmentResult> results = queue->getAllResults();
+    CPPUNIT_ASSERT_EQUAL( (size_t)0, results.size() );
+  }
+
+  // pop both as if some work was being done
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->popJob() );
+  CPPUNIT_ASSERT_NO_THROW( queue->popJob() );
+#else
+  queue->popJob();
+  queue->popJob();
+#endif
+
+  // prepare a result
+  FragmentResult testResult(1);
+  FragmentResult anothertestResult(2);
+
+  // push correct result
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->pushResult(testResult) );
+  CPPUNIT_ASSERT_NO_THROW( queue->pushResult(anothertestResult) );
+#else
+  queue->pushResult(testResult);
+  queue->pushResult(anothertestResult);
+#endif
+
+  // check that two results are returned.
+  {
+    const std::vector<FragmentResult> results = queue->getAllResults();
+    CPPUNIT_ASSERT_EQUAL( (size_t)2, results.size() );
+  }
+}
+

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.hpp

@@ -27 +27 @@
     CPPUNIT_TEST ( JobsTest );
     CPPUNIT_TEST ( ResultsTest );
+    CPPUNIT_TEST ( AllResultsTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -35 +36 @@
       void JobsTest();
       void ResultsTest();
+      void AllResultsTest();
 
 private: