Changeset e71890 for molecuilder/src/unittests

Timestamp:

Oct 9, 2009, 12:30:54 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

104cf4

Parents:

3efb4a (diff), 682229 (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:

molecuilder/src/unittests

Files:

• ActOnAllUnitTest.cpp (moved) (moved from molecuilder/src/ActOnAllUnitTest.cpp )
• ActOnAllUnitTest.hpp (moved) (moved from molecuilder/src/ActOnAllUnitTest.hpp )
• ActOnAlltest.hpp (moved) (moved from molecuilder/src/ActOnAlltest.hpp )
• Makefile.am (added)
• memoryallocatorunittest.cpp (moved) (moved from molecuilder/src/memoryallocatorunittest.cpp )
• memoryallocatorunittest.hpp (moved) (moved from molecuilder/src/memoryallocatorunittest.hpp )
• memoryusageobserverunittest.cpp (moved) (moved from molecuilder/src/memoryusageobserverunittest.cpp ) (9 diffs)
• memoryusageobserverunittest.hpp (moved) (moved from molecuilder/src/memoryusageobserverunittest.hpp ) (2 diffs)
• tesselationunittest.cpp (moved) (moved from molecuilder/src/tesselationunittest.cpp )
• tesselationunittest.hpp (moved) (moved from molecuilder/src/tesselationunittest.hpp )
• vectorunittest.cpp (moved) (moved from molecuilder/src/vectorunittest.cpp )
• vectorunittest.hpp (moved) (moved from molecuilder/src/vectorunittest.hpp )

molecuilder/src/unittests/memoryusageobserverunittest.cpp

@@ -10 +10 @@
 #include <cppunit/ui/text/TestRunner.h>
 
+#include "memoryallocator.hpp"
 #include "memoryusageobserver.hpp"
 #include "memoryusageobserverunittest.hpp"
@@ -41 +42 @@
 void MemoryUsageObserverTest::getInstanceTwiceReturnsSameInstanceTest()
 {
-  int* i = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::getInstanceTwiceReturnsSameInstanceTest - i");
   MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
   CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
@@ -52 +53 @@
 void MemoryUsageObserverTest::getInstanceAfterPurgeInstanceReturnsNewInstanceTest()
 {
-  int* i = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::getInstanceAfterPurgeInstanceReturnsNewInstanceTest - i");
   MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
   CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
@@ -64 +65 @@
 void MemoryUsageObserverTest::addAndRemoveMemoryTest()
 {
-  int* i = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addAndRemoveMemoryTest - i");
   MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
   CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
@@ -76 +77 @@
 void MemoryUsageObserverTest::removeNonTrackedMemoryDoesNotCauseACrashTest()
 {
-  int* i = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::removeNonTrackedMemoryDoesNotCauseACrashTest - i");
   MemoryUsageObserver::getInstance()->removeMemory(i);
   CPPUNIT_ASSERT_EQUAL((size_t) 0, MemoryUsageObserver::getInstance()->getUsedMemorySize());
@@ -86 +87 @@
 void MemoryUsageObserverTest::addMemoryTwiceTest()
 {
-  int* i = new int;
-  int* j = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryTwiceTest - i");
+  int* j = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryTwiceTest - j");
   MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
   MemoryUsageObserver::getInstance()->addMemory(j, sizeof(int));
   CPPUNIT_ASSERT_EQUAL(2 * sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
- };
+};
 
 /**
@@ -98 +99 @@
 void MemoryUsageObserverTest::addMemoryAndChangeSizeOfAddedMemoryTest()
 {
-  int* i = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryAndChangeSizeOfAddedMemoryTest - i");
   MemoryUsageObserver::getInstance()->addMemory(i, 2 * sizeof(int));
   MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
   CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getUsedMemorySize());
- };
+};
 
 /**
@@ -109 +110 @@
 void MemoryUsageObserverTest::addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest()
 {
-  int* i = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest - i");
   MemoryUsageObserver::getInstance()->addMemory(i, 2 * sizeof(int));
   MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
   CPPUNIT_ASSERT_EQUAL(2 * sizeof(int), MemoryUsageObserver::getInstance()->getMaximumUsedMemory());
- };
+};
 
 /**
@@ -120 +121 @@
 void MemoryUsageObserverTest::addMemoryRemoveMemoryAndGetMaximumSizeTest()
 {
-  int* i = new int;
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::addMemoryRemoveMemoryAndGetMaximumSizeTest - i");
   MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
   MemoryUsageObserver::getInstance()->removeMemory(i);
   CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getMaximumUsedMemory());
- };
+};
+
+/**
+ * UnitTest for getPointersToAllocatedMemory()
+ */
+void MemoryUsageObserverTest::getPointersToAllocatedMemoryTest()
+{
+  int* i = Malloc<int>(1, "MemoryUsageObserverTest::getPointersToAllocatedMemoryTest - i");
+  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
+  CPPUNIT_ASSERT_EQUAL(i, (int*) MemoryUsageObserver::getInstance()->getPointersToAllocatedMemory().begin()->first);
+};
+
+
 /********************************************** Main routine **************************************/
 

molecuilder/src/unittests/memoryusageobserverunittest.hpp

@@ -24 +24 @@
     CPPUNIT_TEST ( addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest );
     CPPUNIT_TEST ( addMemoryRemoveMemoryAndGetMaximumSizeTest );
+    CPPUNIT_TEST ( getPointersToAllocatedMemoryTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -39 +40 @@
     void addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest();
     void addMemoryRemoveMemoryAndGetMaximumSizeTest();
+    void getPointersToAllocatedMemoryTest();
 };