Fix compiling tests.

kimmov · kimmov · commit 95cbb6097476 · 2010-03-12T17:21:41.000+02:00
diff --git a/test/test.vcproj b/test/test.vcproj
@@ -262,6 +262,10 @@
 				RelativePath="..\lib\filelister.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\lib\filelister_win32.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\lib\mathlib.cpp"
 				>
@@ -452,6 +456,10 @@
 				RelativePath="..\lib\filelister.h"
 				>
 			</File>
+			<File
+				RelativePath="..\lib\filelister_win32.h"
+				>
+			</File>
 			<File
 				RelativePath="..\lib\mathlib.h"
 				>
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
@@ -18,7 +18,12 @@
 
 #include <string>
 #include "testsuite.h"
-#include "filelister.h"
+
+#if defined(_WIN32)
+#include "../lib/fileLister_win32.h"
+#else // POSIX-style system
+#include "../lib/filelister_unix.h"
+#endif
 
 class TestFileLister : public TestFixture
 {
@@ -35,21 +40,19 @@ class TestFileLister : public TestFixture
 
     void simplify_path()
     {
-        ASSERT_EQUALS("index.h", FileLister::simplifyPath("index.h"));
-        ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/index.h"));
-        ASSERT_EQUALS("/path/", FileLister::simplifyPath("/path/"));
-        ASSERT_EQUALS("/", FileLister::simplifyPath("/"));
-        ASSERT_EQUALS("./index.h", FileLister::simplifyPath("./index.h"));
-        ASSERT_EQUALS("../index.h", FileLister::simplifyPath("../index.h"));
-        ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/path/../index.h"));
-        ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/path/../other/../index.h"));
-        ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/path/../other///././../index.h"));
-        ASSERT_EQUALS("../path/index.h", FileLister::simplifyPath("../path/other/../index.h"));
-        ASSERT_EQUALS("a/index.h", FileLister::simplifyPath("a/../a/index.h"));
-        ASSERT_EQUALS("a/..", FileLister::simplifyPath("a/.."));
+        ASSERT_EQUALS("index.h", getFileLister()->simplifyPath("index.h"));
+        ASSERT_EQUALS("/index.h", getFileLister()->simplifyPath("/index.h"));
+        ASSERT_EQUALS("/path/", getFileLister()->simplifyPath("/path/"));
+        ASSERT_EQUALS("/", getFileLister()->simplifyPath("/"));
+        ASSERT_EQUALS("./index.h", getFileLister()->simplifyPath("./index.h"));
+        ASSERT_EQUALS("../index.h", getFileLister()->simplifyPath("../index.h"));
+        ASSERT_EQUALS("/index.h", getFileLister()->simplifyPath("/path/../index.h"));
+        ASSERT_EQUALS("/index.h", getFileLister()->simplifyPath("/path/../other/../index.h"));
+        ASSERT_EQUALS("/index.h", getFileLister()->simplifyPath("/path/../other///././../index.h"));
+        ASSERT_EQUALS("../path/index.h", getFileLister()->simplifyPath("../path/other/../index.h"));
+        ASSERT_EQUALS("a/index.h", getFileLister()->simplifyPath("a/../a/index.h"));
+        ASSERT_EQUALS("a/..", getFileLister()->simplifyPath("a/.."));
     }
-
-
 };
 
 REGISTER_TEST(TestFileLister)

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,10 @@`
`262`	`262`	`RelativePath="..\lib\filelister.cpp"`
`263`	`263`	`>`
`264`	`264`	`</File>`
	`265`	`+ <File`
	`266`	`+ RelativePath="..\lib\filelister_win32.cpp"`
	`267`	`+ >`
	`268`	`+ </File>`
`265`	`269`	`<File`
`266`	`270`	`RelativePath="..\lib\mathlib.cpp"`
`267`	`271`	`>`
`@@ -452,6 +456,10 @@`
`452`	`456`	`RelativePath="..\lib\filelister.h"`
`453`	`457`	`>`
`454`	`458`	`</File>`
	`459`	`+ <File`
	`460`	`+ RelativePath="..\lib\filelister_win32.h"`
	`461`	`+ >`
	`462`	`+ </File>`
`455`	`463`	`<File`
`456`	`464`	`RelativePath="..\lib\mathlib.h"`
`457`	`465`	`>`