build: update dependencies

* updated dependencies for windows
* implemented getFileInfo of TestFileManager as virtual.

CMakeLists.txt

@@ -47,10 +47,15 @@ endif ()
 
 # Clang ------------------------------------------------------------------------
 
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake")
+
+if (UNIX)
+	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake")
+	else()
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake")
+	endif()
 else()
-	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake")
+	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
 endif()
 
 find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake")
@@ -59,12 +64,12 @@ add_definitions(${CLANG_DEFINITIONS})
 
 # Boost ------------------------------------------------------------------------
 
-set(BOOST_ROOT $ENV{BOOST_155_DIR})
+set(BOOST_ROOT $ENV{BOOST_159_DIR})
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_STATIC_RUNTIME OFF)
 Set(Boost_NO_SYSTEM_PATHS ON)
-set(BOOST_LIBRARYDIR $ENV{BOOST_155_DIR})
+set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR})
 
 find_package(Boost 1.55 COMPONENTS system filesystem date_time REQUIRED)
 

README.md

@@ -8,15 +8,15 @@
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
 * Clang & LLVM (installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
-* Boost 1.55
-* Eigen 3.2.3
+* Boost 1.59
+* Eigen 3.2.6
 
 ##### Environment Variables
 
 * QT_DIR - ...\Qt\Qt5.2.1\5.2.1\<IDE>\
 * CXX_TEST_DIR - .../cxxtest-4.3/
 * CLANG_DIR - .../clang-llvm/
-* BOOST_155_DIR - .../boost_1_55_0
+* BOOST_159_DIR - .../boost_1_59_0
 * EIGEN_DIR - .../eigen
 
 For Win32:

bin/test/data/log/test_log.txt

@@ -1,191 +1,4 @@
 ConfigManager.cpp WARNING: value path/to/nowhere is not present in config.
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef
-FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/code.cpp
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/code.cpp
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/header.h
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/header.h
-FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/header.h
-FileManager.cpp ERROR: No FileInfo found for file: input.cc
 Token.cpp ERROR: Location Id was not referenced by this Token.
 Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
 Edge.cpp ERROR: Nodes are not plain copies.

cmake/CLANGConfig.cmake

@@ -1,23 +1,29 @@
+if (UNIX)
+	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_release")
+	else()
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_debug")
+	endif()
+else()
+	set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build")
+endif()
+
+
 execute_process(
-	COMMAND $ENV{CLANG_DIR}/build_debug/bin/llvm-config --cxxflags
+	COMMAND ${CLANG_BUILD_PATH}/bin/llvm-config --cxxflags
 	OUTPUT_VARIABLE CLANG_DEFINITIONS
 )
 
 # Remove unwanted flags
-string(REPLACE "-fno-exceptions" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS})
-string(REPLACE "-fno-rtti" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS})
+string(REPLACE "-fno-exceptions" "" CLANG_DEFINITIONS "${CLANG_DEFINITIONS}")
+string(REPLACE "-fno-rtti" "" CLANG_DEFINITIONS "${CLANG_DEFINITIONS}")
 
 set(CLANG_INCLUDE_DIRS
 	"$ENV{CLANG_DIR}/llvm/tools/clang/include"
-	"$ENV{CLANG_DIR}/build_debug/tools/clang/include"
+	"${CLANG_BUILD_PATH}/tools/clang/include"
 )
 
-set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_debug/lib")
-if (UNIX)
-	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-		set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_release/lib")
-	endif()
-endif ()
+set(CLANG_LIBRARY_DIRS "${CLANG_BUILD_PATH}/lib")
 
 set(CLANG_LIBRARIES
 	#clangApplyReplacements

src/lib/utility/file/FileManager.cpp

@@ -104,7 +104,7 @@ bool FileManager::hasIncludeExtension(const FilePath& filePath) const
 	return filePath.hasExtension(m_includeExtensions);
 }
 
