merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index 5da76ae0a9d5a67226cd5448e8e5dfc9151dbe71..113c057ede9a73f902ed4342f46244ce907638ef 100644 (file)
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -1,21 +1,113 @@
 #include <iostream>
 #include <iostream>

+#include <cstdlib>

 
 

-#define equals(x,y) assertEquals(x, y, __LINE__)
+#define equals(x,y) assertEquals(y, x, __LINE__)
+#define equalsNot(x,y) assertEqualsNot(y, x, __LINE__)

 
 template < typename X, typename Y >
 
 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;
        std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl;

+       std::exit(EXIT_FAILURE);

 }
 
 template < typename X, typename Y >
 void assertEquals(X expect, Y get, unsigned long const &line) {
        if (expect == get)
                return;
 }
 
 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);
+}
+
+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)
 }
 
 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);
 }
        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__)
+
+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);
+}
+
+
+#define equalsOr3(w,x,y,z) assertEqualsOr3(x, y, z, w, __LINE__)
+
+template < typename X, typename Y >
+void OutputAssertEqualOr3(X expect1, X expect2, X expect3, char const* compare, Y get, unsigned long const &line) {
+       std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« or »" << expect3 << "« " << compare << " »" << get << "« at line " << line << std::endl;
+}
+
+template < typename X, typename Y >
+void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const &line) {
+       if (expect1 == get || expect2 == get || expect3 == get)
+               return;
+       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 >
+void dumpVector(X vec) {
+       for (typename X::const_iterator v = vec.begin();
+            v != vec.end(); ++v)
+               std::cout << *v << std::endl;
+}