X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Fdbtest_contents.py;h=f7be2f268fb66fc26dc4764b9eed6a13c590d65c;hb=b4e3e8587862d3c40bbea7e87223744bb2691f1e;hp=d4f57adf2a4e3d6793f96af0c585116b8d418033;hpb=15193f20eeebbd19c75f0d124f1a7b2a582a179b;p=dak.git

diff --git a/tests/dbtest_contents.py b/tests/dbtest_contents.py
index d4f57adf..f7be2f26 100755
--- a/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@ -3,7 +3,8 @@
 from db_test import DBDakTestCase
 
 from daklib.dbconn import DBConn, BinContents, OverrideType, get_override_type, \
-    Section, get_section, get_sections, Priority, get_priority, get_priorities
+    Section, get_section, get_sections, Priority, get_priority, get_priorities, \
+    Override, get_override
 
 from sqlalchemy.exc import FlushError, IntegrityError
 import unittest
@@ -62,43 +63,71 @@ class ContentsTestCase(DBDakTestCase):
         '''
         Test the OverrideType class.
         '''
-        debtype = OverrideType(overridetype = 'deb')
-        self.session.add(debtype)
-        self.session.flush()
-        self.assertEqual('deb', debtype.overridetype)
-        self.assertEqual(0, debtype.overrides.count())
-        self.assertEqual(debtype, get_override_type('deb', self.session))
+        self.setup_overridetypes()
+        self.assertEqual('deb', self.otype['deb'].overridetype)
+        self.assertEqual(0, self.otype['deb'].overrides.count())
+        self.assertEqual(self.otype['deb'], get_override_type('deb', self.session))
 
     def test_section(self):
         '''
         Test Section class.
         '''
-        section = Section(section = 'python')
-        self.session.add(section)
-        self.session.flush()
-        self.assertEqual('python', section.section)
-        self.assertEqual('python', section)
-        self.assertTrue(section != 'java')
-        self.assertEqual(section, get_section('python', self.session))
+        self.setup_sections()
+        self.assertEqual('python', self.section['python'].section)
+        self.assertEqual('python', self.section['python'])
+        self.assertTrue(self.section['python'] != 'java')
+        self.assertEqual(self.section['python'], get_section('python', self.session))
         all_sections = get_sections(self.session)
-        self.assertEqual(section.section_id, all_sections['python'])
-        self.assertEqual(0, section.overrides.count())
+        self.assertEqual(self.section['python'].section_id, all_sections['python'])
+        self.assertEqual(0, self.section['python'].overrides.count())
 
     def test_priority(self):
         '''
         Test Priority class.
         '''
-        priority = Priority(priority = 'standard', level = 7)
-        self.session.add(priority)
-        self.session.flush()
-        self.assertEqual('standard', priority.priority)
-        self.assertEqual(7, priority.level)
-        self.assertEqual('standard', priority)
-        self.assertTrue(priority != 'extra')
-        self.assertEqual(priority, get_priority('standard', self.session))
+        self.setup_priorities()
+        self.assertEqual('standard', self.prio['standard'].priority)
+        self.assertEqual(7, self.prio['standard'].level)
+        self.assertEqual('standard', self.prio['standard'])
+        self.assertTrue(self.prio['standard'] != 'extra')
+        self.assertEqual(self.prio['standard'], get_priority('standard', self.session))
         all_priorities = get_priorities(self.session)
-        self.assertEqual(priority.priority_id, all_priorities['standard'])
-        self.assertEqual(0, priority.overrides.count())
+        self.assertEqual(self.prio['standard'].priority_id, all_priorities['standard'])
+        self.assertEqual(0, self.prio['standard'].overrides.count())
+
+    def test_override(self):
+        '''
+        Test Override class.
+        '''
+        self.setup_overrides()
+        list = get_override('hello', session = self.session)
+        self.assertEqual(3, len(list))
+        self.assertTrue(self.override['hello_sid_main_udeb'] in list)
+        self.assertTrue(self.override['hello_squeeze_main_deb'] in list)
+        list = get_override('hello', suite = 'sid', session = self.session)
+        self.assertEqual([self.override['hello_sid_main_udeb']], list)
+        list = get_override('hello', suite = ['sid'], session = self.session)
+        self.assertEqual([self.override['hello_sid_main_udeb']], list)
+        list = get_override('hello', component = 'contrib', session = self.session)
+        self.assertEqual([self.override['hello_lenny_contrib_deb']], list)
+        list = get_override('hello', component = ['contrib'], session = self.session)
+        self.assertEqual([self.override['hello_lenny_contrib_deb']], list)
+        list = get_override('hello', overridetype = 'deb', session = self.session)
+        self.assertEqual(2, len(list))
+        self.assertTrue(self.override['hello_sid_main_udeb'] not in list)
+        self.assertTrue(self.override['hello_squeeze_main_deb'] in list)
+        list = get_override('hello', overridetype = ['deb'], session = self.session)
+        self.assertEqual(2, len(list))
+        self.assertTrue(self.override['hello_sid_main_udeb'] not in list)
+        self.assertTrue(self.override['hello_squeeze_main_deb'] in list)
+        # test the backrefs
+        self.assertEqual(self.override['hello_sid_main_udeb'], \
+            self.suite['sid'].overrides.one())
+        self.assertEqual(2, self.comp['main'].overrides.count())
+        self.assertEqual(self.override['hello_sid_main_udeb'], \
+            self.comp['main'].overrides.filter_by(suite = self.suite['sid']).one())
+        self.assertEqual(self.override['hello_sid_main_udeb'], \
+            self.otype['udeb'].overrides.one())
 
 if __name__ == '__main__':
     unittest.main()