Index: src/libchcore/Tests/TestsTStringPatternArray.cpp =================================================================== diff -u -N -r22c7d5559ca17c9b1859d2283b667516b23ac597 -r3401d5079f33b29a7783b65bfad5f34d89a33ba5 --- src/libchcore/Tests/TestsTStringPatternArray.cpp (.../TestsTStringPatternArray.cpp) (revision 22c7d5559ca17c9b1859d2283b667516b23ac597) +++ src/libchcore/Tests/TestsTStringPatternArray.cpp (.../TestsTStringPatternArray.cpp) (revision 3401d5079f33b29a7783b65bfad5f34d89a33ba5) @@ -86,7 +86,7 @@ arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard)); arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard)); - EXPECT_TRUE(arrPatterns.MatchesAny(L"autostart.bat")); + EXPECT_TRUE(arrPatterns.MatchesAny(PathFromString(L"autostart.bat"))); } TEST(TestsTStringPatternArray, MatchesAny_Negative) @@ -96,7 +96,7 @@ arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard)); arrPatterns.Add(TStringPattern(L"*.exe", TStringPattern::EPatternType::eType_Wildcard)); - EXPECT_FALSE(arrPatterns.MatchesAny(L"autostart.com")); + EXPECT_FALSE(arrPatterns.MatchesAny(PathFromString(L"autostart.com"))); } ///////////////////////////////////////////////// @@ -108,7 +108,7 @@ arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard)); arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_Wildcard)); - EXPECT_TRUE(arrPatterns.MatchesAll(L"autostart.bat")); + EXPECT_TRUE(arrPatterns.MatchesAll(PathFromString(L"autostart.bat"))); } TEST(TestsTStringPatternArray, MatchesAll_Negative) @@ -118,7 +118,7 @@ arrPatterns.Add(TStringPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard)); arrPatterns.Add(TStringPattern(L"autostart.*", TStringPattern::EPatternType::eType_Wildcard)); - EXPECT_FALSE(arrPatterns.MatchesAll(L"autostart.exe")); + EXPECT_FALSE(arrPatterns.MatchesAll(PathFromString(L"autostart.exe"))); } /////////////////////////////////////////////////