[Collective-checkins] ZopeTestCase/doctest FunctionalDocTest.txt,1.4,1.5 testFunctionalDocTest.py,1.5,1.6

[Stefan H. H. <sh...@us...>]

Update of /cvsroot/collective/ZopeTestCase/doctest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26480/doctest

Modified Files:
	FunctionalDocTest.txt testFunctionalDocTest.py 
Log Message:
Bring examples in line with examples in parent.


Index: FunctionalDocTest.txt
===================================================================
RCS file: /cvsroot/collective/ZopeTestCase/doctest/FunctionalDocTest.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FunctionalDocTest.txt	30 Jan 2005 14:30:12 -0000	1.4
+++ FunctionalDocTest.txt	7 Feb 2005 22:01:28 -0000	1.5
@@ -83,10 +83,10 @@
   ... GET /test_folder_1_/index_html HTTP/1.1
   ... """, handle_errors=False)
   HTTP/1.1 200 OK
-  Content-Length: 3
+  Content-Length: 5
   Content-Type: text/plain
   <BLANKLINE>
-  foo
+  index
 
 Test Publish Script
 
@@ -129,32 +129,31 @@
 
 Test Basic Authentication
 
-  >>> from Testing.ZopeTestCase import user_role
   >>> from AccessControl.Permissions import manage_properties
-  >>> self.folder.manage_role(user_role, [manage_properties])
+  >>> self.setPermissions([manage_properties])
 
   >>> print http(r"""
-  ... GET /test_folder_1_/object/change_title?title=Foo HTTP/1.1
+  ... GET /test_folder_1_/index_html/change_title?title=Foo HTTP/1.1
   ... Authorization: Basic %s
   ... """ % user_auth, handle_errors=False)
   HTTP/1.1 200 OK
   Content-Length: 0
   ...
 
-  >>> self.folder.object.title_or_id()
+  >>> self.folder.index_html.title_or_id()
   'Foo'
 
 Test passing in non-base64-encoded login/pass
 
   >>> from Testing.ZopeTestCase import user_name, user_password
   >>> print http(r"""
-  ... GET /test_folder_1_/object/change_title?title=Baz HTTP/1.1
+  ... GET /test_folder_1_/index_html/change_title?title=Baz HTTP/1.1
   ... Authorization: Basic %s:%s
   ... """ % (user_name, user_password), handle_errors=False)
   HTTP/1.1 200 OK
   Content-Length: 0
   ...
 
-  >>> self.folder.object.title_or_id()
+  >>> self.folder.index_html.title_or_id()
   'Baz'
 

Index: testFunctionalDocTest.py
===================================================================
RCS file: /cvsroot/collective/ZopeTestCase/doctest/testFunctionalDocTest.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- testFunctionalDocTest.py	1 Feb 2005 20:28:50 -0000	1.5
+++ testFunctionalDocTest.py	7 Feb 2005 22:01:29 -0000	1.6
@@ -9,21 +9,18 @@
     execfile(os.path.join(sys.path[0], 'framework.py'))
 
 from Testing import ZopeTestCase
-
 ZopeTestCase.installProduct('PythonScripts')
+
 package = 'Testing.ZopeTestCase.doctest'
 
 
 def setUp(self):
     '''This method will run after the test_class' setUp.
     '''
-    self.folder.addDTMLMethod('index_html', file='foo')
-
-    factory = self.folder.manage_addProduct['PythonScripts']
-    factory.manage_addPythonScript('script')
-    self.folder.script.ZPythonScript_edit('a=0', 'return a+1')
+    self.folder.addDTMLDocument('index_html', file='index')
 
-    self.folder.manage_addFolder('object', '')
+    self.folder.manage_addProduct['PythonScripts'].manage_addPythonScript('script')
+    self.folder.script.ZPythonScript_edit(params='a=0', body='return a+1')
 
     change_title = '''<dtml-call "manage_changeProperties(title=REQUEST.get('title'))">'''
     self.folder.addDTMLMethod('change_title', file=change_title)