Class name refactored to reflect new purpose

autowiring/EnclosedContextTestBase.h → autowiring/AutowiringEnclosure.h

@@ -7,13 +7,13 @@
 /// <summary>
 /// General purpose exception filter, used for tracking exceptions thrown from unit test CoreThreads
 /// </summary>
-class EnclosedContextExceptionFilter:
+class AutowiringEnclosureExceptionFilter:
   public ContextMember,
   public ExceptionFilter
 {
 public:
-  EnclosedContextExceptionFilter(void) :
-    ContextMember("EnclosedContextExceptionFilter"),
+  AutowiringEnclosureExceptionFilter(void) :
+    ContextMember("AutowiringEnclosureExceptionFilter"),
     m_excepted(false)
   {}
 
@@ -44,7 +44,7 @@ class EnclosedContextExceptionFilter:
 /// tests complete in a timely fashion.  If a longer stop duration is desired, you must provide a
 /// destructor which performs teardown in a different way.
 /// </remarks>
-class EnclosedContextTestBase:
+class AutowiringEnclosure:
   public testing::EmptyTestEventListener
 {
 private:

src/autotesting/EnclosedContextTestBase.cpp → src/autotesting/AutowiringEnclosure.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "EnclosedContextTestBase.h"
+#include "AutowiringEnclosure.h"
 
 struct TestInfoProxy {
   TestInfoProxy(const testing::TestInfo& info) :
@@ -9,25 +9,25 @@ struct TestInfoProxy {
   const testing::TestInfo& m_info;
 };
 
-void EnclosedContextTestBase::OnTestStart(const testing::TestInfo& info) {
-  AutoRequired<EnclosedContextExceptionFilter> filter;
+void AutowiringEnclosure::OnTestStart(const testing::TestInfo& info) {
+  AutoRequired<AutowiringEnclosureExceptionFilter> filter;
 
   // The context proper.  This is automatically assigned as the current
   // context when SetUp is invoked.
   AutoCreateContext create;
   create->Construct<TestInfoProxy>(info);
 
   // Add exception filter in this context:
-  create->Inject<EnclosedContextExceptionFilter>();
+  create->Inject<AutowiringEnclosureExceptionFilter>();
 
   // Now make it current and let the test run:
   create->SetCurrent();
 }
 
-void EnclosedContextTestBase::OnTestEnd(const testing::TestInfo& info) {
+void AutowiringEnclosure::OnTestEnd(const testing::TestInfo& info) {
   // Verify we can grab the test case back out and that the pointer is correct:
   Autowired<TestInfoProxy> ti;
-  Autowired<EnclosedContextExceptionFilter> ecef;
+  Autowired<AutowiringEnclosureExceptionFilter> ecef;
   auto ctxt = ecef ? ecef->GetContext() : nullptr;
 
   // Unconditionally reset the global context as the current context

src/autotesting/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(AutoTesting_SOURCES
-  EnclosedContextTestBase.h
-  EnclosedContextTestBase.cpp
+  AutowiringEnclosure.h
+  AutowiringEnclosure.cpp
+  gtest-all-guard.cpp
 )
 
 rewrite_header_paths(AutoTesting_SOURCES)

src/autowiring/test/ContextEnumeratorTest.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved.
 #pragma once
-#include "EnclosedContextTestBase.hpp"
 
 class ContextEnumeratorTest:
   public testing::Test