merged the relevant bits from lp:~mvo/apt/lp346386

[apt.git] / test / libapt / globalerror_test.cc

diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index 7d933f5a84fe591dc9cf7a0c0f988f379354dfe6..72044d493ad2abf0774ef0d75f83491d3af3b9f7 100644 (file)
--- a/test/libapt/globalerror_test.cc
+++ b/test/libapt/globalerror_test.cc
@@ -3,9 +3,12 @@
 #include "assert.h"
 #include <string>
 #include <errno.h>
 #include "assert.h"
 #include <string>
 #include <errno.h>

+#include <string.h>

 
 int main(int argc,char *argv[])
 {
 
 int main(int argc,char *argv[])
 {

+       std::string const textOfErrnoZero(strerror(0));
+

        equals(_error->empty(), true);
        equals(_error->PendingError(), false);
        equals(_error->Notice("%s Notice", "A"), false);
        equals(_error->empty(), true);
        equals(_error->PendingError(), false);
        equals(_error->Notice("%s Notice", "A"), false);


@@ -80,7 +83,7 @@ int main(int argc,char *argv[])
        equals(_error->PendingError(), true);
        equals(_error->PopMessage(text), true);
        equals(_error->PendingError(), false);
        equals(_error->PendingError(), true);
        equals(_error->PopMessage(text), true);
        equals(_error->PendingError(), false);

-       equals(text, "Something horrible happend 2 times - errno (0: Success)");
+       equals(text, std::string("Something horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")"));

        equals(_error->empty(), true);
 
        std::string longText;
        equals(_error->empty(), true);
 
        std::string longText;


@@ -92,7 +95,7 @@ int main(int argc,char *argv[])
 
        equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happend", 2), false);
        equals(_error->PopMessage(text), true);
 
        equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happend", 2), false);
        equals(_error->PopMessage(text), true);

-       equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: Success)"));
+       equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")"));

 
        equals(_error->Warning("Репозиторий не обновлён и будут %d %s", 4, "test"), false);
        equals(_error->PopMessage(text), false);
 
        equals(_error->Warning("Репозиторий не обновлён и будут %d %s", 4, "test"), false);
        equals(_error->PopMessage(text), false);


@@ -101,7 +104,7 @@ int main(int argc,char *argv[])
        longText.clear();
        for (size_t i = 0; i < 50; ++i)
                longText.append("РезийбёбAZ");
        longText.clear();
        for (size_t i = 0; i < 50; ++i)
                longText.append("РезийбёбAZ");

-       equals(_error->Warning(longText.c_str()), false);
+       equals(_error->Warning("%s", longText.c_str()), false);

        equals(_error->PopMessage(text), false);
        equals(text, longText);
 
        equals(_error->PopMessage(text), false);
        equals(text, longText);