Merge remote branch 'odyx/win32-loader-autobyhand' into merge

[dak.git] / tests / dbtest_debversion.py

diff --git a/tests/dbtest_debversion.py b/tests/dbtest_debversion.py
index 548a2e8ea5c97c626aca4f999dab16599a17fe90..ae4baf1ba6e08ae283fce4f0902681ea934d293b 100755 (executable)
--- a/tests/dbtest_debversion.py
+++ b/tests/dbtest_debversion.py
@@ -16,6 +16,13 @@ class Version(object):
         return "<Version('%s')>" % self.version
 
 class DebVersionTestCase(DBDakTestCase):
+    """
+    The DebVersionTestCase tests both comparison (<=, ==, >, !=), the in_()
+    method and aggregate functions (min, max) for the DebVersion type. To
+    simplify the test it creates a separate table 'version' which is not used
+    by dak itself.
+    """
+
     def setUp(self):
         super(DebVersionTestCase, self).setUp()
         self.version_table = Table('version', self.metadata, \
@@ -32,16 +39,19 @@ class DebVersionTestCase(DBDakTestCase):
         self.session.add(v)
         v = Version('1.0')
         self.session.add(v)
-        #self.session.commit()
         q = self.session.query(Version)
         self.assertEqual(3, q.count())
+        self.assertEqual(2, q.filter(Version.version <= '0.5').count())
+        self.assertEqual(1, q.filter(Version.version == '0.5').count())
         self.assertEqual(2, q.filter(Version.version > '0.5~').count())
         self.assertEqual(1, q.filter(Version.version > '0.5').count())
         self.assertEqual(0, q.filter(Version.version > '1.0').count())
-        q = self.session.query(func.min(Version.version))
-        self.assertEqual('0.5~', q.one()[0])
-        q = self.session.query(func.max(Version.version))
-        self.assertEqual('1.0', q.one()[0])
+        self.assertEqual(2, q.filter(Version.version != '1.0').count())
+        self.assertEqual(2, q.filter(Version.version.in_(['0.5~', '1.0'])).count())
+        q = self.session.query(func.min(Version.version).label('min'))
+        self.assertEqual('0.5~', q.one().min)
+        q = self.session.query(func.max(Version.version).label('max'))
+        self.assertEqual('1.0', q.one().max)
 
     def tearDown(self):
         self.session.close()