3 files changed, 13 insertions, 28 deletions
diff --git a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp
index f3f9e32..9373d14 100644
--- a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp
+++ b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp
@@ -40,7 +40,6 @@ class MSWindowsKeyStateTests : public ::testing::Test
 protected:
 	virtual void SetUp()
 	{
-		m_hook.loadLibrary();
 		m_screensaver = new MSWindowsScreenSaver();
 	}
 
diff --git a/src/test/integtests/platform/XWindowsKeyStateTests.cpp b/src/test/integtests/platform/XWindowsKeyStateTests.cpp
index ea8ce44..9f6716d 100644
--- a/src/test/integtests/platform/XWindowsKeyStateTests.cpp
+++ b/src/test/integtests/platform/XWindowsKeyStateTests.cpp
@@ -76,8 +76,7 @@ TEST_F(XWindowsKeyStateTests, setActiveGroup_pollAndSet_groupIsZero)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     keyState.setActiveGroup(XWindowsKeyState::kGroupPollAndSet);
 
@@ -88,8 +87,7 @@ TEST_F(XWindowsKeyStateTests, setActiveGroup_poll_groupIsNotSet)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     keyState.setActiveGroup(XWindowsKeyState::kGroupPoll);
 
@@ -100,8 +98,7 @@ TEST_F(XWindowsKeyStateTests, setActiveGroup_customGroup_groupWasSet)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     keyState.setActiveGroup(1);
 
@@ -112,8 +109,7 @@ TEST_F(XWindowsKeyStateTests, mapModifiersFromX_zeroState_zeroMask)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     int mask = keyState.mapModifiersFromX(0);
 
@@ -124,8 +120,7 @@ TEST_F(XWindowsKeyStateTests, mapModifiersToX_zeroMask_resultIsTrue)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     unsigned int modifiers = 0;
     bool result = keyState.mapModifiersToX(0, modifiers);
@@ -137,8 +132,7 @@ TEST_F(XWindowsKeyStateTests, fakeCtrlAltDel_default_returnsFalse)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     bool result = keyState.fakeCtrlAltDel();
 
@@ -149,21 +143,18 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_defaultState_returnsZero)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     KeyModifierMask actual = keyState.pollActiveModifiers();
 
     ASSERT_EQ(0, actual);
 }
 
-#if 0 // TODO: fix, causes sigsegv
 TEST_F(XWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     // set mock modifier mapping
     std::fill(keyState.modifierFromX().begin(), keyState.modifierFromX().end(), 0);
@@ -189,14 +180,12 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCor
     EXPECT_TRUE((modUp & KeyModifierShift) == 0)
         << "shift key still in mask - make sure no keys are being held down";
 }
-#endif
 
 TEST_F(XWindowsKeyStateTests, pollActiveGroup_defaultState_returnsZero)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     SInt32 actual = keyState.pollActiveGroup();
 
@@ -207,8 +196,7 @@ TEST_F(XWindowsKeyStateTests, pollActiveGroup_positiveGroup_returnsGroup)
 {
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     keyState.group(3);
 
@@ -222,8 +210,7 @@ TEST_F(XWindowsKeyStateTests, pollActiveGroup_xkb_areEqual)
 #if HAVE_XKB_EXTENSION
     MockKeyMap keyMap;
     MockEventQueue eventQueue;
-    XWindowsKeyState keyState(
-        m_display, true, &eventQueue, keyMap);
+    XWindowsKeyState keyState(new XWindowsImpl(), m_display, true, &eventQueue, keyMap);
 
     // reset the group
     keyState.group(-1);
diff --git a/src/test/integtests/platform/XWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp
index b74599c..d8f75e1 100644
--- a/src/test/integtests/platform/XWindowsScreenTests.cpp
+++ b/src/test/integtests/platform/XWindowsScreenTests.cpp
@@ -29,12 +29,11 @@ TEST(CXWindowsScreenTests, fakeMouseMove_nonPrimary_getCursorPosValuesCorrect)
     EXPECT_CALL(eventQueue, adoptHandler(_, _, _)).Times(2);
     EXPECT_CALL(eventQueue, adoptBuffer(_)).Times(2);
     EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(2);
-    XWindowsScreen screen(
-        ":0.0", false, false, 0, &eventQueue);
+    XWindowsScreen screen(new XWindowsImpl(), ":0.0", false, false, 0, &eventQueue);
 
     screen.fakeMouseMove(10, 20);
 
-    int x, y;
+    SInt32 x, y;
     screen.getCursorPos(x, y);
     ASSERT_EQ(10, x);
     ASSERT_EQ(20, y);