From 154eed861dd8e20dbdc741670368b5838e9728b1 Mon Sep 17 00:00:00 2001
From: Vraiment <jemc44@gmail.com>
Date: Wed, 9 Aug 2017 00:35:34 -0700
Subject: [PATCH] Fixed event handling/dispatching tests

---
 tests/test_eventdispatching.cc | 36 +++++++---------------------------
 tests/test_eventhandler.cc     |  2 ++
 tests/test_eventpolling.cc     |  4 ++--
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/tests/test_eventdispatching.cc b/tests/test_eventdispatching.cc
index 81a2702..feafe3d 100644
--- a/tests/test_eventdispatching.cc
+++ b/tests/test_eventdispatching.cc
@@ -49,7 +49,7 @@ BEGIN_TEST(int, char*[])
 			}
 		};
 
-		auto eventHandlerFunctor = EventHandlerFunctor{};
+		auto eventHandlerFunctor = EventHandlerFunctor();
 		DispatchEvent(event, eventHandlerFunctor);
 		EXPECT_EQUAL(event.user.code, eventHandlerFunctor.result);
 	}
@@ -64,7 +64,7 @@ BEGIN_TEST(int, char*[])
 			}
 		};
 
-		auto eventHandlerObject = EventHandlerObject{};
+		auto eventHandlerObject = EventHandlerObject();
 		DispatchEvent(event, eventHandlerObject);
 		EXPECT_EQUAL(event.user.code, eventHandlerObject.result);
 	}
@@ -78,8 +78,8 @@ BEGIN_TEST(int, char*[])
 				executed = true;
 			}
 		};
-		auto eventHandlerFunctor1 = EventHandlerFunctor{};
-		auto eventHandlerFunctor2 = EventHandlerFunctor{};
+		auto eventHandlerFunctor1 = EventHandlerFunctor();
+		auto eventHandlerFunctor2 = EventHandlerFunctor();
 		
 		struct EventHandlerObject {
 			bool executed = false;
@@ -88,7 +88,7 @@ BEGIN_TEST(int, char*[])
 				executed = true;
 			}
 		};
-		auto eventHandlerObject = EventHandlerObject{};
+		auto eventHandlerObject = EventHandlerObject();
 	
 		auto lambdaExecuted = false;
 		auto lambda = [&lambdaExecuted](SDL_QuitEvent) { lambdaExecuted = true; };
@@ -115,7 +115,7 @@ BEGIN_TEST(int, char*[])
 			}
 		};
 		
-		auto eventHandler = EventHandler{};
+		auto eventHandler = EventHandler();
 		DispatchEvent(event, eventHandler);
 		
 		EXPECT_TRUE(eventHandler.quitEventExecuted);
@@ -147,32 +147,10 @@ BEGIN_TEST(int, char*[])
 			}
 		};
 		
-		auto eventHandler = EventHandler{};
+		auto eventHandler = EventHandler();
 		DispatchEvent(event, eventHandler);
 		
 		EXPECT_TRUE(eventHandler.quitEventFunctorExecuted);
 		EXPECT_TRUE(eventHandler.quitEventObjectExecuted);
 	}
-
-	// Test don't call event handler with annotated types
-	{
-		struct EventHandler {
-			bool quitEventFunctorExecuted = false;
-			bool quitEventObjectExecuted = false;
-			
-			void operator()(SDL_QuitEvent) {
-				quitEventFunctorExecuted = true;
-			}
-			
-			void HandleEvent(SDL_QuitEvent &) {
-				quitEventObjectExecuted = true;
-			}
-		};
-		
-		auto eventHandler = EventHandler{};
-		DispatchEvent(event, eventHandler);
-		
-		EXPECT_TRUE(eventHandler.quitEventFunctorExecuted);
-		EXPECT_TRUE(!eventHandler.quitEventObjectExecuted);
-	}
 END_TEST()
diff --git a/tests/test_eventhandler.cc b/tests/test_eventhandler.cc
index aafb345..d9be3a1 100644
--- a/tests/test_eventhandler.cc
+++ b/tests/test_eventhandler.cc
@@ -66,4 +66,6 @@ int main(int, char*[]) {
 		!IsEventHandler<InvalidEventHandler, SDL_Event>::value,
 		"IsEventHandler<> shouldn't accept a class without a valid signature"
 	);
+	
+	return 0;
 }
diff --git a/tests/test_eventpolling.cc b/tests/test_eventpolling.cc
index fbe24d9..72a2aaa 100644
--- a/tests/test_eventpolling.cc
+++ b/tests/test_eventpolling.cc
@@ -13,7 +13,7 @@ BEGIN_TEST(int, char*[])
 
 	// Empty event poll
 	SDL_Event event;
-	while (SDL_PollEvent(&event));
+	while (SDL_PollEvent(&event)) { }
 
 	// Poll a single event
 	{
@@ -64,7 +64,7 @@ BEGIN_TEST(int, char*[])
 		event.type = SDL_QUIT;
 		SDL_PushEvent(&event);
 		
-		auto eventHandler = EventHandler{};
+		auto eventHandler = EventHandler();
 		
 		EXPECT_EQUAL(PollAllEvents(eventHandler), 3);
 		EXPECT_TRUE(!PollEvent()); // Verify no additional events