fix broken unit tests

WinMerge · Jan 29, 2017 · d94fa7c · d94fa7c
1 parent 14d87c8
commit d94fa7c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>