Index: src/libchcore/Tests/TestsTStringPattern.cpp =================================================================== diff -u -N -r2755e12daeccb1935f569e7235e685e566b0b098 -rfcf6698a5e67445b1a68627fa94837b1ad97284e --- src/libchcore/Tests/TestsTStringPattern.cpp (.../TestsTStringPattern.cpp) (revision 2755e12daeccb1935f569e7235e685e566b0b098) +++ src/libchcore/Tests/TestsTStringPattern.cpp (.../TestsTStringPattern.cpp) (revision fcf6698a5e67445b1a68627fa94837b1ad97284e) @@ -8,15 +8,15 @@ TEST(TestsTStringPattern, DefaultConstruction) { TStringPattern patternEmpty; - EXPECT_STREQ(L"WC;", patternEmpty.ToSerializedString().c_str()); + EXPECT_STREQ(L"", patternEmpty.ToString().c_str()); EXPECT_STREQ(L"", patternEmpty.GetPattern().c_str()); EXPECT_EQ(TStringPattern::EPatternType::eType_Wildcard, patternEmpty.GetPatternType()); } TEST(TestsTStringPattern, PatternConstruction) { TStringPattern patternEmpty(L"*.*", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_STREQ(L"WC;*.*", patternEmpty.ToSerializedString().c_str()); + EXPECT_STREQ(L"*.*", patternEmpty.ToString().c_str()); EXPECT_STREQ(L"*.*", patternEmpty.GetPattern().c_str()); EXPECT_EQ(TStringPattern::EPatternType::eType_Wildcard, patternEmpty.GetPatternType()); } @@ -27,26 +27,26 @@ patternEmpty.SetPattern(L"*.bat", TStringPattern::EPatternType::eType_Wildcard); - EXPECT_STREQ(L"WC;*.bat", patternEmpty.ToSerializedString().c_str()); + EXPECT_STREQ(L"*.bat", patternEmpty.ToString().c_str()); EXPECT_STREQ(L"*.bat", patternEmpty.GetPattern().c_str()); EXPECT_EQ(TStringPattern::EPatternType::eType_Wildcard, patternEmpty.GetPatternType()); } TEST(TestsTStringPattern, CreateFromSerializedString) { - TStringPattern patternEmpty = TStringPattern::CreateFromSerializedString(L"WC;*.*"); + TStringPattern patternEmpty = TStringPattern::CreateFromString(L"WC;*.*"); - EXPECT_STREQ(L"WC;*.*", patternEmpty.ToSerializedString().c_str()); + EXPECT_STREQ(L"*.*", patternEmpty.ToString().c_str()); EXPECT_STREQ(L"*.*", patternEmpty.GetPattern().c_str()); EXPECT_EQ(TStringPattern::EPatternType::eType_Wildcard, patternEmpty.GetPatternType()); } -TEST(TestsTStringPattern, FromSerializedString) +TEST(TestsTStringPattern, FromStringString) { TStringPattern patternEmpty; - patternEmpty.FromSerializedString(L"WC;*.*"); + patternEmpty.FromString(L"WC;*.*"); - EXPECT_STREQ(L"WC;*.*", patternEmpty.ToSerializedString().c_str()); + EXPECT_STREQ(L"*.*", patternEmpty.ToString().c_str()); EXPECT_STREQ(L"*.*", patternEmpty.GetPattern().c_str()); EXPECT_EQ(TStringPattern::EPatternType::eType_Wildcard, patternEmpty.GetPatternType()); }