Index: src/libchcore/Tests/TestsTStringPattern.cpp =================================================================== diff -u -r22c7d5559ca17c9b1859d2283b667516b23ac597 -r3401d5079f33b29a7783b65bfad5f34d89a33ba5 --- src/libchcore/Tests/TestsTStringPattern.cpp (.../TestsTStringPattern.cpp) (revision 22c7d5559ca17c9b1859d2283b667516b23ac597) +++ src/libchcore/Tests/TestsTStringPattern.cpp (.../TestsTStringPattern.cpp) (revision 3401d5079f33b29a7783b65bfad5f34d89a33ba5) @@ -55,28 +55,28 @@ { TStringPattern patternEmpty(L"*.bat", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_TRUE(patternEmpty.Matches(L"autorun.bat")); + EXPECT_TRUE(patternEmpty.Matches(PathFromString(L"autorun.bat"))); } TEST(TestsTStringPattern, Matches_Negative_StarDotBat) { TStringPattern patternEmpty(L"*.bat", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_FALSE(patternEmpty.Matches(L"autorun.batx")); + EXPECT_FALSE(patternEmpty.Matches(PathFromString(L"autorun.batx"))); } TEST(TestsTStringPattern, Matches_Positive_StarDotStar) { TStringPattern patternEmpty(L"*.*", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_TRUE(patternEmpty.Matches(L"autorun.bat")); + EXPECT_TRUE(patternEmpty.Matches(PathFromString(L"autorun.bat"))); } TEST(TestsTStringPattern, Matches_Negative_StarDotStar) { TStringPattern patternEmpty(L"*.*", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_FALSE(patternEmpty.Matches(L"autorun")); + EXPECT_FALSE(patternEmpty.Matches(PathFromString(L"autorun"))); } /////////////////////////////////////////////////////////// @@ -86,14 +86,14 @@ { TStringPattern patternEmpty(L"ad*bo*", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_TRUE(patternEmpty.Matches(L"addon-boo.bat")); + EXPECT_TRUE(patternEmpty.Matches(PathFromString(L"addon-boo.bat"))); } TEST(TestsTStringPattern, Matches_Negative_MultiStar) { TStringPattern patternEmpty(L"ad*bo*", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_FALSE(patternEmpty.Matches(L"addon-doo.bat")); + EXPECT_FALSE(patternEmpty.Matches(PathFromString(L"addon-doo.bat"))); } //////////////////////////////////////////////////////////// @@ -103,12 +103,12 @@ { TStringPattern patternEmpty(L"a??b?r", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_TRUE(patternEmpty.Matches(L"arbbar")); + EXPECT_TRUE(patternEmpty.Matches(PathFromString(L"arbbar"))); } TEST(TestsTStringPattern, Matches_Negative_QuestionMultiPos) { TStringPattern patternEmpty(L"a??b?r", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_FALSE(patternEmpty.Matches(L"arbxar")); + EXPECT_FALSE(patternEmpty.Matches(PathFromString(L"arbxar"))); }