Ignore:
Timestamp:
Oct 6, 2009, 11:15:50 AM (16 years ago)
Author:
metzler <metzler@…>
Children:
53f32e
Parents:
bf497f
Message:

#22 Write a critical exit function

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/memoryusageobserverunittest.cpp

    rbf497f r729279  
    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
Note: See TracChangeset for help on using the changeset viewer.