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 a07be4b5739289524d079564cc0fb0a865de601d..113c057ede9a73f902ed4342f46244ce907638ef 100644 (file)
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -1,10 +1,13 @@
 #include <iostream>
 #include <iostream>

+#include <cstdlib>

 
 #define equals(x,y) assertEquals(y, x, __LINE__)
 
 #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;
 
 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 >
 }
 
 template < typename X, typename Y >


@@ -14,6 +17,13 @@ void assertEquals(X expect, Y get, unsigned long const &line) {
        OutputAssertEqual(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)
                OutputAssertEqual(expect, "==", get, line);
 void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) {
        if (get < 0)
                OutputAssertEqual(expect, "==", get, line);


@@ -80,6 +90,19 @@ void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const
        OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line);
 }
 
        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 >
 
 // simple helper to quickly output a vectors
 template < typename X >