Fixes H_VMImage to test VM primitives

Issue: #92
0x7CFE · Aug 12, 2016 · aefcc90 · aefcc90
1 parent 6a1167e
commit aefcc90
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/tests/helpers/VMImage.h b/tests/helpers/VMImage.h
@@ -11,11 +11,12 @@ class H_VMImage
     std::auto_ptr<IMemoryManager> m_memoryManager;
     std::auto_ptr<Image> m_smalltalkImage;
 public:
-    H_VMImage(const std::string& imageName) {
-        std::auto_ptr<IMemoryManager> memoryManager(new BakerMemoryManager());
-        memoryManager->initializeHeap(1024*1024, 1024*1024);
-        std::auto_ptr<Image> smalltalkImage(new Image(memoryManager.get()));
-        smalltalkImage->loadImage(TESTS_DIR "./data/" + imageName + ".image");
+    H_VMImage(const std::string& imageName) :
+        m_memoryManager(new BakerMemoryManager()),
+        m_smalltalkImage(new Image(m_memoryManager.get()))
+    {
+        m_memoryManager->initializeHeap(1024*1024, 1024*1024);
+        m_smalltalkImage->loadImage(TESTS_DIR "./data/" + imageName + ".image");
     }
     TObjectArray* newArray(std::size_t fields);
     TString* newString(std::size_t size);

diff --git a/tests/vm_primitives.cpp b/tests/vm_primitives.cpp
@@ -1,9 +1,30 @@
 #include <gtest/gtest.h>
 #include "helpers/VMImage.h"
-#include "patterns/InitVMImage.h"
 #include <primitives.h>
 #include <opcodes.h>
 
+class P_InitVM_Image : public ::testing::TestWithParam<std::string /*image name*/>
+{
+protected:
+    H_VMImage* m_image;
+public:
+    virtual ~P_InitVM_Image() {}
+
+    virtual void SetUp()
+    {
+        bool is_parameterized_test = ::testing::UnitTest::GetInstance()->current_test_info()->value_param();
+        if (!is_parameterized_test) {
+            // Use TEST_P instead of TEST_F !
+            abort();
+        }
+        ParamType image_name = GetParam();
+        m_image = new H_VMImage(image_name);
+    }
+    virtual void TearDown() {
+        delete m_image;
+    }
+};
+
 INSTANTIATE_TEST_CASE_P(_, P_InitVM_Image, ::testing::Values(std::string("VMPrimitives")) );
 
 TEST_P(P_InitVM_Image, smallint)