Changeset 9c27b0 for src/Graph/unittests

Timestamp:

Oct 20, 2011, 7:04:50 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, Candidate_v1.7.0, 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:

a8b9136

Parents:

45f835 (diff), b1ac7a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'MatrixContainer_Serialization_rewrite' into stable

Location:

src/Graph/unittests

Files:

• BondGraphUnitTest.cpp (moved) (moved from src/unittests/BondGraphUnitTest.cpp ) (3 diffs)
• BondGraphUnitTest.hpp (moved) (moved from src/unittests/BondGraphUnitTest.hpp ) (2 diffs)
• Makefile.am (added)

src/Graph/unittests/BondGraphUnitTest.cpp

@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
+// include headers that implement a archive in simple text format
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/text_iarchive.hpp>
+
 #include <iostream>
 #include <stdio.h>
@@ -33 +37 @@
 #include "Bond/bond.hpp"
 #include "CodePatterns/Log.hpp"
-#include "element.hpp"
+#include "Element/element.hpp"
 #include "Graph/BondGraph.hpp"
 #include "molecule.hpp"
-#include "periodentafel.hpp"
+#include "Element/periodentafel.hpp"
 #include "World.hpp"
 #include "WorldTime.hpp"
@@ -167 +171 @@
 };
 
+/** UnitTest for operator==()
+ */
+void BondGraphTest::EqualityTest()
+{
+  // compare to self
+  CPPUNIT_ASSERT( *BG == *BG );
+
+  // create other instance
+  BondGraph *BG2 = new BondGraph(true);
+  CPPUNIT_ASSERT( *BG == *BG2 );
+  BG2->IsAngstroem = false;
+  CPPUNIT_ASSERT( *BG != *BG2 );
+  delete BG2;
+};
+
+/** UnitTest for serialization
+ */
+void BondGraphTest::SerializationTest()
+{
+  // write element to stream
+  std::stringstream stream;
+  boost::archive::text_oarchive oa(stream);
+  oa << BG;
+
+  std::cout << "Contents of archive is " << stream.str() << std::endl;
+
+  // create and open an archive for input
+  boost::archive::text_iarchive ia(stream);
+  // read class state from archive
+  BondGraph *BG2;
+
+  ia >> BG2;
+
+  CPPUNIT_ASSERT (*BG == *BG2);
+
+  delete BG2;
+};
+

src/Graph/unittests/BondGraphUnitTest.hpp

@@ -32 +32 @@
     CPPUNIT_TEST ( ConstructGraphFromTableTest );
     CPPUNIT_TEST ( ConstructGraphFromCovalentRadiiTest );
+    CPPUNIT_TEST ( EqualityTest );
+    CPPUNIT_TEST ( SerializationTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -41 +43 @@
       void ConstructGraphFromTableTest();
       void ConstructGraphFromCovalentRadiiTest();
+      void EqualityTest();
+      void SerializationTest();
 
 private: