From 6794170615d6afecb46e5533a2ae31622f2c6ff9 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Wed, 28 Jul 2004 21:23:11 +0000 Subject: Reverse operator * gobject/pygenum.c (pyg_enum_compare): * gobject/pygflags.c (pyg_flags_compare): Reverse operator * tests/enum.py (FlagsTest.testComparision) (FlagsTest.testComparision): New tests --- gobject/pygenum.c | 2 +- gobject/pygflags.c | 2 +- tests/enum.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/gobject/pygenum.c b/gobject/pygenum.c index 89f1616..0f440ad 100644 --- a/gobject/pygenum.c +++ b/gobject/pygenum.c @@ -41,7 +41,7 @@ pyg_enum_compare(PyGEnum *self, PyObject *other) if (GET_INT(self) == GET_INT(other)) return 0; - else if (GET_INT(self) > GET_INT(other)) + else if (GET_INT(self) < GET_INT(other)) return -1; else return 1; diff --git a/gobject/pygflags.c b/gobject/pygflags.c index baf5f7d..d897d8a 100644 --- a/gobject/pygflags.c +++ b/gobject/pygflags.c @@ -41,7 +41,7 @@ pyg_flags_compare(PyGFlags *self, PyObject *other) if (GET_INT_VALUE(self) == GET_INT_VALUE(other)) return 0; - else if (GET_INT_VALUE(self) > GET_INT_VALUE(other)) + else if (GET_INT_VALUE(self) < GET_INT_VALUE(other)) return -1; else return 1; diff --git a/tests/enum.py b/tests/enum.py index b27f09b..5c75736 100644 --- a/tests/enum.py +++ b/tests/enum.py @@ -142,6 +142,36 @@ class FlagsTest(unittest.TestCase): assert hasattr(klass, '__flags_values__') assert isinstance(klass.__flags_values__, dict) assert len(klass.__flags_values__) >= 3 + + def testComparision(self): + e = gtk.TREE_VIEW_DROP_BEFORE + assert e == 0 + assert not e == 10 + assert not e != 0 + assert e != 10 + assert not e < 0 + assert e < 10 + assert not e > 0 + assert not e > 10 + assert e >= 0 + assert not e >= 10 + assert e <= 0 + assert e <= 10 + def testComparision(self): + flag = gdk.EXPOSURE_MASK + assert flag == 2 + assert not flag == 10 + assert not flag != 2 + assert flag != 10 + assert not flag < 2 + assert flag < 10 + assert not flag > 2 + assert not flag > 10 + assert flag >= 2 + assert not flag >= 10 + assert flag <= 2 + assert flag <= 10 + if __name__ == '__main__': unittest.main() -- cgit