Changeset bf497f for molecuilder/src/memoryusageobserverunittest.cpp

Timestamp:

Oct 5, 2009, 2:59:11 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5dda23, 729279, 8afe31

Parents:

7794d8 (diff), 39d983 (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 'ConcaveHull' of ​ssh://stud64d-02/home/metzler/workspace/espack into ConcaveHull

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/memoryusageobserver.cpp
molecuilder/src/memoryusageobserver.hpp
molecuilder/src/memoryusageobserverunittest.cpp
molecuilder/src/memoryusageobserverunittest.hpp

This conflict arised, because the #19 commit was already pushed to the server, but the commit was later "amended" locally. This is fixed, there were no real overlaps anyway.

File:

• molecuilder/src/memoryusageobserverunittest.cpp (modified) (1 diff)

molecuilder/src/memoryusageobserverunittest.cpp

@@ -104 +104 @@
  };
 
+/**
+ * UnitTest for getMaximumUsedMemory()
+ */
+void MemoryUsageObserverTest::addMemoryChangeSizeOfAddedMemoryAndGetMaximumSizeTest()
+{
+  int* i = new int;
+  MemoryUsageObserver::getInstance()->addMemory(i, 2 * sizeof(int));
+  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
+  CPPUNIT_ASSERT_EQUAL(2 * sizeof(int), MemoryUsageObserver::getInstance()->getMaximumUsedMemory());
+ };
+
+/**
+ * UnitTest for getMaximumUsedMemory()
+ */
+void MemoryUsageObserverTest::addMemoryRemoveMemoryAndGetMaximumSizeTest()
+{
+  int* i = new int;
+  MemoryUsageObserver::getInstance()->addMemory(i, sizeof(int));
+  MemoryUsageObserver::getInstance()->removeMemory(i);
+  CPPUNIT_ASSERT_EQUAL(sizeof(int), MemoryUsageObserver::getInstance()->getMaximumUsedMemory());
+ };
 /********************************************** Main routine **************************************/