diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-03-12 15:49:54 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-04-25 15:35:52 +0200 |
| commit | 82153438235144c485a8539b5c035e67bbef96e4 (patch) | |
| tree | fb82b0c81c52d2d70dc734bb63bcb2ab22547b8e /test/libapt | |
| parent | 3383ef4d30b3fb1057e21f5598d3128b9afbe34d (diff) | |
properly format multiline error messages
Diffstat (limited to 'test/libapt')
| -rw-r--r-- | test/libapt/globalerror_test.cc | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc index 05b95db85..bb36905a4 100644 --- a/test/libapt/globalerror_test.cc +++ b/test/libapt/globalerror_test.cc @@ -116,6 +116,16 @@ TEST(GlobalErrorTest,LongMessage) EXPECT_FALSE(e.Errno("errno", "%s horrible %s %d times", longText.c_str(), "happened", 2)); EXPECT_TRUE(e.PopMessage(text)); EXPECT_EQ(std::string(longText).append(" horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")"), text); + + EXPECT_FALSE(e.Error("%s horrible %s %d times", longText.c_str(), "happened", 2)); + std::ostringstream out; + e.DumpErrors(out); + EXPECT_EQ(std::string("E: ").append(longText).append(" horrible happened 2 times\n"), out.str()); + + EXPECT_FALSE(e.Errno("errno", "%s horrible %s %d times", longText.c_str(), "happened", 2)); + std::ostringstream out2; + e.DumpErrors(out2); + EXPECT_EQ(std::string("E: ").append(longText).append(" horrible happened 2 times - errno (0: ").append(textOfErrnoZero).append(")\n"), out2.str()); } TEST(GlobalErrorTest,UTF8Message) { @@ -126,6 +136,11 @@ TEST(GlobalErrorTest,UTF8Message) EXPECT_FALSE(e.PopMessage(text)); EXPECT_EQ("Репозиторий не обновлён и будут 4 test", text); + EXPECT_FALSE(e.Warning("Репозиторий не обновлён и будут %d %s", 4, "test")); + std::ostringstream out; + e.DumpErrors(out); + EXPECT_EQ("W: Репозиторий не обновлён и будут 4 test\n", out.str()); + std::string longText; for (size_t i = 0; i < 50; ++i) longText.append("РезийбёбAZ"); @@ -133,3 +148,22 @@ TEST(GlobalErrorTest,UTF8Message) EXPECT_FALSE(e.PopMessage(text)); EXPECT_EQ(longText, text); } +TEST(GlobalErrorTest,MultiLineMessage) +{ + GlobalError e; + std::string text; + + EXPECT_FALSE(e.Warning("Sometimes one line isn't enough.\nYou do know what I mean, right?\r\n%s?\rGood because I don't.", "Right")); + EXPECT_FALSE(e.PopMessage(text)); + EXPECT_EQ("Sometimes one line isn't enough.\nYou do know what I mean, right?\r\nRight?\rGood because I don't.", text); + + EXPECT_FALSE(e.Warning("Sometimes one line isn't enough.\nYou do know what I mean, right?\r\n%s?\rGood because I don't.", "Right")); + std::ostringstream out; + e.DumpErrors(out); + EXPECT_EQ("W: Sometimes one line isn't enough.\n You do know what I mean, right?\n Right?\n Good because I don't.\n", out.str()); + + EXPECT_FALSE(e.Warning("Sometimes one line isn't enough.\nYou do know what I mean, right?\r\n%s?\rGood because I don't.\n", "Right")); + std::ostringstream out2; + e.DumpErrors(out2); + EXPECT_EQ("W: Sometimes one line isn't enough.\n You do know what I mean, right?\n Right?\n Good because I don't.\n", out2.str()); +} |