From c8650e0d8495ea1a3ae6b458a42bdfbce39971ba Mon Sep 17 00:00:00 2001 From: Jason Lokerson Date: Mon, 4 Aug 2014 07:31:31 -0700 Subject: [PATCH] Eliminating superfluous header files in unit tests These header files used to be a lot more extensive, but now all contain empty or nearly-empty class definitions. Those tests which still require extensive setup have been left with their original headers, but all others which are merely class declarations have been integrated with their respective source files. --- src/autowiring/test/AnySharedPointerTest.cpp | 5 ++- src/autowiring/test/AnySharedPointerTest.hpp | 6 --- src/autowiring/test/AutoAnchorTest.cpp | 5 ++- src/autowiring/test/AutoAnchorTest.hpp | 7 ---- src/autowiring/test/AutoFilterTest.cpp | 5 ++- src/autowiring/test/AutoFilterTest.hpp | 6 --- src/autowiring/test/AutoInjectableTest.cpp | 5 ++- src/autowiring/test/AutoInjectableTest.hpp | 6 --- src/autowiring/test/AutoPacketFactoryTest.cpp | 5 ++- src/autowiring/test/AutoPacketFactoryTest.hpp | 6 --- src/autowiring/test/AutowiringTest.cpp | 5 ++- src/autowiring/test/AutowiringTest.hpp | 6 --- .../test/AutowiringUtilitiesTest.cpp | 5 ++- .../test/AutowiringUtilitiesTest.hpp | 6 --- src/autowiring/test/BasicThreadTest.cpp | 5 ++- src/autowiring/test/BasicThreadTest.hpp | 6 --- src/autowiring/test/BoltTest.cpp | 5 ++- src/autowiring/test/BoltTest.hpp | 6 --- src/autowiring/test/CMakeLists.txt | 40 +------------------ src/autowiring/test/ContextCleanupTest.cpp | 5 ++- src/autowiring/test/ContextCleanupTest.hpp | 6 --- src/autowiring/test/ContextCreatorTest.cpp | 5 ++- src/autowiring/test/ContextCreatorTest.hpp | 6 --- src/autowiring/test/ContextEnumeratorTest.cpp | 5 ++- src/autowiring/test/ContextEnumeratorTest.hpp | 6 --- src/autowiring/test/ContextMapTest.cpp | 6 ++- src/autowiring/test/ContextMapTest.hpp | 8 ---- src/autowiring/test/ContextMemberTest.cpp | 5 ++- src/autowiring/test/ContextMemberTest.hpp | 6 --- src/autowiring/test/CoreContextTest.cpp | 5 ++- src/autowiring/test/CoreContextTest.hpp | 6 --- src/autowiring/test/CoreJobTest.cpp | 5 ++- src/autowiring/test/CoreJobTest.hpp | 6 --- src/autowiring/test/CoreThreadTest.cpp | 5 ++- src/autowiring/test/CoreThreadTest.hpp | 6 --- .../test/CurrentContextPusherTest.cpp | 5 ++- .../test/CurrentContextPusherTest.hpp | 6 --- src/autowiring/test/DecoratorTest.cpp | 14 ++++--- src/autowiring/test/DecoratorTest.hpp | 9 ----- src/autowiring/test/DispatchQueueTest.cpp | 6 ++- src/autowiring/test/DispatchQueueTest.hpp | 9 ----- src/autowiring/test/EventReceiverTest.cpp | 16 ++++---- src/autowiring/test/EventReceiverTest.hpp | 9 ----- src/autowiring/test/ExceptionFilterTest.cpp | 5 ++- src/autowiring/test/ExceptionFilterTest.hpp | 6 --- src/autowiring/test/FactoryTest.cpp | 5 ++- src/autowiring/test/FactoryTest.hpp | 6 --- src/autowiring/test/GuardObjectTest.cpp | 5 ++- src/autowiring/test/GuardObjectTest.hpp | 6 --- .../test/InterlockedRoutinesTest.cpp | 5 ++- .../test/InterlockedRoutinesTest.hpp | 6 --- src/autowiring/test/MarshalingTest.cpp | 4 +- src/autowiring/test/MarshalingTest.hpp | 6 --- src/autowiring/test/MultiInheritTest.cpp | 6 ++- src/autowiring/test/MultiInheritTest.hpp | 10 ----- src/autowiring/test/ObjectPoolTest.cpp | 5 ++- src/autowiring/test/ObjectPoolTest.hpp | 6 --- src/autowiring/test/PeerContextTest.cpp | 5 ++- src/autowiring/test/PeerContextTest.hpp | 6 --- src/autowiring/test/PostConstructTest.cpp | 5 ++- src/autowiring/test/ScopeTest.cpp | 5 ++- src/autowiring/test/ScopeTest.hpp | 6 --- .../test/SelfSelectingFixtureTest.cpp | 5 ++- .../test/SelfSelectingFixtureTest.hpp | 6 --- src/autowiring/test/SnoopTest.cpp | 5 ++- src/autowiring/test/SnoopTest.hpp | 6 --- src/autowiring/test/TeardownNotifierTest.cpp | 5 ++- src/autowiring/test/TeardownNotifierTest.hpp | 6 --- src/autowiring/test/TypeRegistryTest.cpp | 5 ++- src/autowiring/test/TypeRegistryTest.hpp | 6 --- src/autowiring/test/UuidTest.cpp | 5 ++- src/autowiring/test/UuidTest.hpp | 6 --- 72 files changed, 158 insertions(+), 310 deletions(-) delete mode 100644 src/autowiring/test/AnySharedPointerTest.hpp delete mode 100644 src/autowiring/test/AutoAnchorTest.hpp delete mode 100644 src/autowiring/test/AutoFilterTest.hpp delete mode 100644 src/autowiring/test/AutoInjectableTest.hpp delete mode 100644 src/autowiring/test/AutoPacketFactoryTest.hpp delete mode 100644 src/autowiring/test/AutowiringTest.hpp delete mode 100644 src/autowiring/test/AutowiringUtilitiesTest.hpp delete mode 100644 src/autowiring/test/BasicThreadTest.hpp delete mode 100644 src/autowiring/test/BoltTest.hpp delete mode 100644 src/autowiring/test/ContextCleanupTest.hpp delete mode 100644 src/autowiring/test/ContextCreatorTest.hpp delete mode 100644 src/autowiring/test/ContextEnumeratorTest.hpp delete mode 100644 src/autowiring/test/ContextMapTest.hpp delete mode 100644 src/autowiring/test/ContextMemberTest.hpp delete mode 100644 src/autowiring/test/CoreContextTest.hpp delete mode 100644 src/autowiring/test/CoreJobTest.hpp delete mode 100644 src/autowiring/test/CoreThreadTest.hpp delete mode 100644 src/autowiring/test/CurrentContextPusherTest.hpp delete mode 100644 src/autowiring/test/DecoratorTest.hpp delete mode 100644 src/autowiring/test/DispatchQueueTest.hpp delete mode 100644 src/autowiring/test/EventReceiverTest.hpp delete mode 100644 src/autowiring/test/ExceptionFilterTest.hpp delete mode 100644 src/autowiring/test/FactoryTest.hpp delete mode 100644 src/autowiring/test/GuardObjectTest.hpp delete mode 100644 src/autowiring/test/InterlockedRoutinesTest.hpp delete mode 100644 src/autowiring/test/MarshalingTest.hpp delete mode 100644 src/autowiring/test/MultiInheritTest.hpp delete mode 100644 src/autowiring/test/ObjectPoolTest.hpp delete mode 100644 src/autowiring/test/PeerContextTest.hpp delete mode 100644 src/autowiring/test/ScopeTest.hpp delete mode 100644 src/autowiring/test/SelfSelectingFixtureTest.hpp delete mode 100644 src/autowiring/test/SnoopTest.hpp delete mode 100644 src/autowiring/test/TeardownNotifierTest.hpp delete mode 100644 src/autowiring/test/TypeRegistryTest.hpp delete mode 100644 src/autowiring/test/UuidTest.hpp diff --git a/src/autowiring/test/AnySharedPointerTest.cpp b/src/autowiring/test/AnySharedPointerTest.cpp index e78eb2db2..ffee4d5b9 100644 --- a/src/autowiring/test/AnySharedPointerTest.cpp +++ b/src/autowiring/test/AnySharedPointerTest.cpp @@ -1,10 +1,13 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "AnySharedPointerTest.hpp" #include "TestFixtures/SimpleObject.hpp" #include #include +class AnySharedPointerTest: + public testing::Test +{}; + class MyUnusedClass {}; template<> diff --git a/src/autowiring/test/AnySharedPointerTest.hpp b/src/autowiring/test/AnySharedPointerTest.hpp deleted file mode 100644 index 75ceb85bb..000000000 --- a/src/autowiring/test/AnySharedPointerTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class AnySharedPointerTest: - public testing::Test -{}; diff --git a/src/autowiring/test/AutoAnchorTest.cpp b/src/autowiring/test/AutoAnchorTest.cpp index 1fb26912e..3cd472e21 100644 --- a/src/autowiring/test/AutoAnchorTest.cpp +++ b/src/autowiring/test/AutoAnchorTest.cpp @@ -1,8 +1,11 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "AutoAnchorTest.hpp" #include "TestFixtures/SimpleObject.hpp" +class AutoAnchorTest: + public testing::Test +{}; + struct AnchorsNothing: AutoAnchor<> {}; diff --git a/src/autowiring/test/AutoAnchorTest.hpp b/src/autowiring/test/AutoAnchorTest.hpp deleted file mode 100644 index 7f4d795b0..000000000 --- a/src/autowiring/test/AutoAnchorTest.hpp +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class AutoAnchorTest: - public testing::Test -{}; - diff --git a/src/autowiring/test/AutoFilterTest.cpp b/src/autowiring/test/AutoFilterTest.cpp index 989a4dae4..a731404cb 100644 --- a/src/autowiring/test/AutoFilterTest.cpp +++ b/src/autowiring/test/AutoFilterTest.cpp @@ -1,12 +1,15 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "AutoFilterTest.hpp" #include "TestFixtures/Decoration.hpp" #include #include #include #include THREAD_HEADER +class AutoFilterTest: + public testing::Test +{}; + TEST_F(AutoFilterTest, VerifyDescendentAwareness) { AutoCurrentContext()->Initiate(); diff --git a/src/autowiring/test/AutoFilterTest.hpp b/src/autowiring/test/AutoFilterTest.hpp deleted file mode 100644 index 62fe5f7b2..000000000 --- a/src/autowiring/test/AutoFilterTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class AutoFilterTest: - public testing::Test -{}; diff --git a/src/autowiring/test/AutoInjectableTest.cpp b/src/autowiring/test/AutoInjectableTest.cpp index d2cc942ed..faecffb35 100644 --- a/src/autowiring/test/AutoInjectableTest.cpp +++ b/src/autowiring/test/AutoInjectableTest.cpp @@ -1,9 +1,12 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "AutoInjectableTest.hpp" #include "TestFixtures/SimpleObject.hpp" #include +class AutoInjectableTest: + public testing::Test +{}; + TEST_F(AutoInjectableTest, VerifySimpleInjection) { auto injector = MakeInjectable(); injector(); diff --git a/src/autowiring/test/AutoInjectableTest.hpp b/src/autowiring/test/AutoInjectableTest.hpp deleted file mode 100644 index 434ed6d2d..000000000 --- a/src/autowiring/test/AutoInjectableTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class AutoInjectableTest: - public testing::Test -{}; diff --git a/src/autowiring/test/AutoPacketFactoryTest.cpp b/src/autowiring/test/AutoPacketFactoryTest.cpp index c0246e860..720cd3164 100644 --- a/src/autowiring/test/AutoPacketFactoryTest.cpp +++ b/src/autowiring/test/AutoPacketFactoryTest.cpp @@ -1,8 +1,11 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "AutoPacketFactoryTest.hpp" #include +class AutoPacketFactoryTest: + public testing::Test +{}; + TEST_F(AutoPacketFactoryTest, VerifyNoIssueWhileNotStarted) { AutoRequired factory; ASSERT_THROW(factory->NewPacket(), autowiring_error) << "Issuing a packet in a context that has not yet been started should throw an exception"; diff --git a/src/autowiring/test/AutoPacketFactoryTest.hpp b/src/autowiring/test/AutoPacketFactoryTest.hpp deleted file mode 100644 index 38cb8cf23..000000000 --- a/src/autowiring/test/AutoPacketFactoryTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class AutoPacketFactoryTest: - public testing::Test -{}; diff --git a/src/autowiring/test/AutowiringTest.cpp b/src/autowiring/test/AutowiringTest.cpp index e64eaef5c..afa0b0739 100644 --- a/src/autowiring/test/AutowiringTest.cpp +++ b/src/autowiring/test/AutowiringTest.cpp @@ -1,6 +1,5 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "AutowiringTest.hpp" #include "gtest-all-guard.h" #include "TestFixtures/SimpleObject.hpp" #include "TestFixtures/SimpleReceiver.hpp" @@ -11,6 +10,10 @@ int main(int argc, const char* argv []) { return autotesting_main(argc, argv); } +class AutowiringTest: + public testing::Test +{}; + TEST_F(AutowiringTest, VerifyAutowiredFast) { // Add an object: AutoCurrentContext()->Inject(); diff --git a/src/autowiring/test/AutowiringTest.hpp b/src/autowiring/test/AutowiringTest.hpp deleted file mode 100644 index 02dc55fe7..000000000 --- a/src/autowiring/test/AutowiringTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class AutowiringTest: - public testing::Test -{}; diff --git a/src/autowiring/test/AutowiringUtilitiesTest.cpp b/src/autowiring/test/AutowiringUtilitiesTest.cpp index 206344736..3c653760a 100644 --- a/src/autowiring/test/AutowiringUtilitiesTest.cpp +++ b/src/autowiring/test/AutowiringUtilitiesTest.cpp @@ -1,12 +1,15 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "AutowiringUtilitiesTest.hpp" #include #include #include #include #include THREAD_HEADER +class AutowiringUtilitiesTest: + public testing::Test +{}; + static autowiring::thread_specific_ptr s_thread_specific_int; class Thread1: diff --git a/src/autowiring/test/AutowiringUtilitiesTest.hpp b/src/autowiring/test/AutowiringUtilitiesTest.hpp deleted file mode 100644 index 69e5f7b0c..000000000 --- a/src/autowiring/test/AutowiringUtilitiesTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class AutowiringUtilitiesTest: - public testing::Test -{}; diff --git a/src/autowiring/test/BasicThreadTest.cpp b/src/autowiring/test/BasicThreadTest.cpp index c2caa346d..b24837eec 100644 --- a/src/autowiring/test/BasicThreadTest.cpp +++ b/src/autowiring/test/BasicThreadTest.cpp @@ -1,8 +1,11 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "BasicThreadTest.hpp" #include +class BasicThreadTest: + public testing::Test +{}; + class SpinsAndThenQuits: public BasicThread { diff --git a/src/autowiring/test/BasicThreadTest.hpp b/src/autowiring/test/BasicThreadTest.hpp deleted file mode 100644 index e9b8dc534..000000000 --- a/src/autowiring/test/BasicThreadTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class BasicThreadTest: - public testing::Test -{}; diff --git a/src/autowiring/test/BoltTest.cpp b/src/autowiring/test/BoltTest.cpp index 74333d12e..ad2da57a4 100644 --- a/src/autowiring/test/BoltTest.cpp +++ b/src/autowiring/test/BoltTest.cpp @@ -1,6 +1,5 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "BoltTest.hpp" #include #include #include @@ -8,6 +7,10 @@ #include #include +class BoltTest: + public testing::Test +{}; + struct Pipeline {}; struct OtherContext {}; diff --git a/src/autowiring/test/BoltTest.hpp b/src/autowiring/test/BoltTest.hpp deleted file mode 100644 index 38e88fbca..000000000 --- a/src/autowiring/test/BoltTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class BoltTest: - public testing::Test -{}; diff --git a/src/autowiring/test/CMakeLists.txt b/src/autowiring/test/CMakeLists.txt index f82cafc3f..6d0da4735 100644 --- a/src/autowiring/test/CMakeLists.txt +++ b/src/autowiring/test/CMakeLists.txt @@ -1,77 +1,42 @@ set(AutowiringTest_SRCS - AnySharedPointerTest.hpp AnySharedPointerTest.cpp - AutoAnchorTest.hpp AutoAnchorTest.cpp - AutoFilterTest.hpp AutoFilterTest.cpp - AutoInjectableTest.hpp AutoInjectableTest.cpp - AutoPacketFactoryTest.hpp AutoPacketFactoryTest.cpp - AutowiringTest.hpp AutowiringTest.cpp - AutowiringUtilitiesTest.hpp AutowiringUtilitiesTest.cpp - BasicThreadTest.hpp BasicThreadTest.cpp - CoreContextTest.hpp + BoltTest.cpp CoreContextTest.cpp - ContextCleanupTest.hpp + CoreJobTest.cpp ContextCleanupTest.cpp - ContextEnumeratorTest.hpp ContextEnumeratorTest.cpp - ContextMapTest.hpp ContextMapTest.cpp - ContextMemberTest.hpp ContextMemberTest.cpp - CoreThreadTest.hpp CoreThreadTest.cpp - BoltTest.hpp - BoltTest.cpp - ContextCreatorTest.hpp ContextCreatorTest.cpp - CurrentContextPusherTest.hpp CurrentContextPusherTest.cpp - DecoratorTest.hpp DecoratorTest.cpp - DispatchQueueTest.hpp DispatchQueueTest.cpp DtorCorrectnessTest.hpp DtorCorrectnessTest.cpp - ExceptionFilterTest.hpp ExceptionFilterTest.cpp - EventReceiverTest.hpp EventReceiverTest.cpp - FactoryTest.hpp FactoryTest.cpp GlobalInitTest.hpp GlobalInitTest.cpp - GuardObjectTest.hpp GuardObjectTest.cpp - InterlockedRoutinesTest.hpp InterlockedRoutinesTest.cpp - MarshalingTest.hpp MarshalingTest.cpp - MultiInheritTest.hpp MultiInheritTest.cpp - ObjectPoolTest.hpp ObjectPoolTest.cpp - PeerContextTest.hpp PeerContextTest.cpp - PostConstructTest.hpp PostConstructTest.cpp - SelfSelectingFixtureTest.hpp SelfSelectingFixtureTest.cpp - TeardownNotifierTest.hpp TeardownNotifierTest.cpp - CoreJobTest.hpp - CoreJobTest.cpp - TypeRegistryTest.hpp TypeRegistryTest.cpp - ScopeTest.hpp ScopeTest.cpp - SnoopTest.hpp SnoopTest.cpp TestFixtures/custom_exception.hpp TestFixtures/ExitRaceThreaded.hpp @@ -82,7 +47,6 @@ set(AutowiringTest_SRCS TestFixtures/ThrowsWhenFired.hpp TestFixtures/ThrowsWhenRun.hpp TestFixtures/MultiInherit.hpp - UuidTest.hpp UuidTest.cpp ) diff --git a/src/autowiring/test/ContextCleanupTest.cpp b/src/autowiring/test/ContextCleanupTest.cpp index d697fc1fa..1dfbc3a04 100644 --- a/src/autowiring/test/ContextCleanupTest.cpp +++ b/src/autowiring/test/ContextCleanupTest.cpp @@ -1,12 +1,15 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ContextCleanupTest.hpp" #include "TestFixtures/SimpleObject.hpp" #include "TestFixtures/SimpleThreaded.hpp" #include #include #include THREAD_HEADER +class ContextCleanupTest: + public testing::Test +{}; + TEST_F(ContextCleanupTest, ValidateTeardownOrder) { class WeakPtrChecker { public: diff --git a/src/autowiring/test/ContextCleanupTest.hpp b/src/autowiring/test/ContextCleanupTest.hpp deleted file mode 100644 index e32ba5a92..000000000 --- a/src/autowiring/test/ContextCleanupTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ContextCleanupTest: - public testing::Test -{}; diff --git a/src/autowiring/test/ContextCreatorTest.cpp b/src/autowiring/test/ContextCreatorTest.cpp index a45475aba..10bab3d24 100644 --- a/src/autowiring/test/ContextCreatorTest.cpp +++ b/src/autowiring/test/ContextCreatorTest.cpp @@ -1,11 +1,14 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ContextCreatorTest.hpp" #include #include #include #include +class ContextCreatorTest: + public testing::Test +{}; + struct EvictionContext {}; class Creator: diff --git a/src/autowiring/test/ContextCreatorTest.hpp b/src/autowiring/test/ContextCreatorTest.hpp deleted file mode 100644 index 0a3b96bc2..000000000 --- a/src/autowiring/test/ContextCreatorTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ContextCreatorTest: - public testing::Test -{}; diff --git a/src/autowiring/test/ContextEnumeratorTest.cpp b/src/autowiring/test/ContextEnumeratorTest.cpp index 7888aa5e8..21e808720 100644 --- a/src/autowiring/test/ContextEnumeratorTest.cpp +++ b/src/autowiring/test/ContextEnumeratorTest.cpp @@ -1,9 +1,12 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ContextEnumeratorTest.hpp" #include #include MEMORY_HEADER +class ContextEnumeratorTest: + public testing::Test +{}; + TEST_F(ContextEnumeratorTest, DegenerateEnumeration) { size_t ct = 0; for(const auto& cur : ContextEnumerator(std::shared_ptr(nullptr))) { diff --git a/src/autowiring/test/ContextEnumeratorTest.hpp b/src/autowiring/test/ContextEnumeratorTest.hpp deleted file mode 100644 index f7aa493e1..000000000 --- a/src/autowiring/test/ContextEnumeratorTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ContextEnumeratorTest: - public testing::Test -{}; diff --git a/src/autowiring/test/ContextMapTest.cpp b/src/autowiring/test/ContextMapTest.cpp index 047d30615..85a525687 100644 --- a/src/autowiring/test/ContextMapTest.cpp +++ b/src/autowiring/test/ContextMapTest.cpp @@ -1,6 +1,5 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ContextMapTest.hpp" #include "TestFixtures/ExitRaceThreaded.hpp" #include "TestFixtures/SimpleThreaded.hpp" #include @@ -8,6 +7,11 @@ #include #include THREAD_HEADER +class ContextMapTest: + public testing::Test +{ +}; + using namespace std; TEST_F(ContextMapTest, VerifySimple) { diff --git a/src/autowiring/test/ContextMapTest.hpp b/src/autowiring/test/ContextMapTest.hpp deleted file mode 100644 index a559e5e5b..000000000 --- a/src/autowiring/test/ContextMapTest.hpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ContextMapTest: - public testing::Test -{ -}; - diff --git a/src/autowiring/test/ContextMemberTest.cpp b/src/autowiring/test/ContextMemberTest.cpp index a2fa60350..161d9bac5 100644 --- a/src/autowiring/test/ContextMemberTest.cpp +++ b/src/autowiring/test/ContextMemberTest.cpp @@ -1,9 +1,12 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ContextMemberTest.hpp" #include "TestFixtures/SimpleObject.hpp" #include "TestFixtures/SimpleThreaded.hpp" +class ContextMemberTest: + public testing::Test +{}; + class IsAContextMember: public ContextMember {}; diff --git a/src/autowiring/test/ContextMemberTest.hpp b/src/autowiring/test/ContextMemberTest.hpp deleted file mode 100644 index 4f2a7ef81..000000000 --- a/src/autowiring/test/ContextMemberTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ContextMemberTest: - public testing::Test -{}; diff --git a/src/autowiring/test/CoreContextTest.cpp b/src/autowiring/test/CoreContextTest.cpp index 406883ed5..31190eb2b 100644 --- a/src/autowiring/test/CoreContextTest.cpp +++ b/src/autowiring/test/CoreContextTest.cpp @@ -1,12 +1,15 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "CoreContextTest.hpp" #include #include #include #include THREAD_HEADER #include FUTURE_HEADER +class CoreContextTest: + public testing::Test +{}; + class Foo{}; class Bar{}; class Baz{}; diff --git a/src/autowiring/test/CoreContextTest.hpp b/src/autowiring/test/CoreContextTest.hpp deleted file mode 100644 index 0e6ef29f0..000000000 --- a/src/autowiring/test/CoreContextTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class CoreContextTest: - public testing::Test -{}; diff --git a/src/autowiring/test/CoreJobTest.cpp b/src/autowiring/test/CoreJobTest.cpp index e4f9ba001..b5db7b061 100644 --- a/src/autowiring/test/CoreJobTest.cpp +++ b/src/autowiring/test/CoreJobTest.cpp @@ -1,10 +1,13 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "CoreJobTest.hpp" #include #include THREAD_HEADER #include FUTURE_HEADER +class CoreJobTest: + public testing::Test +{}; + TEST_F(CoreJobTest, VerifySimpleProperties) { AutoRequired jb; AutoCurrentContext ctxt; diff --git a/src/autowiring/test/CoreJobTest.hpp b/src/autowiring/test/CoreJobTest.hpp deleted file mode 100644 index 79cc310c6..000000000 --- a/src/autowiring/test/CoreJobTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class CoreJobTest: - public testing::Test -{}; diff --git a/src/autowiring/test/CoreThreadTest.cpp b/src/autowiring/test/CoreThreadTest.cpp index ff8ab9e5a..dad721d38 100644 --- a/src/autowiring/test/CoreThreadTest.cpp +++ b/src/autowiring/test/CoreThreadTest.cpp @@ -1,11 +1,14 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "CoreThreadTest.hpp" #include "TestFixtures/SimpleThreaded.hpp" #include #include #include THREAD_HEADER +class CoreThreadTest: + public testing::Test +{}; + static_assert( std::is_same< decltype(std::chrono::steady_clock::now() + std::chrono::seconds(1)), diff --git a/src/autowiring/test/CoreThreadTest.hpp b/src/autowiring/test/CoreThreadTest.hpp deleted file mode 100644 index beba6871c..000000000 --- a/src/autowiring/test/CoreThreadTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class CoreThreadTest: - public testing::Test -{}; diff --git a/src/autowiring/test/CurrentContextPusherTest.cpp b/src/autowiring/test/CurrentContextPusherTest.cpp index 044a4a2ed..91fb5853f 100644 --- a/src/autowiring/test/CurrentContextPusherTest.cpp +++ b/src/autowiring/test/CurrentContextPusherTest.cpp @@ -1,10 +1,13 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "CurrentContextPusherTest.hpp" #include #include #include +class CurrentContextPusherTest: + public testing::Test +{}; + using namespace std; TEST_F(CurrentContextPusherTest, VerifyResetsDuringThrow) { diff --git a/src/autowiring/test/CurrentContextPusherTest.hpp b/src/autowiring/test/CurrentContextPusherTest.hpp deleted file mode 100644 index f64dda87c..000000000 --- a/src/autowiring/test/CurrentContextPusherTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2010 - 2013 Leap Motion. All rights reserved. Proprietary and confidential. -#pragma once - -class CurrentContextPusherTest: - public testing::Test -{}; diff --git a/src/autowiring/test/DecoratorTest.cpp b/src/autowiring/test/DecoratorTest.cpp index aa72af031..795d48b9e 100644 --- a/src/autowiring/test/DecoratorTest.cpp +++ b/src/autowiring/test/DecoratorTest.cpp @@ -1,16 +1,20 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "DecoratorTest.hpp" #include "TestFixtures/Decoration.hpp" #include #include using namespace std; -DecoratorTest::DecoratorTest(void) { - // All decorator tests must run from an initiated context - AutoCurrentContext()->Initiate(); -} +class DecoratorTest: + public testing::Test +{ +public: + DecoratorTest(void) { + // All decorator tests must run from an initiated context + AutoCurrentContext()->Initiate(); + } +}; TEST_F(DecoratorTest, VerifyCorrectExtraction) { vector v; diff --git a/src/autowiring/test/DecoratorTest.hpp b/src/autowiring/test/DecoratorTest.hpp deleted file mode 100644 index 3ab4421fc..000000000 --- a/src/autowiring/test/DecoratorTest.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class DecoratorTest: - public testing::Test -{ -public: - DecoratorTest(void); -}; diff --git a/src/autowiring/test/DispatchQueueTest.cpp b/src/autowiring/test/DispatchQueueTest.cpp index 10879131f..2902a552c 100644 --- a/src/autowiring/test/DispatchQueueTest.cpp +++ b/src/autowiring/test/DispatchQueueTest.cpp @@ -1,11 +1,15 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "DispatchQueueTest.hpp" #include #include using namespace std; +class DispatchQueueTest: + public testing::Test, + public DispatchQueue +{}; + class EventMaker: public CoreThread { diff --git a/src/autowiring/test/DispatchQueueTest.hpp b/src/autowiring/test/DispatchQueueTest.hpp deleted file mode 100644 index 908ac5820..000000000 --- a/src/autowiring/test/DispatchQueueTest.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class DispatchQueue; - -class DispatchQueueTest: - public testing::Test, - public DispatchQueue -{}; diff --git a/src/autowiring/test/EventReceiverTest.cpp b/src/autowiring/test/EventReceiverTest.cpp index 21b38eaab..246ac7f0f 100644 --- a/src/autowiring/test/EventReceiverTest.cpp +++ b/src/autowiring/test/EventReceiverTest.cpp @@ -1,6 +1,5 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "EventReceiverTest.hpp" #include "TestFixtures/FiresManyEventsWhenRun.hpp" #include "TestFixtures/SimpleReceiver.hpp" #include @@ -10,12 +9,15 @@ using namespace std; -EventReceiverTest::EventReceiverTest(void) { - AutoCurrentContext ctxt; - - // Start up the context: - ctxt->Initiate(); -} +class EventReceiverTest: + public testing::Test +{ +public: + EventReceiverTest(void) { + // Start up the context: + AutoCurrentContext()->Initiate(); + } +}; TEST_F(EventReceiverTest, SimpleMethodCall) { AutoRequired receiver; diff --git a/src/autowiring/test/EventReceiverTest.hpp b/src/autowiring/test/EventReceiverTest.hpp deleted file mode 100644 index 68ea1e3fe..000000000 --- a/src/autowiring/test/EventReceiverTest.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class EventReceiverTest: - public testing::Test -{ -public: - EventReceiverTest(void); -}; diff --git a/src/autowiring/test/ExceptionFilterTest.cpp b/src/autowiring/test/ExceptionFilterTest.cpp index 76d2e543c..83debdad0 100644 --- a/src/autowiring/test/ExceptionFilterTest.cpp +++ b/src/autowiring/test/ExceptionFilterTest.cpp @@ -1,6 +1,5 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ExceptionFilterTest.hpp" #include "TestFixtures/ThrowsWhenFired.hpp" #include "TestFixtures/ThrowsWhenRun.hpp" #include @@ -9,6 +8,10 @@ #include #include +class ExceptionFilterTest: + public testing::Test +{}; + using namespace std; string FormatMessage(int value) { diff --git a/src/autowiring/test/ExceptionFilterTest.hpp b/src/autowiring/test/ExceptionFilterTest.hpp deleted file mode 100644 index 514746f09..000000000 --- a/src/autowiring/test/ExceptionFilterTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ExceptionFilterTest: - public testing::Test -{}; diff --git a/src/autowiring/test/FactoryTest.cpp b/src/autowiring/test/FactoryTest.cpp index 886d0df17..51e3c176c 100644 --- a/src/autowiring/test/FactoryTest.cpp +++ b/src/autowiring/test/FactoryTest.cpp @@ -1,11 +1,14 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "FactoryTest.hpp" #include "TestFixtures/SimpleInterface.hpp" #include using namespace std; +class FactoryTest: + public testing::Test +{}; + /// /// Compile-time check to ensure that unconstructable types are identified correctly /// diff --git a/src/autowiring/test/FactoryTest.hpp b/src/autowiring/test/FactoryTest.hpp deleted file mode 100644 index 7ab0f7a09..000000000 --- a/src/autowiring/test/FactoryTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class FactoryTest: - public testing::Test -{}; diff --git a/src/autowiring/test/GuardObjectTest.cpp b/src/autowiring/test/GuardObjectTest.cpp index da1a30f45..046d8ac79 100644 --- a/src/autowiring/test/GuardObjectTest.cpp +++ b/src/autowiring/test/GuardObjectTest.cpp @@ -1,9 +1,12 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "GuardObjectTest.hpp" #include #include +class GuardObjectTest: + public testing::Test +{}; + TEST_F(GuardObjectTest, SharedTests) { shared_object so1; //Default Constructor ASSERT_FALSE(so1.initialized()); //default initialization test diff --git a/src/autowiring/test/GuardObjectTest.hpp b/src/autowiring/test/GuardObjectTest.hpp deleted file mode 100644 index cf0e0b7d9..000000000 --- a/src/autowiring/test/GuardObjectTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class GuardObjectTest: - public testing::Test -{}; diff --git a/src/autowiring/test/InterlockedRoutinesTest.cpp b/src/autowiring/test/InterlockedRoutinesTest.cpp index b4c9773c2..6fedb3b5f 100644 --- a/src/autowiring/test/InterlockedRoutinesTest.cpp +++ b/src/autowiring/test/InterlockedRoutinesTest.cpp @@ -1,11 +1,14 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "InterlockedRoutinesTest.hpp" #include #include THREAD_HEADER #include MUTEX_HEADER #include CHRONO_HEADER +class InterlockedRoutinesTest: + public testing::Test +{}; + template void CheckFn() { int spot; diff --git a/src/autowiring/test/InterlockedRoutinesTest.hpp b/src/autowiring/test/InterlockedRoutinesTest.hpp deleted file mode 100644 index c85ded92e..000000000 --- a/src/autowiring/test/InterlockedRoutinesTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class InterlockedRoutinesTest: - public testing::Test -{}; diff --git a/src/autowiring/test/MarshalingTest.cpp b/src/autowiring/test/MarshalingTest.cpp index 05e3ce230..e8fe2eab6 100644 --- a/src/autowiring/test/MarshalingTest.cpp +++ b/src/autowiring/test/MarshalingTest.cpp @@ -1,6 +1,5 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "MarshalingTest.hpp" #include #include #include @@ -9,6 +8,9 @@ #include #include +class MarshalingTest: + public testing::Test +{}; /* EXTRA SPECS to code to that have not yet been implemented as unit tests. diff --git a/src/autowiring/test/MarshalingTest.hpp b/src/autowiring/test/MarshalingTest.hpp deleted file mode 100644 index 1c2dd934c..000000000 --- a/src/autowiring/test/MarshalingTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class MarshalingTest: - public testing::Test -{}; diff --git a/src/autowiring/test/MultiInheritTest.cpp b/src/autowiring/test/MultiInheritTest.cpp index e4663999a..32f422d49 100644 --- a/src/autowiring/test/MultiInheritTest.cpp +++ b/src/autowiring/test/MultiInheritTest.cpp @@ -1,10 +1,14 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "MultiInheritTest.hpp" #include "TestFixtures/MultiInherit.hpp" #include #include +class MultiInheritTest: + public testing::Test +{ +}; + class Shared { public: Shared(void) { diff --git a/src/autowiring/test/MultiInheritTest.hpp b/src/autowiring/test/MultiInheritTest.hpp deleted file mode 100644 index e65b5cf77..000000000 --- a/src/autowiring/test/MultiInheritTest.hpp +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class MultiInheritTest: - public testing::Test -{ -public: - MultiInheritTest(void) {} - ~MultiInheritTest(void) {} -}; diff --git a/src/autowiring/test/ObjectPoolTest.cpp b/src/autowiring/test/ObjectPoolTest.cpp index 2f71ded47..9e57c32d7 100644 --- a/src/autowiring/test/ObjectPoolTest.cpp +++ b/src/autowiring/test/ObjectPoolTest.cpp @@ -1,9 +1,12 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ObjectPoolTest.hpp" #include "TestFixtures/SimpleThreaded.hpp" #include +class ObjectPoolTest: + public testing::Test +{}; + class PooledObject { }; diff --git a/src/autowiring/test/ObjectPoolTest.hpp b/src/autowiring/test/ObjectPoolTest.hpp deleted file mode 100644 index f1e3dbeab..000000000 --- a/src/autowiring/test/ObjectPoolTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ObjectPoolTest: - public testing::Test -{}; diff --git a/src/autowiring/test/PeerContextTest.cpp b/src/autowiring/test/PeerContextTest.cpp index 91a344b0a..30438e594 100644 --- a/src/autowiring/test/PeerContextTest.cpp +++ b/src/autowiring/test/PeerContextTest.cpp @@ -1,10 +1,13 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "PeerContextTest.hpp" #include "TestFixtures/SimpleObject.hpp" #include "TestFixtures/SimpleReceiver.hpp" #include +class PeerContextTest: + public testing::Test +{}; + struct PeerContextName1 {}; struct PeerContextName2 {}; diff --git a/src/autowiring/test/PeerContextTest.hpp b/src/autowiring/test/PeerContextTest.hpp deleted file mode 100644 index db4bcd0d7..000000000 --- a/src/autowiring/test/PeerContextTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class PeerContextTest: - public testing::Test -{}; diff --git a/src/autowiring/test/PostConstructTest.cpp b/src/autowiring/test/PostConstructTest.cpp index 8d59ef70b..e2df5490d 100644 --- a/src/autowiring/test/PostConstructTest.cpp +++ b/src/autowiring/test/PostConstructTest.cpp @@ -1,11 +1,14 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "PostConstructTest.hpp" #include "TestFixtures/SimpleObject.hpp" #include #include #include THREAD_HEADER +class PostConstructTest: + public testing::Test +{}; + using namespace std; class ContextExposer: diff --git a/src/autowiring/test/ScopeTest.cpp b/src/autowiring/test/ScopeTest.cpp index cabda8a89..1b972752d 100644 --- a/src/autowiring/test/ScopeTest.cpp +++ b/src/autowiring/test/ScopeTest.cpp @@ -1,10 +1,13 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "ScopeTest.hpp" #include "TestFixtures/SimpleObject.hpp" #include #include +class ScopeTest: + public testing::Test +{}; + TEST_F(ScopeTest, VerifyGlobalExists) { // Verify that we at least get a global scope AutoGlobalContext global; diff --git a/src/autowiring/test/ScopeTest.hpp b/src/autowiring/test/ScopeTest.hpp deleted file mode 100644 index dc1fa09c9..000000000 --- a/src/autowiring/test/ScopeTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class ScopeTest: - public testing::Test -{}; diff --git a/src/autowiring/test/SelfSelectingFixtureTest.cpp b/src/autowiring/test/SelfSelectingFixtureTest.cpp index a7e0f44da..a6a35b1fc 100644 --- a/src/autowiring/test/SelfSelectingFixtureTest.cpp +++ b/src/autowiring/test/SelfSelectingFixtureTest.cpp @@ -1,10 +1,13 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "SelfSelectingFixtureTest.hpp" #include "SelfSelectingFixture.hpp" #include "OtherSelectingFixture.hpp" #include +class SelfSelectingFixtureTest: + public testing::Test +{}; + struct SelfSelect {}; // Simple class we will bolt locally in this application diff --git a/src/autowiring/test/SelfSelectingFixtureTest.hpp b/src/autowiring/test/SelfSelectingFixtureTest.hpp deleted file mode 100644 index d6f152d28..000000000 --- a/src/autowiring/test/SelfSelectingFixtureTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class SelfSelectingFixtureTest: - public testing::Test -{}; diff --git a/src/autowiring/test/SnoopTest.cpp b/src/autowiring/test/SnoopTest.cpp index bf38daee5..1a735e03c 100644 --- a/src/autowiring/test/SnoopTest.cpp +++ b/src/autowiring/test/SnoopTest.cpp @@ -1,8 +1,11 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "SnoopTest.hpp" #include "TestFixtures/Decoration.hpp" +class SnoopTest: + public testing::Test +{}; + class UpBroadcastListener: public virtual EventReceiver { diff --git a/src/autowiring/test/SnoopTest.hpp b/src/autowiring/test/SnoopTest.hpp deleted file mode 100644 index f8288cb13..000000000 --- a/src/autowiring/test/SnoopTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class SnoopTest: - public testing::Test -{}; diff --git a/src/autowiring/test/TeardownNotifierTest.cpp b/src/autowiring/test/TeardownNotifierTest.cpp index 34451d235..a009304e6 100644 --- a/src/autowiring/test/TeardownNotifierTest.cpp +++ b/src/autowiring/test/TeardownNotifierTest.cpp @@ -1,8 +1,11 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "TeardownNotifierTest.hpp" #include +class TeardownNotifierTest: + public testing::Test +{}; + class SimpleMember: public ContextMember { diff --git a/src/autowiring/test/TeardownNotifierTest.hpp b/src/autowiring/test/TeardownNotifierTest.hpp deleted file mode 100644 index 5d72901a7..000000000 --- a/src/autowiring/test/TeardownNotifierTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class TeardownNotifierTest: - public testing::Test -{}; diff --git a/src/autowiring/test/TypeRegistryTest.cpp b/src/autowiring/test/TypeRegistryTest.cpp index 90539edfc..7c43cc177 100644 --- a/src/autowiring/test/TypeRegistryTest.cpp +++ b/src/autowiring/test/TypeRegistryTest.cpp @@ -1,11 +1,14 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "TypeRegistryTest.hpp" #include #include #include #include +class TypeRegistryTest: + public testing::Test +{}; + template class Registered: public EventReceiver diff --git a/src/autowiring/test/TypeRegistryTest.hpp b/src/autowiring/test/TypeRegistryTest.hpp deleted file mode 100644 index 066e3fdd5..000000000 --- a/src/autowiring/test/TypeRegistryTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class TypeRegistryTest: - public testing::Test -{}; diff --git a/src/autowiring/test/UuidTest.cpp b/src/autowiring/test/UuidTest.cpp index e26168f4b..4a168b227 100644 --- a/src/autowiring/test/UuidTest.cpp +++ b/src/autowiring/test/UuidTest.cpp @@ -1,8 +1,11 @@ // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. #include "stdafx.h" -#include "UuidTest.hpp" #include +class UuidTest: + public testing::Test +{}; + DECLARE_UUID(MyX, "01234567-89AB-CDEF-FEDC-BA9876543210"){}; TEST_F(UuidTest, VerifySimpleUuid) { diff --git a/src/autowiring/test/UuidTest.hpp b/src/autowiring/test/UuidTest.hpp deleted file mode 100644 index 37f285805..000000000 --- a/src/autowiring/test/UuidTest.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved. -#pragma once - -class UuidTest: - public testing::Test -{};