[Checkins] SVN: zope.app.apidoc/trunk/ Made the tests work again with the most recent Zope Toolkit KGS.

[Hanno Schlichting]

Log message for revision 104077:
  Made the tests work again with the most recent Zope Toolkit KGS.
  

Changed:
  U   zope.app.apidoc/trunk/CHANGES.txt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py

-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt	2009-09-15 13:41:49 UTC (rev 104076)
+++ zope.app.apidoc/trunk/CHANGES.txt	2009-09-15 13:42:26 UTC (rev 104077)
@@ -5,7 +5,7 @@
 3.6.6 (unreleased)
 ------------------
 
-- ...
+- Made the tests work again with the most recent Zope Toolkit KGS.
 
 3.6.5 (2009-07-24)
 ------------------

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt	2009-09-15 13:41:49 UTC (rev 104076)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt	2009-09-15 13:42:26 UTC (rev 104077)
@@ -176,7 +176,7 @@
           </b>
           <br />
           <a href="++annotations++zope.app.dublincore.ZopeDublinCore/@@int...">
-            <code>&lt;...annotatableadapter.ZDCAnnotationData ...&gt;</code>
+            <code>...</code>
           </a>
           (<span>type:</span>
            <a href="...lincore/annotatableadapter/ZDCAnnotationData/index.html">
@@ -189,27 +189,18 @@
 
 As you can see you can click on the annotation to discover it further:
 
-    >>> browser.getLink('annotatableadapter.ZDCAnnotationData').click()
+    >>> browser.getLink('ZDCAnnotationData').click()
     >>> print browser.contents
     <!DOCTYPE...
     ...
-    <h2>Attributes/Properties</h2>
+    <h2...>Constructor</h2>
       <div class="indent">
-      <ul class="attr-list">
-        <li>
-          <b><code>data</code></b>
-            (<span>type:</span>
-            <a href=".../++apidoc++/Code/__builtin__/dict/index.html">
-              <code>dict</code></a>)
-          <br />
-          <i>Value:</i>
-          <code>{u'Date.Created': (u'...',),
-                 u'Date.Modified': (u'...',),
-                 u'Creator': (u'zope.mgr',)}</code>
-          <br />
-        </li>
-      </ul>
-    </div>
+        <div>
+          <b><code>__init__(dict=None, **kwargs)</code>
+          </b><br>
+          <div class="inline documentation"></div>
+        </div>
+      </div>
     ...
 
 That's it! The introspector view has a lot more potential, but that's for

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py	2009-09-15 13:41:49 UTC (rev 104076)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py	2009-09-15 13:42:26 UTC (rev 104077)
@@ -61,6 +61,8 @@
 class InterfaceModuleTests(BrowserTestCase):
     """Just a couple of tests ensuring that the templates render."""
 
+    layer = APIDocLayer
+
     def testMenu(self):
         response = self.publish(
             '/++apidoc++/Interface/menu.html',
@@ -82,16 +84,11 @@
         self.assertEqual(response.getStatus(), 200)
         body = response.getBody()
         self.assert_(body.find('Interface API Documentation Module') > 0)
-        self.checkForBrokenLinks(
-            body,
-            '/++apidoc++/Interface'
-            '/zope.app.apidoc.ifacemodule.IInterfaceModule'
-            '/index.html',
-            basic='mgr:mgrpw')
+        self.assert_(body.find('/++apidoc++/Code/zope/app/apidoc'
+                               '/ifacemodule/ifacemodule/index.html') > 0)
 
 
 def test_suite():
-    InterfaceModuleTests.layer = APIDocLayer
     return unittest.TestSuite((
         doctest.DocFileSuite('README.txt',
                              setUp=setUp, tearDown=tearDown,