Changeset c111db for src/unittests


Ignore:
Timestamp:
Oct 9, 2009, 12:30:54 PM (15 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:
ccd9f5
Parents:
49f802c (diff), 87e2e39 (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.
git-author:
Frederik Heber <heber@…> (10/09/09 12:18:41)
git-committer:
Frederik Heber <heber@…> (10/09/09 12:30:54)
Message:

Merge branch 'new-delete-conversion' into CodeRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/helpers.cpp
molecuilder/src/helpers.hpp
molecuilder/src/memoryusageobserver.cpp

  • FIX: performCriticalExit() was declared static but not defined a such.
  • Merge was basically only due to libmolecuilder which was not used in CodeRefactoring branch before.
  • added ActOnAll Unit test to new unittests sub folder and to Makefile.am
Location:
src/unittests
Files:
1 added
11 moved

Legend:

Unmodified
Added
Removed

  • src/unittests/memoryusageobserverunittest.cpp

    r49f802c rc111db  
    1010#include <cppunit/ui/text/TestRunner.h>
    1111
     12#include "memoryallocator.hpp"
    1213#include "memoryusageobserver.hpp"
    1314#include "memoryusageobserverunittest.hpp"
    … …  
    4142void MemoryUsageObserverTest::getInstanceTwiceReturnsSameInstanceTest()
    4243{
    43   int* i = new int;
     44  int* i = Malloc<int>(1, "MemoryUsageObserverTest::getInstanceTwiceReturnsSameInstanceTest - i");
    4445  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
    4546  CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
    … …  
    5253void MemoryUsageObserverTest::getInstanceAfterPurgeInstanceReturnsNewInstanceTest()
    5354{
    54   int* i = new int;
     55  int* i = Malloc<int>(1, "MemoryUsageObserverTest::getInstanceAfterPurgeInstanceReturnsNewInstanceTest - i");
    5556  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
    5657  CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
    … …  
    6465void MemoryUsageObserverTest::addAndRemoveMemoryTest()
    6566{
    66   int* i = new int;
     67  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addAndRemoveMemoryTest - i");
    6768  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
    6869  CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
    … …  
    7677void MemoryUsageObserverTest::removeNonTrackedMemoryDoesNotCauseACrashTest()
    7778{
    78   int* i = new int;
     79  int* i = Malloc<int>(1, "MemoryUsageObserverTest::removeNonTrackedMemoryDoesNotCauseACrashTest - i");
    7980  MemoryUsageObserver::getInstance()->removeMemory(i);
    8081  CPPUNIT_ASSERT_EQUAL((size_t) 0, MemoryUsageObserver::getInstance()->getUsedMemorySize());
    … …  
    8687void MemoryUsageObserverTest::addMemoryTwiceTest()
    8788{
    88   int* i = new int;
    89   int* j = new int;
     89  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryTwiceTest - i");
     90  int* j = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryTwiceTest - j");
    9091  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
    9192  MemoryUsageObserver::getInstance()->addMemory(j, sizeof(int));
    9293  CPPUNIT_ASSERT_EQUAL(2 * sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
    93  };
     94};
    9495
    9596/**
    … …  
    9899void MemoryUsageObserverTest::addMemoryAndChangeSizeOfAddedMemoryTest()
    99100{
    100   int* i = new int;
     101  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryAndChangeSizeOfAddedMemoryTest - i");
    101102  MemoryUsageObserver::getInstance()->addMemory(i, 2 * sizeof(int));
    102103  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
    103104  CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
    104  };
     105};
    105106
    106107/**
    … …  
    109110void MemoryUsageObserverTest::addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest()
    110111{
    111   int* i = new int;
     112  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest - i");
    112113  MemoryUsageObserver::getInstance()->addMemory(i, 2 * sizeof(int));
    113114  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
    114115  CPPUNIT_ASSERT_EQUAL(2 * sizeof(int), MemoryUsageObserver::getInstance()->getMaximumUsedMemory());
    115  };
     116};
    116117
    117118/**
    … …  
    120121void MemoryUsageObserverTest::addMemoryRemoveMemoryAndGetMaximumSizeTest()
    121122{
    122   int* i = new int;
     123  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryRemoveMemoryAndGetMaximumSizeTest - i");
    123124  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
    124125  MemoryUsageObserver::getInstance()->removeMemory(i);
    125126  CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getMaximumUsedMemory());
    126  };
     127};
     128
     129/**
     130 * UnitTest for getPointersToAllocatedMemory()
     131 */
     132void MemoryUsageObserverTest::getPointersToAllocatedMemoryTest()
     133{
     134  int* i = Malloc<int>(1, "MemoryUsageObserverTest::getPointersToAllocatedMemoryTest - i");
     135  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
     136  CPPUNIT_ASSERT_EQUAL(i, (int*) MemoryUsageObserver::getInstance()->getPointersToAllocatedMemory().begin()->first);
     137};
     138
     139
    127140/********************************************** Main routine **************************************/
    128141

  • src/unittests/memoryusageobserverunittest.hpp

    r49f802c rc111db  
    2424    CPPUNIT_TEST ( addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest );
    2525    CPPUNIT_TEST ( addMemoryRemoveMemoryAndGetMaximumSizeTest );
     26    CPPUNIT_TEST ( getPointersToAllocatedMemoryTest );
    2627    CPPUNIT_TEST_SUITE_END();
    2728
    … …  
    3940    void addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest();
    4041    void addMemoryRemoveMemoryAndGetMaximumSizeTest();
     42    void getPointersToAllocatedMemoryTest();
    4143};
    4244
Note: See TracChangeset for help on using the changeset viewer.