From d94fa7c14ffb5efb74e211bbaaee10bdf60010d2 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 29 Jan 2017 11:12:15 +0900
Subject: [PATCH] fix broken unit tests

---
 Testing/GoogleTest/Encoding/charsets_test.cpp        | 2 ++
 Testing/GoogleTest/Encoding/codepage_detect_test.cpp | 3 +++
 Testing/GoogleTest/Paths/paths_test.cpp              | 4 ++--
 Testing/GoogleTest/UnitTests/UnitTests.vcxproj       | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Testing/GoogleTest/Encoding/charsets_test.cpp b/Testing/GoogleTest/Encoding/charsets_test.cpp
index f1194e4bb6d..a991f68cc3e 100644
--- a/Testing/GoogleTest/Encoding/charsets_test.cpp
+++ b/Testing/GoogleTest/Encoding/charsets_test.cpp
@@ -13,11 +13,13 @@ namespace
 		CharsetsTest()
 		{
 			// You can do set-up work for each test	here.
+			charsets_init();
 		}
 
 		virtual ~CharsetsTest()
 		{
 			// You can do clean-up work	that doesn't throw exceptions here.
+			charsets_cleanup();
 		}
 
 		// If	the	constructor	and	destructor are not enough for setting up
diff --git a/Testing/GoogleTest/Encoding/codepage_detect_test.cpp b/Testing/GoogleTest/Encoding/codepage_detect_test.cpp
index 4aacf66b692..66d937f6979 100644
--- a/Testing/GoogleTest/Encoding/codepage_detect_test.cpp
+++ b/Testing/GoogleTest/Encoding/codepage_detect_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #include "codepage_detect.h"
+#include "charsets.h"
 
 namespace
 {
@@ -13,11 +14,13 @@ namespace
 		CodepageDetectTest()
 		{
 			// You can do set-up work for each test	here.
+			charsets_init();
 		}
 
 		virtual ~CodepageDetectTest()
 		{
 			// You can do clean-up work	that doesn't throw exceptions here.
+			charsets_cleanup();
 		}
 
 		// If	the	constructor	and	destructor are not enough for setting up
diff --git a/Testing/GoogleTest/Paths/paths_test.cpp b/Testing/GoogleTest/Paths/paths_test.cpp
index ebb64b323fa..2bd391aaea8 100644
--- a/Testing/GoogleTest/Paths/paths_test.cpp
+++ b/Testing/GoogleTest/Paths/paths_test.cpp
@@ -106,8 +106,8 @@ namespace
 	}
 	TEST_F(PathTest, Exists_relfiles)
 	{
-		const TCHAR path[] = _T(".\\..\\Paths\\paths::test.cpp");
-		const TCHAR path2[] = _T("..\\Paths\\paths::test.cpp");
+		const TCHAR path[] = _T(".\\..\\Paths\\paths_test.cpp");
+		const TCHAR path2[] = _T("..\\Paths\\paths_test.cpp");
 		EXPECT_EQ(paths::IS_EXISTING_FILE, paths::DoesPathExist(path));
 		EXPECT_EQ(paths::IS_EXISTING_FILE, paths::DoesPathExist(path2));
 	}
diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
index 1434e671320..2a83d01a82a 100644
--- a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
+++ b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\gtest\include;..\..\..\Externals\gtest\;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -153,7 +153,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\gtest\include;..\..\..\Externals\gtest\;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <PrecompiledHeader>