add a simple stack handling to be able to delay error handling

2 files changed, 85 insertions, 2 deletions

diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
new file mode 100644
index 000000000..b2752255f
--- /dev/null
+++ b/test/libapt/globalerror_test.cc
@@ -0,0 +1,77 @@
+#include <apt-pkg/error.h>
+
+#include "assert.h"
+#include <string>
+
+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->empty(GlobalError::DEBUG), false);
+	equals(_error->PendingError(), false);
+	equals(_error->Error("%s horrible %s %d times", "Something", "happend", 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(text, "Something horrible happend 2 times");
+	equals(_error->empty(GlobalError::DEBUG), true);
+	equals(_error->PendingError(), false);
+	equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false);
+	equals(_error->PendingError(), true);
+	equals(_error->empty(GlobalError::FATAL), false);
+	_error->Discard();
+
+	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->PendingError(), true);
+	equals(_error->empty(GlobalError::NOTICE), false);
+	_error->PushToStack();
+	equals(_error->empty(GlobalError::NOTICE), true);
+	equals(_error->PendingError(), false);
+	equals(_error->Warning("%s Warning", "A"), false);
+	equals(_error->empty(GlobalError::ERROR), true);
+	equals(_error->PendingError(), false);
+	_error->RevertToStack();
+	equals(_error->empty(GlobalError::ERROR), false);
+	equals(_error->PendingError(), true);
+	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(_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->PendingError(), true);
+	equals(_error->empty(GlobalError::NOTICE), false);
+	_error->PushToStack();
+	equals(_error->empty(GlobalError::NOTICE), true);
+	equals(_error->PendingError(), false);
+	equals(_error->Warning("%s Warning", "A"), false);
+	equals(_error->empty(GlobalError::ERROR), true);
+	equals(_error->PendingError(), false);
+	_error->MergeWithStack();
+	equals(_error->empty(GlobalError::ERROR), false);
+	equals(_error->PendingError(), true);
+	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(_error->PendingError(), false);
+	equals(_error->empty(), false);
+	equals(_error->PopMessage(text), false);
+	equals(text, "A Warning");
+	equals(_error->empty(), true);
+
+	return 0;
+}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index ee3401b35..50058262e 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -30,13 +30,19 @@ SOURCE = getlistoffilesindir_test.cc
 include $(PROGRAM_H)
 
 # Program for testing CommandLine reconstruction
-PROGRAM = commandlineasstring${BASENAME}
+PROGRAM = CommandlineAsString${BASENAME}
 SLIBS = -lapt-pkg
 SOURCE = commandlineasstring_test.cc
 include $(PROGRAM_H)
 
 # Program for testing debians version comparing
-PROGRAM = compareversion${BASENAME}
+PROGRAM = CompareVersion${BASENAME}
 SLIBS = -lapt-pkg
 SOURCE = compareversion_test.cc
 include $(PROGRAM_H)
+
+# test the GlobalError stack class
+PROGRAM = GlobalError${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = globalerror_test.cc
+include $(PROGRAM_H)