Changeset 02f346 for src/Fragmentation

Timestamp:

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

57876b

Parents:

af81f8

git-author:

Frederik Heber <heber@…> (10/23/11 20:23:56)

git-committer:

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

Message:

Extended FragmentQueueUnitTest.

• extended by tests on its job and result queues.

Location:

src/Fragmentation/Automation

Files:

• FragmentJob.hpp (modified) (1 diff)
• FragmentQueue.hpp (modified) (2 diffs)
• FragmentResult.hpp (modified) (1 diff)
• unittests/FragmentQueueUnitTest.cpp (modified) (4 diffs)
• unittests/FragmentQueueUnitTest.hpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentJob.hpp

@@ -31 +31 @@
 class FragmentJob : public JobId
 {
-  friend class FragmentWorker;
+  friend class FragmentQueueTest;
 public:
   FragmentJob();

src/Fragmentation/Automation/FragmentQueue.hpp

@@ -21 +21 @@
 #include "FragmentResult.hpp"
 
+class FragmentQueueTest;
 
 /** This class contains a deque for temporarily storing the FragmentJob
@@ -28 +29 @@
 class FragmentQueue
 {
+  friend class FragmentQueueTest;
 public:
   FragmentQueue();

src/Fragmentation/Automation/FragmentResult.hpp

@@ -27 +27 @@
 class FragmentResult : public JobId
 {
+  friend class FragmentQueueTest;
 public:
   FragmentResult(const JobId_t id);

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -26 +26 @@
 #include "FragmentQueueUnitTest.hpp"
 
+#include "CodePatterns/Assert.hpp"
+
 #ifdef HAVE_TESTRUNNER
 #include "UnitTestMain.hpp"
@@ -38 +40 @@
 void FragmentQueueTest::setUp()
 {
+  // Throw assertions
+  ASSERT_DO(Assert::Throw);
+
   queue = new FragmentQueue();
 }
@@ -51 +56 @@
 void FragmentQueueTest::JobsTest()
 {
+  FragmentJob testJob;
+  /// check for illegal id
+#ifndef NDEBUG
+  std::cout << "The following assertion is intended and does not indicate a failure." << std::endl;
+  CPPUNIT_ASSERT_THROW( queue->pushJob(testJob), Assert::AssertionFailure );
+#endif
+  // set to valid id
+  testJob.setId(1);
+  testJob.outputfile = std::string("do something");
+
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->pushJob(testJob) );
+#else
+  queue->pushJob(testJob);
+#endif
+
+  CPPUNIT_ASSERT_EQUAL((size_t)1, queue->jobs.size());
+
+  // push same id again
+#ifndef NDEBUG
+  std::cout << "The following assertion is intended and does not indicate a failure." << std::endl;
+  CPPUNIT_ASSERT_THROW( queue->pushJob(testJob), Assert::AssertionFailure );
+#endif
+
+  CPPUNIT_ASSERT_EQUAL((size_t)1, queue->jobs.size());
 }
 
@@ -57 +87 @@
 void FragmentQueueTest::ResultsTest()
 {
+  // prepare a job
+  FragmentJob testJob;
+  testJob.setId(1);
+  testJob.outputfile = std::string("do something");
+  queue->pushJob(testJob);
+
+  // prepare a result
+  FragmentResult testResult(1);
+  FragmentResult wrongIdResult(2);
+
+  // check presence
+  CPPUNIT_ASSERT( !queue->isResultPresent(1) );
+  CPPUNIT_ASSERT( !queue->isResultPresent(2) );
+#ifndef NDEBUG
+  std::cout << "The following assertion is intended and does not indicate a failure." << std::endl;
+  CPPUNIT_ASSERT_THROW( queue->getResult(1), Assert::AssertionFailure );
+#endif
+
+  /// check for wrong id
+#ifndef NDEBUG
+  std::cout << "The following assertion is intended and does not indicate a failure." << std::endl;
+  CPPUNIT_ASSERT_THROW( queue->pushResult(wrongIdResult), Assert::AssertionFailure );
+#endif
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->pushResult(testResult) );
+#else
+  queue->pushResult(testResult);
+#endif
+
+  // check presence again
+  CPPUNIT_ASSERT( queue->isResultPresent(1) );
+
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->getResult(1) );
+#else
+  queue->getResult(1);
+#endif
+
+  // check presence one more time
+  CPPUNIT_ASSERT( !queue->isResultPresent(1) );
+  CPPUNIT_ASSERT( !queue->isResultPresent(2) );
+#ifndef NDEBUG
+  std::cout << "The following assertion is intended and does not indicate a failure." << std::endl;
+  CPPUNIT_ASSERT_THROW( queue->getResult(1), Assert::AssertionFailure );
+#endif
 }

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.hpp

@@ -36 +36 @@
 private:
       FragmentQueue *queue;
-
 };