warning: type qualifiers ignored on function return type [-Wignored-qualifiers]

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

diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index ce5accc1c537e3876308aebe31cd5bccb55644dd..cde6a63515029ac6699cda6de01d4670fde88482 100644 (file)
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -1,10 +1,18 @@
 #include <iostream>
+#include <cstdlib>
+
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic push
+       #pragma GCC diagnostic ignored "-Wmissing-declarations"
+#endif
 
 #define equals(x,y) assertEquals(y, x, __LINE__)
+#define equalsNot(x,y) assertEqualsNot(y, x, __LINE__)
 
 template < typename X, typename Y >
 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;
+       std::exit(EXIT_FAILURE);
 }
 
 template < typename X, typename Y >
@@ -14,6 +22,13 @@ void assertEquals(X expect, Y get, unsigned long const &line) {
        OutputAssertEqual(expect, "==", get, line);
 }
 
+template < typename X, typename Y >
+void assertEqualsNot(X expect, Y get, unsigned long const &line) {
+       if (expect != get)
+               return;
+       OutputAssertEqual(expect, "!=", get, line);
+}
+
 void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) {
        if (get < 0)
                OutputAssertEqual(expect, "==", get, line);
@@ -26,6 +41,18 @@ void assertEquals(int const &expect, unsigned int const &get, unsigned long cons
        assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
 }
 
+void assertEquals(unsigned long const &expect, int const &get, unsigned long const &line) {
+       if (get < 0)
+               OutputAssertEqual(expect, "==", get, line);
+       assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
+void assertEquals(int const &expect, unsigned long const &get, unsigned long const &line) {
+       if (expect < 0)
+               OutputAssertEqual(expect, "==", get, line);
+       assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
 
 #define equalsOr2(x,y,z) assertEqualsOr2(y, z, x, __LINE__)
 
@@ -68,6 +95,19 @@ void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const
        OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line);
 }
 
+#define equalsOr4(v,w,x,y,z) assertEqualsOr4(w, x, y, z, v, __LINE__)
+
+template < typename X, typename Y >
+void OutputAssertEqualOr4(X expect1, X expect2, X expect3, X expect4, char const* compare, Y get, unsigned long const &line) {
+       std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« or »" << expect3 << "« or »" << expect4 << "« " << compare << " »" << get << "« at line " << line << std::endl;
+}
+
+template < typename X, typename Y >
+void assertEqualsOr4(X expect1, X expect2, X expect3, X expect4, Y get, unsigned long const &line) {
+       if (expect1 == get || expect2 == get || expect3 == get || expect4 == get)
+               return;
+       OutputAssertEqualOr4(expect1, expect2, expect3, expect4, "==", get, line);
+}
 
 // simple helper to quickly output a vectors
 template < typename X >
@@ -76,3 +116,7 @@ void dumpVector(X vec) {
             v != vec.end(); ++v)
                std::cout << *v << std::endl;
 }
+
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic pop
+#endif