-const FileInfo& FileManager::getFileInfo(const FilePath& filePath) const
+const FileInfo FileManager::getFileInfo(const FilePath& filePath) const
 {
 	std::map<FilePath, FileInfo>::const_iterator it = m_files.find(filePath);
 

src/lib/utility/file/FileManager.h

@@ -32,7 +32,7 @@ public:
 	virtual bool hasSourceExtension(const FilePath& filePath) const;
 	virtual bool hasIncludeExtension(const FilePath& filePath) const;
 
-	const FileInfo& getFileInfo(const FilePath& filePath) const;
+	virtual const FileInfo getFileInfo(const FilePath& filePath) const;
 
 private:
 	std::vector<FileInfo> getFileInfosInProject() const;

src/test/SearchIndexTestSuite.h

@@ -149,16 +149,16 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("u");
 
 		TS_ASSERT_EQUALS(1, matches.size());
-		TS_ASSERT_EQUALS("util", matches[0].fullName);
+		TS_ASSERT_EQUALS("util", matches[0].getFullName());
 
 		TS_ASSERT_EQUALS(1, matches[0].indices.size());
 		TS_ASSERT_EQUALS(0, matches[0].indices[0]);
 
 		matches = index.runFuzzySearchAndGetMatches("");
 		TS_ASSERT_EQUALS(3, matches.size());
-		TS_ASSERT_EQUALS("math", matches[0].fullName);
-		TS_ASSERT_EQUALS("string", matches[1].fullName);
-		TS_ASSERT_EQUALS("util", matches[2].fullName);
+		TS_ASSERT_EQUALS("math", matches[0].getFullName());
+		TS_ASSERT_EQUALS("string", matches[1].getFullName());
+		TS_ASSERT_EQUALS("util", matches[2].getFullName());
 
 		TS_ASSERT_EQUALS(0, matches[0].weight);
 		TS_ASSERT_EQUALS(0, matches[1].weight);
@@ -174,14 +174,14 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("t");
 
 		TS_ASSERT_EQUALS(2, matches.size());
-		TS_ASSERT_EQUALS("util", matches[0].fullName);
-		TS_ASSERT_EQUALS("MATH", matches[1].fullName);
+		TS_ASSERT_EQUALS("util", matches[0].getFullName());
+		TS_ASSERT_EQUALS("MATH", matches[1].getFullName());
 
 		matches = index.runFuzzySearchAndGetMatches("T");
 
 		TS_ASSERT_EQUALS(2, matches.size());
-		TS_ASSERT_EQUALS("util", matches[0].fullName);
-		TS_ASSERT_EQUALS("MATH", matches[1].fullName);
+		TS_ASSERT_EQUALS("util", matches[0].getFullName());
+		TS_ASSERT_EQUALS("MATH", matches[1].getFullName());
 	}
 
 	void test_fuzzy_matching_wheighs_by_distance_and_alphabet()
@@ -194,9 +194,9 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("t");
 
 		TS_ASSERT_EQUALS(3, matches.size());
-		TS_ASSERT_EQUALS("string", matches[0].fullName);
-		TS_ASSERT_EQUALS("util", matches[1].fullName);
-		TS_ASSERT_EQUALS("math", matches[2].fullName);
+		TS_ASSERT_EQUALS("string", matches[0].getFullName());
+		TS_ASSERT_EQUALS("util", matches[1].getFullName());
+		TS_ASSERT_EQUALS("math", matches[2].getFullName());
 
 		TS_ASSERT_EQUALS(1, matches[0].indices.size());
 		TS_ASSERT_EQUALS(1, matches[0].indices[0]);
@@ -217,8 +217,8 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("t");
 
 		TS_ASSERT_EQUALS(2, matches.size());
-		TS_ASSERT_EQUALS("uTil", matches[0].fullName);
-		TS_ASSERT_EQUALS("string", matches[1].fullName);
+		TS_ASSERT_EQUALS("uTil", matches[0].getFullName());
+		TS_ASSERT_EQUALS("string", matches[1].getFullName());
 	}
 
 	void test_fuzzy_matching_wheighs_higher_on_consecutive_letters()
@@ -230,8 +230,8 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("abc");
 
 		TS_ASSERT_EQUALS(2, matches.size());
-		TS_ASSERT_EQUALS("ocbcabc", matches[0].fullName);
-		TS_ASSERT_EQUALS("oaabbcc", matches[1].fullName);
+		TS_ASSERT_EQUALS("ocbcabc", matches[0].getFullName());
+		TS_ASSERT_EQUALS("oaabbcc", matches[1].getFullName());
 	}
 
 	void test_fuzzy_matching_in_hierarchy()
