Use testing::EndsWith rather than custom lambda

Author: DanRStevens

test/Filesystem.test.cpp

@@ -55,25 +55,17 @@ namespace {
 }
 
 
-constexpr auto EndsWithDirSeparator = []() {
-	return testing::Truly([](const auto& path) { return path.string().ends_with(NAS2D::Filesystem::dirSeparator()); });
-};
-
-
-constexpr auto HasPartialPath = [](const auto& subString) {
-	return testing::Truly([&](const auto& path) { return path.string().find(subString) != std::string::npos; });
-};
-
-
 TEST_F(Filesystem, basePath) {
 	// Result is a directory, and should end with a directory separator
-	EXPECT_THAT(fs.basePath(), EndsWithDirSeparator());
+	const auto dirSeparator = NAS2D::Filesystem::dirSeparator();
+	EXPECT_THAT(fs.basePath(), testing::EndsWith(dirSeparator));
 }
 
 TEST_F(Filesystem, prefPath) {
 	// Result is a directory, and should end with a directory separator
-	EXPECT_THAT(fs.prefPath(), EndsWithDirSeparator());
-	EXPECT_THAT(fs.prefPath(), HasPartialPath(AppName));
+	const auto dirSeparator = NAS2D::Filesystem::dirSeparator();
+	EXPECT_THAT(fs.prefPath(), testing::EndsWith(dirSeparator));
+	EXPECT_THAT(fs.prefPath(), testing::EndsWith(AppName + dirSeparator));
 }
 
 TEST_F(Filesystem, findInParentsExist) {
@@ -94,8 +86,8 @@ TEST_F(Filesystem, findInParentsNotExist) {
 TEST_F(Filesystem, searchPath) {
 	auto pathList = fs.searchPath();
 	EXPECT_EQ(3u, pathList.size());
-	EXPECT_THAT(pathList, Contains(HasPartialPath(AppName)));
-	EXPECT_THAT(pathList, Contains(HasPartialPath("data/")));
+	EXPECT_THAT(pathList, Contains(testing::EndsWith(AppName + NAS2D::Filesystem::dirSeparator())));
+	EXPECT_THAT(pathList, Contains(testing::EndsWith("data/")));
 }
 
 TEST_F(Filesystem, directoryList) {
@@ -164,7 +156,7 @@ TEST_F(Filesystem, mountUnmount) {
 
 	EXPECT_FALSE(fs.exists(extraFile));
 	EXPECT_NO_THROW(fs.mount(extraMount));
-	EXPECT_THAT(fs.searchPath(), Contains(HasPartialPath(extraMount)));
+	EXPECT_THAT(fs.searchPath(), Contains(testing::EndsWith(extraMount)));
 	EXPECT_TRUE(fs.exists(extraFile));
 
 	EXPECT_NO_THROW(fs.unmount(extraMount));