Fix memory manager + tests

Author: clauspruefer

src/MemoryManager.hpp

@@ -41,7 +41,7 @@ class MemoryManager
 
     T* getNextMemPointer() {
         T* ReturnPointer = getMemPointer(SegmentOffset);
-        SegmentOffset >= SegmentCount ? SegmentOffset = 0 : SegmentOffset++;
+        SegmentOffset+1 >= SegmentCount ? SegmentOffset = 0 : SegmentOffset++;
         return ReturnPointer;
     }
 

test/unit/memory-manager/test-memory-manager.cpp

@@ -17,11 +17,11 @@ BOOST_AUTO_TEST_CASE( test_basic_memory_manager_char_type )
     char* BaseAddr = BufferMemory.getMemBaseAddress();
     char* MemPointer;
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr)+11);
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr));
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr)+(2*11));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr)+(1*11));
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr)+(3*11));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr)+(2*11));
 }
 
 // 64bit (8 byte)
@@ -31,11 +31,11 @@ BOOST_AUTO_TEST_CASE( test_basic_memory_manager_int64_type )
     int64_t* BaseAddr = BufferMemory.getMemBaseAddress();
     int64_t* MemPointer;
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+(16*8)));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr));
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+2*(16*8)));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+1*(16*8)));
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+3*(16*8)));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+2*(16*8)));
 }
 
 // 16bit (2 byte)
@@ -45,11 +45,11 @@ BOOST_AUTO_TEST_CASE( test_basic_memory_manager_short_type )
     short* BaseAddr = BufferMemory.getMemBaseAddress();
     short* MemPointer;
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+(38*2)));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr));
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+2*(38*2)));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+1*(38*2)));
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+3*(38*2)));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+2*(38*2)));
 }
 
 // 64bit (8 byte) out of bounds check
@@ -59,16 +59,16 @@ BOOST_AUTO_TEST_CASE( test_basic_memory_manager_int64_type_oob )
     int64_t* BaseAddr = BufferMemory.getMemBaseAddress();
     int64_t* MemPointer;
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+(24*8)));
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr));
+    MemPointer = BufferMemory.getNextMemPointer();
+    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+1*(24*8)));
     MemPointer = BufferMemory.getNextMemPointer();
     BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+2*(24*8)));
     MemPointer = BufferMemory.getNextMemPointer();
     BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+3*(24*8)));
     MemPointer = BufferMemory.getNextMemPointer();
     BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr+4*(24*8)));
     MemPointer = BufferMemory.getNextMemPointer();
-    BOOST_CHECK_EQUAL(MemPointer, static_cast<void*>(BaseAddr));
-    MemPointer = BufferMemory.getNextMemPointer();
 }
 
 BOOST_AUTO_TEST_CASE( test_memory_manager_wraps_after_segment_count )