fix tests

Author: stevschmid

.gitignore

@@ -10,4 +10,5 @@ Makefile.*
 *.dmg
 *.exe
 *.autosave
+*.o
 /scenes/*

test.pro

@@ -1,4 +1,4 @@
-include(tracking.pro)
+include(track-o-bot.pro)
 
 CONFIG += console
 CONFIG -= app_bundle
@@ -18,27 +18,25 @@ INCLUDEPATH += src \
                $$GMOCKPATH \
                $$GMOCKPATH/include
 
-DEFINES += QT_NO_KEYWORDS \
-           _WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
-
-# We need to QT_NO_KEYWORDS because of forever def in gmock
-# Manually define slots etc.
-DEFINES += "slots=Q_SLOTS"
-DEFINES += "signals=Q_SIGNALS"
-DEFINES += "emit=Q_EMIT"
-
-SOURCES -= src/Main.cpp
+# Ignore forever definition of Qt (otherwise clash with gtest)
+DEFINES += "forever=forever"
 
 GMOCK_HEADERS = $$GMOCKPATH/include/gmock/*.h \
                 $$GMOCKPATH/include/gmock/internal/*.h
 
 GTEST_HEADERS = $$GTESTPATH/include/gtest/*.h \
                 $$GTESTPATH/include/gtest/internal/*.h
 
-HEADERS += $$GTEST_HEADERS \
-           $$GMOCK_HEADERS
-
-SOURCES += $$GMOCKPATH/src/gmock-all.cc \
-           $$GTESTPATH/src/gtest-all.cc \
-           $$GMOCKPATH/src/gmock_main.cc \
-           test/*_test.cpp
+HEADERS = $$GTEST_HEADERS \
+          $$GMOCK_HEADERS \
+          src/Local.h \
+          src/OSXWindowCapture.h \
+          src/Logger.h
+
+SOURCES = $$GMOCKPATH/src/gmock-all.cc \
+          $$GTESTPATH/src/gtest-all.cc \
+          $$GMOCKPATH/src/gmock_main.cc \
+          test/*Test.cpp \
+          src/OSXWindowCapture.cpp \
+          src/Hearthstone.cpp \
+          src/Logger.cpp

test/hearthstone_test.cpp test/HearthstoneTest.cpp

@@ -1,15 +1,15 @@
-#include "hearthstone.h"
+#include "Hearthstone.h"
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
 #include <QApplication>
 
-#include "mock_window_capture.h"
+#include "MockWindowCapture.h"
 
 using ::testing::Return;
 
 class HearthstoneTest : public ::testing::Test {
-private:
+public:
   QApplication *mApp;
   MockWindowCapture *mWindowCapture;
 

test/MockWindowCapture.h

@@ -0,0 +1,10 @@
+#include "WindowCapture.h"
+
+class MockWindowCapture : public WindowCapture
+{
+public:
+  MOCK_METHOD0( WindowFound, bool() );
+  MOCK_METHOD0( Width, int() );
+  MOCK_METHOD0( Height, int() );
+  MOCK_METHOD4( Capture, QPixmap( int x, int y, int w, int h ) );
+};