lots of cppcheck fixes

[apt.git] / test / libapt / assert.h

diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index 5da76ae0a9d5a67226cd5448e8e5dfc9151dbe71..fae9b6c6423c33fa0c56402735fa0c5e7ad904c0 100644 (file)
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -1,9 +1,9 @@
 #include <iostream>
 
-#define equals(x,y) assertEquals(x, y, __LINE__)
+#define equals(x,y) assertEquals(y, x, __LINE__)
 
 template < typename X, typename Y >
-void OutputAssert(X expect, char const* compare, Y get, unsigned long const &line) {
+void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) {
        std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl;
 }
 
@@ -11,11 +11,53 @@ template < typename X, typename Y >
 void assertEquals(X expect, Y get, unsigned long const &line) {
        if (expect == get)
                return;
-       OutputAssert(expect, "==", get, line);
+       OutputAssertEqual(expect, "==", get, line);
 }
 
 void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) {
        if (get < 0)
-               OutputAssert(expect, "==", get, line);
+               OutputAssertEqual(expect, "==", get, line);
        assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
 }
+
+void assertEquals(int const &expect, unsigned int const &get, unsigned long const &line) {
+       if (expect < 0)
+               OutputAssertEqual(expect, "==", get, line);
+       assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
+}
+
+
+#define equalsOr2(x,y,z) assertEqualsOr2(y, z, x, __LINE__)
+
+template < typename X, typename Y >
+void OutputAssertEqualOr2(X expect1, X expect2, char const* compare, Y get, unsigned long const &line) {
+       std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« " << compare << " »" << get << "« at line " << line << std::endl;
+}
+
+template < typename X, typename Y >
+void assertEqualsOr2(X expect1, X expect2, Y get, unsigned long const &line) {
+       if (expect1 == get || expect2 == get)
+               return;
+       OutputAssertEqualOr2(expect1, expect2, "==", get, line);
+}
+
+void assertEqualsOr2(unsigned int const &expect1, unsigned int const &expect2, int const &get, unsigned long const &line) {
+       if (get < 0)
+               OutputAssertEqualOr2(expect1, expect2, "==", get, line);
+       assertEqualsOr2<unsigned int const&, unsigned int const&>(expect1, expect2, get, line);
+}
+
+void assertEqualsOr2(int const &expect1, int const &expect2, unsigned int const &get, unsigned long const &line) {
+       if (expect1 < 0 && expect2 < 0)
+               OutputAssertEqualOr2(expect1, expect2, "==", get, line);
+       assertEqualsOr2<unsigned int const&, unsigned int const&>(expect1, expect2, get, line);
+}
+
+
+// simple helper to quickly output a vectors
+template < typename X >
+void dumpVector(X vec) {
+       for (typename X::const_iterator v = vec.begin();
+            v != vec.end(); ++v)
+               std::cout << *v << std::endl;
+}