Changeset 78ad7d for src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

Timestamp:

Jun 22, 2012, 3:21:25 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:

f0834d

Parents:

142ff5

git-author:

Frederik Heber <heber@…> (02/06/12 08:43:07)

git-committer:

Frederik Heber <heber@…> (06/22/12 15:21:25)

Message:

FragmentJob is now passed inside boost::shared_ptr.

• FragmentJob is to become just an abstract interface to a variety of jobs and we cannot instantiate this interface. We can only pass it around via ptrs. Therefore, we need this switch to shared_ptrs.
• We now require CodePatterns 1.2.2 due to boost/archive/iserializer.hpp fix.

File:

• src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp (modified) (6 diffs)

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -58 +58 @@
 void FragmentQueueTest::JobTest()
 {
-  FragmentJob testJob;
+  FragmentJob::ptr testJob(new FragmentJob);
   /// check for illegal id
 #ifndef NDEBUG
@@ -65 +65 @@
 #endif
   // set to valid id
-  testJob.setId(1);
-  testJob.outputfile = std::string("do something");
+  testJob->setId(1);
+  testJob->outputfile = std::string("do something");
 
   CPPUNIT_ASSERT_EQUAL(false, queue->isJobPresent() );
@@ -94 +94 @@
   CPPUNIT_ASSERT_EQUAL((size_t)1, queue->results.size());
 
-  FragmentJob poppedJob;
+  FragmentJob::ptr poppedJob;
 #ifndef NDEBUG
   CPPUNIT_ASSERT_NO_THROW( poppedJob = queue->popJob() );
@@ -122 +122 @@
 {
   // prepare some jobs
-  FragmentJob testJob;
-  testJob.setId((JobId_t)1);
-  testJob.outputfile = std::string("do something");
-  FragmentJob anothertestJob;
-  anothertestJob.setId((JobId_t)2);
-  anothertestJob.outputfile = std::string("do something else");
+  FragmentJob::ptr testJob(new FragmentJob);
+  testJob->setId((JobId_t)1);
+  testJob->outputfile = std::string("do something");
+  FragmentJob::ptr anothertestJob(new FragmentJob);
+  anothertestJob->setId((JobId_t)2);
+  anothertestJob->outputfile = std::string("do something else");
 
   // prepare a vector of them
-  std::vector<FragmentJob> testjobs;
+  std::vector<FragmentJob::ptr> testjobs;
   testjobs.push_back(testJob);
   testjobs.push_back(anothertestJob);
 
   // prepare another vector of them
-  std::vector<FragmentJob> sametestjobs;
+  std::vector<FragmentJob::ptr> sametestjobs;
   sametestjobs.push_back(testJob);
   sametestjobs.push_back(anothertestJob);
@@ -173 +173 @@
 {
   // prepare a job
-  FragmentJob testJob;
-  testJob.setId(1);
-  testJob.outputfile = std::string("do something");
+  FragmentJob::ptr testJob(new FragmentJob);
+  testJob->setId(1);
+  testJob->outputfile = std::string("do something");
 #ifndef NDEBUG
   CPPUNIT_ASSERT_NO_THROW( queue->pushJob(testJob) );
@@ -240 +240 @@
 {
   // 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");
+  FragmentJob::ptr testJob( new FragmentJob );
+  testJob->setId(1);
+  testJob->outputfile = std::string("do something");
+  FragmentJob::ptr anothertestJob( new FragmentJob );
+  anothertestJob->setId(2);
+  anothertestJob->outputfile = std::string("do something else");
 
 #ifndef NDEBUG