@@ -244,18 +244,18 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("t");
 
 		TS_ASSERT_EQUALS(6, matches.size());
-		TS_ASSERT_EQUALS("util", matches[0].fullName);
-		TS_ASSERT_EQUALS("util::math", matches[1].fullName);
-		TS_ASSERT_EQUALS("util::math::ceil", matches[2].fullName);
-		TS_ASSERT_EQUALS("util::math::floor", matches[3].fullName);
-		TS_ASSERT_EQUALS("util::string", matches[4].fullName);
-		TS_ASSERT_EQUALS("util::string::concat", matches[5].fullName);
+		TS_ASSERT_EQUALS("util", matches[0].getFullName());
+		TS_ASSERT_EQUALS("util::math", matches[1].getFullName());
+		TS_ASSERT_EQUALS("util::math::ceil", matches[2].getFullName());
+		TS_ASSERT_EQUALS("util::math::floor", matches[3].getFullName());
+		TS_ASSERT_EQUALS("util::string", matches[4].getFullName());
+		TS_ASSERT_EQUALS("util::string::concat", matches[5].getFullName());
 
 		matches = index.runFuzzySearchAndGetMatches("uml");
 
 		TS_ASSERT_EQUALS(2, matches.size());
-		TS_ASSERT_EQUALS("util::math::ceil", matches[0].fullName);
-		TS_ASSERT_EQUALS("util::math::floor", matches[1].fullName);
+		TS_ASSERT_EQUALS("util::math::ceil", matches[0].getFullName());
+		TS_ASSERT_EQUALS("util::math::floor", matches[1].getFullName());
 	}
 
 	void test_fuzzy_matching_in_hierarchy_respects_collin()
@@ -268,14 +268,14 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("u:i");
 
 		TS_ASSERT_EQUALS(3, matches.size());
-		TS_ASSERT_EQUALS("util::string", matches[0].fullName);
-		TS_ASSERT_EQUALS("util::string::concat", matches[1].fullName);
-		TS_ASSERT_EQUALS("util::math::ceil", matches[2].fullName);
+		TS_ASSERT_EQUALS("util::string", matches[0].getFullName());
+		TS_ASSERT_EQUALS("util::string::concat", matches[1].getFullName());
+		TS_ASSERT_EQUALS("util::math::ceil", matches[2].getFullName());
 
 		matches = index.runFuzzySearchAndGetMatches("u:t:i");
 
 		TS_ASSERT_EQUALS(1, matches.size());
-		TS_ASSERT_EQUALS("util::math::ceil", matches[0].fullName);
+		TS_ASSERT_EQUALS("util::math::ceil", matches[0].getFullName());
 	}
 
 	void test_fuzzy_matching_in_hierarchy_weighs_front_letters_higher()
@@ -287,8 +287,8 @@ public:
 		std::vector<SearchMatch> matches = index.runFuzzySearchAndGetMatches("g");
 
 		TS_ASSERT_EQUALS(2, matches.size());
-		TS_ASSERT_EQUALS("abc::dfe::ghi", matches[0].fullName);
-		TS_ASSERT_EQUALS("abc::hgi", matches[1].fullName);
+		TS_ASSERT_EQUALS("abc::dfe::ghi", matches[0].getFullName());
+		TS_ASSERT_EQUALS("abc::hgi", matches[1].getFullName());
 	}
 
 private:

src/test/helper/TestFileManager.cpp

@@ -18,3 +18,8 @@ bool TestFileManager::hasIncludeExtension(const FilePath& filePath) const
 {
 	return true;
 }
+
+const FileInfo TestFileManager::getFileInfo(const FilePath& filePath) const
+{
+	return FileInfo(filePath);
+}

src/test/helper/TestFileManager.h

@@ -12,6 +12,8 @@ public:
 	virtual bool hasFilePath(const FilePath& filePath) const;
 	virtual bool hasSourceExtension(const FilePath& filePath) const;
 	virtual bool hasIncludeExtension(const FilePath& filePath) const;
+
+	virtual const FileInfo getFileInfo(const FilePath& filePath) const;
 };
 
 #endif // TEST_FILE_MANAGER_H