Made changes to fix setup and teardown bug reported for fixtures for issue #28.

More testing is still required for multiple fixtures in multiple files.

Author: colinrg

test/TestClass.hpp

@@ -196,14 +196,20 @@ class TestClass
     void Setup()
     {
         TestSetupTeardown& setup_teardown = privateSetupTeardown();
-        if (setup_teardown.IsSetupSet())
+        TestString const& this_class_name = GetClassName();
+        TestString class_name = setup_teardown.GetClassName<true>();
+        if (setup_teardown.IsSetupSet() && this_class_name == class_name)
             setup_teardown.Execute<true>();
     }
 
     void Teardown()
     {
         TestSetupTeardown& setup_teardown = privateSetupTeardown();
-        if (setup_teardown.IsTeardownSet() && setup_teardown.IsSetupRun())
+        TestString const& this_class_name = GetClassName();
+        TestString class_name = setup_teardown.GetClassName<false>();
+        if (setup_teardown.IsTeardownSet() &&
+            setup_teardown.IsSetupRun() &&
+            this_class_name == class_name)
             setup_teardown.Execute<false>();
     }
 
@@ -1008,7 +1014,7 @@ class TestClass
         static TestSetupTeardown setup_teardown;
         return setup_teardown;
     }
-    
+
 // Data for this test.
 private:
     TestMemoryLeakCheck m_leak_check;

test/TestSetupTeardown.hpp

@@ -69,7 +69,7 @@ class TestSetupTeardown
     }
 
     template<bool const is_setup>
-    char const* GetClassName() const throw()
+    TestString GetClassName() const throw()
     {
         return is_setup ? GetSetupClassName() : GetTeardownClassName();
     }

test/unit_tests/TestMacros.tests.cpp

@@ -0,0 +1,70 @@
+/*
+Copyright 2016 Colin Girling
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include "../Test.hpp"
+
+namespace
+{
+    class LocalTestClass
+    {
+    public:
+        LocalTestClass() : m_value(0)
+        {
+        }
+
+        int GetValue() const
+        {
+            return m_value;
+        }
+
+        void SetValue(int value)
+        {
+            m_value = value;
+        }
+
+    private:
+        int m_value;
+    };
+}
+
+LocalTestClass g_local_test_class;
+
+TEST_SETUP(LocalTestClass)
+{
+    g_local_test_class.SetValue(1);
+}
+
+TEST_TEARDOWN(LocalTestClass)
+{
+}
+
+TEST_MEMBER_FUNCTION(LocalTestClass, GetValue, NA)
+{
+    LocalTestClass local_test_class;
+    CHECK_EQUAL(g_local_test_class.GetValue(), 1);
+    CHECK_EQUAL(local_test_class.GetValue(), 0);
+    local_test_class = g_local_test_class;
+    CHECK_EQUAL(local_test_class.GetValue(), 1);
+}
+
+TEST_MEMBER_FUNCTION(LocalTestClass, SetValue, int)
+{
+    LocalTestClass local_test_class;
+    CHECK_EQUAL(g_local_test_class.GetValue(), 1);
+    CHECK_EQUAL(local_test_class.GetValue(), 0);
+    local_test_class.SetValue(2);
+    CHECK_EQUAL(local_test_class.GetValue(), 2);
+}

test/unit_tests/ide/VS2015/test_unit_tests/test_unit_tests.vcxproj

@@ -143,6 +143,7 @@
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -153,6 +154,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\TestClass.tests.cpp" />
+    <ClCompile Include="..\..\..\TestMacros.tests.cpp" />
     <ClCompile Include="..\..\..\TestCompare.tests.cpp" />
     <ClCompile Include="..\..\..\TestConverterUtility.tests.cpp" />
     <ClCompile Include="..\..\..\TestIntegerUtility.tests.cpp" />