[Zope3-checkins] SVN: Zope3/trunk/src/bugtracker/ Fixed test failures from recent checkins.

[Stephan Richter]

Log message for revision 27455:
  Fixed test failures from recent checkins.
  


Changed:
  U   Zope3/trunk/src/bugtracker/browser/tests/test_bug.py
  U   Zope3/trunk/src/bugtracker/configure.zcml
  U   Zope3/trunk/src/bugtracker/tests/test_vocabularies.py


-=-
Modified: Zope3/trunk/src/bugtracker/browser/tests/test_bug.py
===================================================================
--- Zope3/trunk/src/bugtracker/browser/tests/test_bug.py	2004-09-06 19:15:40 UTC (rev 27454)
+++ Zope3/trunk/src/bugtracker/browser/tests/test_bug.py	2004-09-06 23:16:59 UTC (rev 27455)
@@ -30,35 +30,35 @@
         self.view.request = TestRequest(environ={'HTTP_ACCEPT_LANGUAGE': 'en'})
 
     def test_created(self):
-        self.assertEqual(self.view.created(), '3/3/03 3:00 AM')
+        self.assertEqual(self.view.created, '3/3/03 3:00 AM')
 
     def test_modified(self):
-        self.assertEqual(self.view.modified(), '3/3/03 4:00 AM')
+        self.assertEqual(self.view.modified, '3/3/03 4:00 AM')
 
     def test_description(self):
-        self.assertEqual(self.view.description(), 'This is Bug 1.')
+        self.assertEqual(self.view.description, 'This is Bug 1.')
 
     def test_status(self):
-        self.assertEqual(self.view.status().value, 'new')
-        self.assertEqual(self.view.status().title, 'New')
+        self.assertEqual(self.view.status.value, 'new')
+        self.assertEqual(self.view.status.title, 'New')
 
     def test_type(self):
-        self.assertEqual(self.view.type().value, 'bug')
-        self.assertEqual(self.view.type().title, 'Bug')
+        self.assertEqual(self.view.type.value, 'bug')
+        self.assertEqual(self.view.type.title, 'Bug')
 
     def test_priority(self):
-        self.assertEqual(self.view.priority().value, 'normal')
-        self.assertEqual(self.view.priority().title, 'Normal')
+        self.assertEqual(self.view.priority.value, 'normal')
+        self.assertEqual(self.view.priority.title, 'Normal')
 
     def test_release(self):
-        self.assertEqual(self.view.release().value, 'None')
-        self.assertEqual(self.view.release().title, '(not specified)')
+        self.assertEqual(self.view.release.value, 'None')
+        self.assertEqual(self.view.release.title, '(not specified)')
 
     def test_owners(self):
-        self.assertEqual(self.view.owners()[0]['login'], 'jim')
-        self.assertEqual(self.view.owners()[0]['title'], 'Jim Fulton')
-        self.assertEqual(self.view.owners()[1]['login'], 'stevea')
-        self.assertEqual(self.view.owners()[1]['title'], 'Steve Alexander')
+        self.assertEqual(self.view.owners[0]['login'], 'jim')
+        self.assertEqual(self.view.owners[0]['title'], 'Jim Fulton')
+        self.assertEqual(self.view.owners[1]['login'], 'stevea')
+        self.assertEqual(self.view.owners[1]['title'], 'Steve Alexander')
 
 
 class OverviewTest(PlacelessSetup, unittest.TestCase):

Modified: Zope3/trunk/src/bugtracker/configure.zcml
===================================================================
--- Zope3/trunk/src/bugtracker/configure.zcml	2004-09-06 19:15:40 UTC (rev 27454)
+++ Zope3/trunk/src/bugtracker/configure.zcml	2004-09-06 23:16:59 UTC (rev 27455)
@@ -3,6 +3,7 @@
    xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
    xmlns:mail="http://namespaces.zope.org/mail"
    xmlns:i18n="http://namespaces.zope.org/i18n"
+   xmlns:apidoc="http://namespaces.zope.org/apidoc"
    i18n_domain="bugtracker"
    >
 
@@ -384,4 +385,7 @@
   <!-- Translations -->
   <i18n:registerTranslations directory="locales" />
 
+  <!-- Register application with API Doc Tool -->
+  <apidoc:rootModule module="bugtracker" />
+
 </configure>

Modified: Zope3/trunk/src/bugtracker/tests/test_vocabularies.py
===================================================================
--- Zope3/trunk/src/bugtracker/tests/test_vocabularies.py	2004-09-06 19:15:40 UTC (rev 27454)
+++ Zope3/trunk/src/bugtracker/tests/test_vocabularies.py	2004-09-06 23:16:59 UTC (rev 27455)
@@ -59,13 +59,13 @@
         tracker = BugTracker()
         contained(tracker, Root(), name="tracker")
         vocab = self.getVocabularyClass()(tracker)
-        vocab.context.__annotations__ = {}
+        vocab.annotations.obj.__annotations__ = {}
         data = {'1': SimpleTerm('1', u'one'),
                 '2': SimpleTerm('2', u'two'),
                 '3': SimpleTerm('3', u'three'),
                 '4': SimpleTerm('4', u'four')}
-        vocab.context.__annotations__[vocab.key] = data
-        vocab.context.__annotations__[vocab.key+'/default'] = '1'
+        vocab.annotations.obj.__annotations__[vocab.key] = data
+        vocab.annotations.obj.__annotations__[vocab.key+'/default'] = '1'
         return vocab
 
     def test_contains(self):
@@ -261,13 +261,13 @@
         tracker = BugTracker()
         contained(tracker, Root(), name="tracker")
         vocab = SampleVocabulary(tracker)
-        vocab.context.__annotations__ = {}
+        vocab.annotations.obj.__annotations__ = {}
         data = {'1': SimpleTerm('1', u'one'),
                 '2': SimpleTerm('2', u'two'),
                 '3': SimpleTerm('3', u'three'),
                 '4': SimpleTerm('4', u'four')}
-        vocab.context.__annotations__[vocab.key] = data
-        vocab.context.__annotations__[vocab.key+'/default'] = '1'
+        vocab.annotations.obj.__annotations__[vocab.key] = data
+        vocab.annotations.obj.__annotations__[vocab.key+'/default'] = '1'
         self.tracker = tracker
 
     def getObject(self):