From 0d88276abec8f5dd8a976e900e85097515a483a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Wed, 28 Dec 2016 13:39:21 +0100
Subject: [PATCH] Fix tests for new source layout

---
 test/tests/CMakeLists.txt        | 25 +++++++++++++++----------
 test/tests/LanguagePackTest.cpp  |  4 ++--
 test/tests/sawyercoding_test.cpp |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt
index 067385c5a9..6876864a6a 100644
--- a/test/tests/CMakeLists.txt
+++ b/test/tests/CMakeLists.txt
@@ -57,7 +57,12 @@ set(GTEST_LIBRARIES gtest gtest_main pthread)
 
 # sawyercoding test
 
-set(SAWYERCODING_TEST_SOURCES "sawyercoding_test.cpp" "../../src/diagnostic.c" "../../src/util/sawyercoding.c" "../../src/localisation/utf8.c")
+set(SAWYERCODING_TEST_SOURCES
+		"sawyercoding_test.cpp"
+		"../../src/openrct2/diagnostic.c"
+		"../../src/openrct2/util/sawyercoding.c"
+		"../../src/openrct2/localisation/utf8.c"
+		)
 add_executable(test_sawyercoding ${SAWYERCODING_TEST_SOURCES})
 target_link_libraries(test_sawyercoding ${GTEST_LIBRARIES})
 add_test(NAME sawyercoding COMMAND test_sawyercoding)
@@ -65,15 +70,15 @@ add_test(NAME sawyercoding COMMAND test_sawyercoding)
 # LanguagePack test
 set(LANGUAGEPACK_TEST_SOURCES
 		"LanguagePackTest.cpp"
-		"../../src/localisation/LanguagePack.cpp"
-		"../../src/core/Console.cpp"
-		"../../src/core/Diagnostics.cpp"
-		"../../src/core/Guard.cpp"
-		"../../src/core/String.cpp"
-		"../../src/diagnostic.c"
-		"../../src/localisation/format_codes.c"
-		"../../src/localisation/utf8.c"
-		"../../src/util/util.c"
+		"../../src/openrct2/localisation/LanguagePack.cpp"
+		"../../src/openrct2/core/Console.cpp"
+		"../../src/openrct2/core/Diagnostics.cpp"
+		"../../src/openrct2/core/Guard.cpp"
+		"../../src/openrct2/core/String.cpp"
+		"../../src/openrct2/diagnostic.c"
+		"../../src/openrct2/localisation/format_codes.c"
+		"../../src/openrct2/localisation/utf8.c"
+		"../../src/openrct2/util/util.c"
 		)
 add_executable(test_languagepack ${LANGUAGEPACK_TEST_SOURCES})
 target_link_libraries(test_languagepack ${GTEST_LIBRARIES} dl z SDL2 SDL2_ttf ssl crypto)
diff --git a/test/tests/LanguagePackTest.cpp b/test/tests/LanguagePackTest.cpp
index 80bce82760..33744b6a49 100644
--- a/test/tests/LanguagePackTest.cpp
+++ b/test/tests/LanguagePackTest.cpp
@@ -1,5 +1,5 @@
-#include "localisation/LanguagePack.h"
-#include "localisation/string_ids.h"
+#include "openrct2/localisation/LanguagePack.h"
+#include "openrct2/localisation/string_ids.h"
 #include <gtest/gtest.h>
 
 class LanguagePackTest : public testing::Test
diff --git a/test/tests/sawyercoding_test.cpp b/test/tests/sawyercoding_test.cpp
index 52a8e7779a..b9cebe335c 100644
--- a/test/tests/sawyercoding_test.cpp
+++ b/test/tests/sawyercoding_test.cpp
@@ -2,7 +2,7 @@
 #include <cmath>
 
 extern "C" {
-#include "util/sawyercoding.h"
+#include "openrct2/util/sawyercoding.h"
 }
 
 #include <gtest/gtest.h>