Changeset 35f587 for src/Fragmentation/Automation/unittests

Timestamp:

Jun 26, 2012, 7:51:04 AM (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:

7670865

Parents:

f0834d

git-author:

Frederik Heber <heber@…> (02/06/12 09:33:27)

git-committer:

Frederik Heber <heber@…> (06/26/12 07:51:04)

Message:

FragmentResult is now also encapsulated in boost::shared_ptr.

• this allows in the same way to have different implementations of an abstract FragmentResult class.

Location:

src/Fragmentation/Automation/unittests

Files:

• FragmentJobUnitTest.cpp (modified) (1 diff)
• FragmentQueueUnitTest.cpp (modified) (4 diffs)

src/Fragmentation/Automation/unittests/FragmentJobUnitTest.cpp

@@ -82 +82 @@
   FragmentJob::ptr othertestJob(new FragmentJob(command, outputfile, 2));
 
-  FragmentResult testResult(testJob->Work());
-  FragmentResult othertestResult(othertestJob->Work());
+  FragmentResult::ptr testResult(testJob->Work());
+  FragmentResult::ptr othertestResult(othertestJob->Work());
 
-  CPPUNIT_ASSERT_EQUAL( (JobId_t)1, testResult.getId() );
-  CPPUNIT_ASSERT_EQUAL( (JobId_t)2, othertestResult.getId() );
+  CPPUNIT_ASSERT_EQUAL( (JobId_t)1, testResult->getId() );
+  CPPUNIT_ASSERT_EQUAL( (JobId_t)2, othertestResult->getId() );
 }
 

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -189 +189 @@
 
   // prepare a result
-  FragmentResult testResult(1);
-  FragmentResult wrongIdResult(2);
+  FragmentResult::ptr testResult( new FragmentResult(1) );
+  FragmentResult::ptr wrongIdResult( new FragmentResult(2) );
 
   // check that none are present and we can't get result yet
@@ -257 +257 @@
   // check that no results are returned.
   {
-    const std::vector<FragmentResult> results = queue->getAllResults();
+    const std::vector<FragmentResult::ptr> results = queue->getAllResults();
     CPPUNIT_ASSERT_EQUAL( (size_t)0, results.size() );
   }
@@ -271 +271 @@
 
   // prepare a result
-  FragmentResult testResult(1);
-  FragmentResult anothertestResult(2);
+  FragmentResult::ptr testResult( new FragmentResult(1) );
+  FragmentResult::ptr anothertestResult( new FragmentResult(2) );
 
   // push correct result
@@ -285 +285 @@
   // check that two results are returned.
   {
-    const std::vector<FragmentResult> results = queue->getAllResults();
+    const std::vector<FragmentResult::ptr> results = queue->getAllResults();
     CPPUNIT_ASSERT_EQUAL( (size_t)2, results.size() );
   }