cleanup headers and especially #includes everywhere

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

diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index 5d27414f97068f716d187a8e546c8c51a3b88830..e913fdc12246a17a74031212bd3bdbaaf496f426 100644 (file)
--- a/test/libapt/globalerror_test.cc
+++ b/test/libapt/globalerror_test.cc
@@ -1,28 +1,35 @@
+#include <config.h>
+

 #include <apt-pkg/error.h>
 
 #include <apt-pkg/error.h>
 

-#include "assert.h"
+#include <stddef.h>

 #include <string>
 #include <errno.h>
 #include <string>
 #include <errno.h>

+#include <string.h>

 
 

-int main(int argc,char *argv[])
+#include "assert.h"
+
+int main()

 {
 {

+       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->empty(GlobalError::DEBUG), false);
        equals(_error->PendingError(), false);
        equals(_error->empty(), true);
        equals(_error->PendingError(), false);
        equals(_error->Notice("%s Notice", "A"), false);
        equals(_error->empty(), true);
        equals(_error->empty(GlobalError::DEBUG), false);
        equals(_error->PendingError(), false);

-       equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false);
+       equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);

        equals(_error->PendingError(), true);
        std::string text;
        equals(_error->PopMessage(text), false);
        equals(_error->PendingError(), true);
        equals(text, "A Notice");
        equals(_error->PopMessage(text), true);
        equals(_error->PendingError(), true);
        std::string text;
        equals(_error->PopMessage(text), false);
        equals(_error->PendingError(), true);
        equals(text, "A Notice");
        equals(_error->PopMessage(text), true);

-       equals(text, "Something horrible happend 2 times");
+       equals(text, "Something horrible happened 2 times");

        equals(_error->empty(GlobalError::DEBUG), true);
        equals(_error->PendingError(), false);
        equals(_error->empty(GlobalError::DEBUG), true);
        equals(_error->PendingError(), false);

-       equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false);
+       equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);

        equals(_error->PendingError(), true);
        equals(_error->empty(GlobalError::FATAL), false);
        _error->Discard();
        equals(_error->PendingError(), true);
        equals(_error->empty(GlobalError::FATAL), false);
        _error->Discard();


@@ -30,7 +37,7 @@ int main(int argc,char *argv[])
        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);

-       equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false);
+       equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);

        equals(_error->PendingError(), true);
        equals(_error->empty(GlobalError::NOTICE), false);
        _error->PushToStack();
        equals(_error->PendingError(), true);
        equals(_error->empty(GlobalError::NOTICE), false);
        _error->PushToStack();


@@ -46,12 +53,12 @@ int main(int argc,char *argv[])
        equals(_error->PendingError(), true);
        equals(text, "A Notice");
        equals(_error->PopMessage(text), true);
        equals(_error->PendingError(), true);
        equals(text, "A Notice");
        equals(_error->PopMessage(text), true);

-       equals(text, "Something horrible happend 2 times");
+       equals(text, "Something horrible happened 2 times");

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

-       equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false);
+       equals(_error->Error("%s horrible %s %d times", "Something", "happened", 2), false);

        equals(_error->PendingError(), true);
        equals(_error->empty(GlobalError::NOTICE), false);
        _error->PushToStack();
        equals(_error->PendingError(), true);
        equals(_error->empty(GlobalError::NOTICE), false);
        _error->PushToStack();


@@ -67,7 +74,7 @@ int main(int argc,char *argv[])
        equals(_error->PendingError(), true);
        equals(text, "A Notice");
        equals(_error->PopMessage(text), true);
        equals(_error->PendingError(), true);
        equals(text, "A Notice");
        equals(_error->PopMessage(text), true);

-       equals(text, "Something horrible happend 2 times");
+       equals(text, "Something horrible happened 2 times");

        equals(_error->PendingError(), false);
        equals(_error->empty(), false);
        equals(_error->PopMessage(text), false);
        equals(_error->PendingError(), false);
        equals(_error->empty(), false);
        equals(_error->PopMessage(text), false);


@@ -75,24 +82,24 @@ int main(int argc,char *argv[])
        equals(_error->empty(), true);
 
        errno = 0;
        equals(_error->empty(), true);
 
        errno = 0;

-       equals(_error->Errno("errno", "%s horrible %s %d times", "Something", "happend", 2), false);
+       equals(_error->Errno("errno", "%s horrible %s %d times", "Something", "happened", 2), false);

        equals(_error->empty(), false);
        equals(_error->PendingError(), true);
        equals(_error->PopMessage(text), true);
        equals(_error->PendingError(), false);
        equals(_error->empty(), 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 happened 2 times - errno (0: ").append(textOfErrnoZero).append(")"));

        equals(_error->empty(), true);
 
        std::string longText;
        for (size_t i = 0; i < 500; ++i)
                longText.append("a");
        equals(_error->empty(), true);
 
        std::string longText;
        for (size_t i = 0; i < 500; ++i)
                longText.append("a");

-       equals(_error->Error("%s horrible %s %d times", longText.c_str(), "happend", 2), false);
+       equals(_error->Error("%s horrible %s %d times", longText.c_str(), "happened", 2), false);

        equals(_error->PopMessage(text), true);
        equals(_error->PopMessage(text), true);

-       equals(text, std::string(longText).append(" horrible happend 2 times"));
+       equals(text, std::string(longText).append(" horrible happened 2 times"));

 
 

-       equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happend", 2), false);
+       equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happened", 2), false);

        equals(_error->PopMessage(text), true);
        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 happened 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);