diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
| commit | 99813a2eaa7c0cce1d7d8c811827733ed66458de (patch) | |
| tree | 61fe422eeca8c5bd5cb2de6060f11e71343d4602 /test | |
| parent | d30b30ad1e1ce434df84e15e2573c43ac152f9e3 (diff) | |
| parent | 0b5e329a8ba2461ccb7017d3adfc972f9dccd830 (diff) | |
Merge branch 'feature/happy-gcc'
Fixing various real and imagined bugs reported by gcc warnings
Diffstat (limited to 'test')
| -rw-r--r-- | test/libapt/getlistoffilesindir_test.cc | 2 | ||||
| -rw-r--r-- | test/libapt/globalerror_test.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc index 606e2733e..ba4f9f6ef 100644 --- a/test/libapt/getlistoffilesindir_test.cc +++ b/test/libapt/getlistoffilesindir_test.cc @@ -11,7 +11,7 @@ #include "file-helpers.h" -#define P(x) std::string(tempdir).append("/").append(x) +#define P(x) tempdir + "/" + x TEST(FileUtlTest,GetListOfFilesInDir) { diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc index 67682c275..ff14d4618 100644 --- a/test/libapt/globalerror_test.cc +++ b/test/libapt/globalerror_test.cc @@ -111,11 +111,11 @@ TEST(GlobalErrorTest,LongMessage) longText.append("a"); EXPECT_FALSE(e.Error("%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"), text); + EXPECT_EQ(longText + " horrible happened 2 times", text); 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_EQ(longText + " horrible happened 2 times - errno (0: " + textOfErrnoZero + ")", text); EXPECT_FALSE(e.Error("%s horrible %s %d times", longText.c_str(), "happened", 2)); std::ostringstream out; |