diff options
author | babenko <babenko@yandex-team.com> | 2025-02-22 17:28:25 +0300 |
---|---|---|
committer | babenko <babenko@yandex-team.com> | 2025-02-22 17:48:29 +0300 |
commit | 59afaa0cb7cd89146dd10f5446256afcce33bd0e (patch) | |
tree | 38d3c46bcba8da7c3b8ffc6b818695bc6b62d532 /library/cpp/yt/error/unittests/error_ut.cpp | |
parent | 1d9cc117e33b162a5247032e175ed7ea26971437 (diff) | |
download | ydb-59afaa0cb7cd89146dd10f5446256afcce33bd0e.tar.gz |
YT-22593: More trivial TString->std::string migrations
[nodiff:runtime]
commit_hash:1ba799aed1703ab7c6304b6da7090b3337f768dd
Diffstat (limited to 'library/cpp/yt/error/unittests/error_ut.cpp')
-rw-r--r-- | library/cpp/yt/error/unittests/error_ut.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/library/cpp/yt/error/unittests/error_ut.cpp b/library/cpp/yt/error/unittests/error_ut.cpp index a4248b3956..198aa1ecd8 100644 --- a/library/cpp/yt/error/unittests/error_ut.cpp +++ b/library/cpp/yt/error/unittests/error_ut.cpp @@ -202,7 +202,7 @@ void IterateTestOverEveryRightOperand(TOverloadTest& tester) } template <class T> -void SetErrorAttribute(TError* error, TString key, const T& value) +void SetErrorAttribute(TError* error, const std::string& key, const T& value) { *error <<= TErrorAttribute(key, value); } @@ -357,7 +357,7 @@ TEST(TErrorTest, ThrowErrorExceptionIfFailedMacroExpression) EXPECT_EQ(outerError.GetMessage(), "Outer error"); EXPECT_EQ(outerError.InnerErrors().size(), 1u); EXPECT_EQ(outerError.InnerErrors()[0].GetMessage(), "Inner error"); - EXPECT_EQ(outerError.InnerErrors()[0].Attributes().Get<TString>("attr"), "attr_value"); + EXPECT_EQ(outerError.InnerErrors()[0].Attributes().Get<std::string>("attr"), "attr_value"); } } @@ -427,7 +427,7 @@ TEST(TErrorTest, TruncateSimple) EXPECT_EQ(error.GetPid(), truncatedError.GetPid()); EXPECT_EQ(error.GetTid(), truncatedError.GetTid()); EXPECT_EQ(error.GetDatetime(), truncatedError.GetDatetime()); - EXPECT_EQ(error.Attributes().Get<TString>("my_attr"), truncatedError.Attributes().Get<TString>("my_attr")); + EXPECT_EQ(error.Attributes().Get<std::string>("my_attr"), truncatedError.Attributes().Get<std::string>("my_attr")); EXPECT_EQ(error.InnerErrors().size(), truncatedError.InnerErrors().size()); EXPECT_EQ(error.InnerErrors()[0].GetMessage(), truncatedError.InnerErrors()[0].GetMessage()); } @@ -444,7 +444,7 @@ TEST(TErrorTest, TruncateLarge) auto truncatedError = error.Truncate(/*maxInnerErrorCount*/ 3, /*stringLimit*/ 10); EXPECT_EQ(error.GetCode(), truncatedError.GetCode()); EXPECT_EQ("Some long ...<message truncated>", truncatedError.GetMessage()); - EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<TString>("my_attr")); + EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<std::string>("my_attr")); EXPECT_EQ(truncatedError.InnerErrors().size(), 3u); EXPECT_EQ("First inne...<message truncated>", truncatedError.InnerErrors()[0].GetMessage()); @@ -466,7 +466,7 @@ TEST(TErrorTest, TruncateSimpleRValue) EXPECT_EQ(error.GetPid(), truncatedError.GetPid()); EXPECT_EQ(error.GetTid(), truncatedError.GetTid()); EXPECT_EQ(error.GetDatetime(), truncatedError.GetDatetime()); - EXPECT_EQ(error.Attributes().Get<TString>("my_attr"), truncatedError.Attributes().Get<TString>("my_attr")); + EXPECT_EQ(error.Attributes().Get<std::string>("my_attr"), truncatedError.Attributes().Get<std::string>("my_attr")); EXPECT_EQ(error.InnerErrors().size(), truncatedError.InnerErrors().size()); EXPECT_EQ(error.InnerErrors()[0].GetMessage(), truncatedError.InnerErrors()[0].GetMessage()); } @@ -486,7 +486,7 @@ TEST(TErrorTest, TruncateLargeRValue) EXPECT_EQ(error.GetCode(), truncatedError.GetCode()); EXPECT_EQ("Some long ...<message truncated>", truncatedError.GetMessage()); - EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<TString>("my_attr")); + EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<std::string>("my_attr")); EXPECT_EQ(truncatedError.InnerErrors().size(), 3u); EXPECT_EQ("First inne...<message truncated>", truncatedError.InnerErrors()[0].GetMessage()); @@ -524,8 +524,8 @@ TEST(TErrorTest, TruncateWhitelist) EXPECT_EQ(error.GetCode(), truncatedError.GetCode()); EXPECT_EQ(error.GetMessage(), truncatedError.GetMessage()); - EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<TString>("attr1")); - EXPECT_EQ("Some long long attr", truncatedError.Attributes().Get<TString>("attr2")); + EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<std::string>("attr1")); + EXPECT_EQ("Some long long attr", truncatedError.Attributes().Get<std::string>("attr2")); } TEST(TErrorTest, TruncateWhitelistRValue) @@ -543,8 +543,8 @@ TEST(TErrorTest, TruncateWhitelistRValue) EXPECT_EQ(error.GetCode(), truncatedError.GetCode()); EXPECT_EQ(error.GetMessage(), truncatedError.GetMessage()); - EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<TString>("attr1")); - EXPECT_EQ("Some long long attr", truncatedError.Attributes().Get<TString>("attr2")); + EXPECT_EQ("...<attribute truncated>...", truncatedError.Attributes().Get<std::string>("attr1")); + EXPECT_EQ("Some long long attr", truncatedError.Attributes().Get<std::string>("attr2")); } TEST(TErrorTest, TruncateWhitelistInnerErrors) @@ -563,8 +563,8 @@ TEST(TErrorTest, TruncateWhitelistInnerErrors) auto truncatedInnerError = truncatedError.InnerErrors()[0]; EXPECT_EQ(truncatedInnerError.GetCode(), innerError.GetCode()); EXPECT_EQ(truncatedInnerError.GetMessage(), innerError.GetMessage()); - EXPECT_EQ("...<attribute truncated>...", truncatedInnerError.Attributes().Get<TString>("attr1")); - EXPECT_EQ("Some long long attr", truncatedInnerError.Attributes().Get<TString>("attr2")); + EXPECT_EQ("...<attribute truncated>...", truncatedInnerError.Attributes().Get<std::string>("attr1")); + EXPECT_EQ("Some long long attr", truncatedInnerError.Attributes().Get<std::string>("attr2")); } TEST(TErrorTest, TruncateWhitelistInnerErrorsRValue) @@ -585,8 +585,8 @@ TEST(TErrorTest, TruncateWhitelistInnerErrorsRValue) auto truncatedInnerError = truncatedError.InnerErrors()[0]; EXPECT_EQ(truncatedInnerError.GetCode(), innerError.GetCode()); EXPECT_EQ(truncatedInnerError.GetMessage(), innerError.GetMessage()); - EXPECT_EQ("...<attribute truncated>...", truncatedInnerError.Attributes().Get<TString>("attr1")); - EXPECT_EQ("Some long long attr", truncatedInnerError.Attributes().Get<TString>("attr2")); + EXPECT_EQ("...<attribute truncated>...", truncatedInnerError.Attributes().Get<std::string>("attr1")); + EXPECT_EQ("Some long long attr", truncatedInnerError.Attributes().Get<std::string>("attr2")); } TEST(TErrorTest, TruncateWhitelistSaveInnerError) @@ -668,7 +668,7 @@ TEST(TErrorTest, YTExceptionWithAttributesToError) EXPECT_TRUE(boolValue); EXPECT_EQ(*boolValue, false); - auto stringValue = error.Attributes().Find<TString>("String value"); + auto stringValue = error.Attributes().Find<std::string>("String value"); EXPECT_TRUE(stringValue); EXPECT_EQ(*stringValue, "FooBar"); } @@ -677,19 +677,19 @@ TEST(TErrorTest, YTExceptionWithAttributesToError) TEST(TErrorTest, AttributeSerialization) { auto getWeededText = [] (const TError& err) { - std::vector<TString> lines; + std::vector<std::string> lines; for (const auto& line : StringSplitter(ToString(err)).Split('\n')) { if (!line.Contains("origin") && !line.Contains("datetime")) { - lines.push_back(TString{line}); + lines.push_back(std::string{line}); } } return JoinSeq("\n", lines); }; - EXPECT_EQ(getWeededText(TError("E1") << TErrorAttribute("A1", "V1")), TString( + EXPECT_EQ(getWeededText(TError("E1") << TErrorAttribute("A1", "V1")), std::string( "E1\n" " A1 V1\n")); - EXPECT_EQ(getWeededText(TError("E1") << TErrorAttribute("A1", "L1\nL2\nL3")), TString( + EXPECT_EQ(getWeededText(TError("E1") << TErrorAttribute("A1", "L1\nL2\nL3")), std::string( "E1\n" " A1\n" " L1\n" |