[Checkins] SVN: z3c.formdemo/trunk/ Fixed all test failures against
the trunk of form and formui.
Stephan Richter
srichter at cosmos.phy.tufts.edu
Tue Sep 25 14:13:37 EDT 2007
Log message for revision 80034:
Fixed all test failures against the trunk of form and formui.
Changed:
U z3c.formdemo/trunk/CHANGES.txt
U z3c.formdemo/trunk/src/z3c/formdemo/message/README.txt
U z3c.formdemo/trunk/src/z3c/formdemo/questionnaire/README.txt
U z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt
U z3c.formdemo/trunk/src/z3c/formdemo/sqlmessage/README.txt
U z3c.formdemo/trunk/src/z3c/formdemo/widgets/README.txt
-=-
Modified: z3c.formdemo/trunk/CHANGES.txt
===================================================================
--- z3c.formdemo/trunk/CHANGES.txt 2007-09-25 17:30:44 UTC (rev 80033)
+++ z3c.formdemo/trunk/CHANGES.txt 2007-09-25 18:13:37 UTC (rev 80034)
@@ -8,7 +8,10 @@
- Feature: Added a single checkbox widget for a boolean to the "all widgets"
demo.
+- Refactoring: Adjusted all tests to work with the new layout format in formui
+ and form.
+
Version 1.4.0 (8/24/2007)
-------------------------
Modified: z3c.formdemo/trunk/src/z3c/formdemo/message/README.txt
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/message/README.txt 2007-09-25 17:30:44 UTC (rev 80033)
+++ z3c.formdemo/trunk/src/z3c/formdemo/message/README.txt 2007-09-25 18:13:37 UTC (rev 80034)
@@ -51,7 +51,19 @@
>>> testing.printElement(user, "//h1")
<h1>
- A cool Hello World from Stephan on 7/1/07 !
+ A <span id="form-widgets-what" class="select-widget required choice-field">
+ <span class="selected-option">cool</span>
+ </span>
+ Hello World
+ from <span id="form-widgets-who"
+ class="text-widget required textline-field">
+ Stephan
+ </span>
+ <BLANKLINE>
+ on <span id="form-widgets-when" class="text-widget required date-field">
+ 7/1/07
+ </span>
+ !
</h1>
The message's edit form can be accessed by clicking on the "Edit Message"
@@ -86,5 +98,17 @@
>>> testing.printElement(user, "//h1")
<h1>
- A best Hello World from Roger on 7/1/07 !
+ A <span id="form-widgets-what" class="select-widget required choice-field">
+ <span class="selected-option">best</span>
+ </span>
+ Hello World
+ from <span id="form-widgets-who"
+ class="text-widget required textline-field">
+ Roger
+ </span>
+ <BLANKLINE>
+ on <span id="form-widgets-when" class="text-widget required date-field">
+ 7/1/07
+ </span>
+ !
</h1>
Modified: z3c.formdemo/trunk/src/z3c/formdemo/questionnaire/README.txt
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/questionnaire/README.txt 2007-09-25 17:30:44 UTC (rev 80033)
+++ z3c.formdemo/trunk/src/z3c/formdemo/questionnaire/README.txt 2007-09-25 18:13:37 UTC (rev 80034)
@@ -36,12 +36,17 @@
>>> user.getControl('Name').value = u'Stephan Richter'
>>> user.getControl('Age').value = u'27'
- >>> user.getControl('yes', index=0).click()
- >>> user.getControl('no', index=1).click()
- >>> user.getControl('yes', index=2).click()
- >>> user.getControl('no', index=3).click()
+ >>> user.getControl(name='form.widgets.zope2:list')\
+ ... .getControl(value='true').click()
+ >>> user.getControl(name='form.widgets.plone:list')\
+ ... .getControl(value='false').click()
+ >>> user.getControl(name='form.widgets.zope3:list')\
+ ... .getControl(value='true').click()
+ >>> user.getControl(name='form.widgets.five:list')\
+ ... .getControl(value='false').click()
- >>> user.getControl('yes', index=4).click()
+ >>> user.getControl(name='form.widgets.contributor:list')\
+ ... .getControl(value='true').click()
>>> user.getControl('have you contributed').value = u'5'
>>> user.getControl('What is your Zope Id?').value = u'srichter'
@@ -51,33 +56,52 @@
screen. Now the table has an entry:
>>> testing.printElement(user, "//table/tbody/tr[1]")
- <tr class="odd"><td
- class="sorted-on">
- Stephan Richter
+ <tr class="odd"><td class="sorted-on">
+ <span id="form-widgets-name"
+ class="text-widget required textline-field">
+ Stephan Richter
+ </span>
</td>
<td class="right">
- 27
+ <span id="form-widgets-age" class="text-widget required int-field">
+ 27
+ </span>
</td>
<td class="right">
- yes
+ <span id="form-widgets-zope2" class="radio-widget required bool-field">
+ <span class="selected-option">yes</span>
+ </span>
</td>
<td class="right">
- no
+ <span id="form-widgets-plone" class="radio-widget required bool-field">
+ <span class="selected-option">no</span>
+ </span>
</td>
<td class="right">
- yes
+ <span id="form-widgets-zope3" class="radio-widget required bool-field">
+ <span class="selected-option">yes</span>
+ </span>
</td>
<td class="right">
- no
+ <span id="form-widgets-five" class="radio-widget required bool-field">
+ <span class="selected-option">no</span>
+ </span>
</td>
<td class="right">
- yes
+ <span id="form-widgets-contributor"
+ class="radio-widget required bool-field">
+ <span class="selected-option">yes</span>
+ </span>
</td>
<td class="right">
- 5
+ <span id="form-widgets-years" class="text-widget int-field">
+ 5
+ </span>
</td>
<td class="right">
- srichter
+ <span id="form-widgets-zopeId" class="text-widget textline-field">
+ srichter
+ </span>
</td>
</tr>
@@ -88,12 +112,17 @@
>>> user.getControl('Name').value = u'Roger Ineichen'
>>> user.getControl('Age').value = u'39'
- >>> user.getControl('yes', index=0).click()
- >>> user.getControl('yes', index=1).click()
- >>> user.getControl('yes', index=2).click()
- >>> user.getControl('no', index=3).click()
+ >>> user.getControl(name='form.widgets.zope2:list')\
+ ... .getControl(value='true').click()
+ >>> user.getControl(name='form.widgets.plone:list')\
+ ... .getControl(value='true').click()
+ >>> user.getControl(name='form.widgets.zope3:list')\
+ ... .getControl(value='true').click()
+ >>> user.getControl(name='form.widgets.five:list')\
+ ... .getControl(value='false').click()
- >>> user.getControl('yes', index=4).click()
+ >>> user.getControl(name='form.widgets.contributor:list')\
+ ... .getControl(value='true').click()
>>> user.getControl('have you contributed').value = u'4'
>>> user.getControl('What is your Zope Id?').value = u'projekt01'
@@ -102,7 +131,7 @@
Now that we have two entries, we can use the table headers cells to sort
them. By default they are sorted by name:
- >>> testing.printElement(user, "//table/tbody/tr/td[1]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[1]/span/text()",
... multiple=True, serialize=False)
Roger Ineichen
Stephan Richter
@@ -113,7 +142,7 @@
>>> user.getLink('Name').click()
>>> user.getLink('Name').click()
- >>> testing.printElement(user, "//table/tbody/tr/td[1]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[1]/span/text()",
... multiple=True, serialize=False)
Stephan Richter
Roger Ineichen
@@ -122,7 +151,7 @@
once sorts it in ascending order:
>>> user.getLink('Age').click()
- >>> testing.printElement(user, "//table/tbody/tr/td[2]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[2]/span/text()",
... multiple=True, serialize=False)
27
39
@@ -130,7 +159,7 @@
Clicking it again, reverses the order:
>>> user.getLink('Age').click()
- >>> testing.printElement(user, "//table/tbody/tr/td[2]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[2]/span/text()",
... multiple=True, serialize=False)
39
27
Modified: z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt 2007-09-25 17:30:44 UTC (rev 80033)
+++ z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt 2007-09-25 18:13:37 UTC (rev 80034)
@@ -45,13 +45,21 @@
>>> testing.printElement(user, "//table/tbody/tr[2]")
<tr class="even"><td class="sorted-on">
- Richter
+ <span id="candidate-0-widgets-lastName"
+ class="text-widget required textline-field">
+ Richter
+ </span>
</td>
<td class="">
- Stephan
+ <span id="candidate-0-widgets-firstName"
+ class="text-widget required textline-field">
+ Stephan
+ </span>
</td>
<td class="">
- good
+ <span id="candidate-0-widgets-rating" class="select-widget choice-field">
+ <span class="selected-option">good</span>
+ </span>
</td>
<td class="">
<input type="submit" ... value="Edit" /></td>
@@ -90,7 +98,7 @@
diaplay the row:
>>> user.getControl('Cancel').click()
- >>> testing.printElement(user, "//table/tbody/tr[2]/td[3]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr[2]/td[3]/span/span/text()",
... serialize=False)
good
@@ -105,7 +113,7 @@
saving the user from accessive button clicking. Of course, the data is
properly stored.
- >>> testing.printElement(user, "//table/tbody/tr[2]/td[3]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr[2]/td[3]/span/span/text()",
... serialize=False)
average
@@ -113,7 +121,7 @@
column sorting feature that comes with the table framework. By default they
are sorted by last name:
- >>> testing.printElement(user, "//table/tbody/tr/td[1]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[1]/span/text()",
... multiple=True, serialize=False)
Ineichen
Richter
@@ -124,7 +132,7 @@
>>> user.getLink('Last Name').click()
>>> user.getLink('Last Name').click()
- >>> testing.printElement(user, "//table/tbody/tr/td[1]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[1]/span/text()",
... multiple=True, serialize=False)
Richter
Ineichen
@@ -133,7 +141,7 @@
clicking on it once sorts it in ascending order:
>>> user.getLink('First Name').click()
- >>> testing.printElement(user, "//table/tbody/tr/td[2]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[2]/span/text()",
... multiple=True, serialize=False)
Roger
Stephan
@@ -141,7 +149,7 @@
Clicking it again, reverses the order:
>>> user.getLink('First Name').click()
- >>> testing.printElement(user, "//table/tbody/tr/td[2]/text()",
+ >>> testing.printElement(user, "//table/tbody/tr/td[2]/span/text()",
... multiple=True, serialize=False)
Stephan
Roger
Modified: z3c.formdemo/trunk/src/z3c/formdemo/sqlmessage/README.txt
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/sqlmessage/README.txt 2007-09-25 17:30:44 UTC (rev 80033)
+++ z3c.formdemo/trunk/src/z3c/formdemo/sqlmessage/README.txt 2007-09-25 18:13:37 UTC (rev 80034)
@@ -99,7 +99,23 @@
>>> user.getLink('Stephan').click()
>>> testing.printElement(user, "//h1")
<h1>
- A cool Hello World from Stephan on 7/1/07 !
+ A
+ <span id="form-widgets-what"
+ class="select-widget required choice-field">
+ <span class="selected-option">cool</span>
+ </span>
+ Hello World
+ from
+ <span id="form-widgets-who"
+ class="text-widget required textline-field">
+ Stephan
+ </span>
+ on
+ <span id="form-widgets-when"
+ class="text-widget required date-field">
+ 7/1/07
+ </span>
+ !
</h1>
The message's edit form can be accessed by clicking on the "Edit Message"
@@ -134,7 +150,23 @@
>>> testing.printElement(user, "//h1")
<h1>
- A best Hello World from Roger on 7/1/07 !
+ A
+ <span id="form-widgets-what"
+ class="select-widget required choice-field">
+ <span class="selected-option">best</span>
+ </span>
+ Hello World
+ from
+ <span id="form-widgets-who"
+ class="text-widget required textline-field">
+ Roger
+ </span>
+ on
+ <span id="form-widgets-when"
+ class="text-widget required date-field">
+ 7/1/07
+ </span>
+ !
</h1>
From the display screen you can also return to the overview:
Modified: z3c.formdemo/trunk/src/z3c/formdemo/widgets/README.txt
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/widgets/README.txt 2007-09-25 17:30:44 UTC (rev 80033)
+++ z3c.formdemo/trunk/src/z3c/formdemo/widgets/README.txt 2007-09-25 18:13:37 UTC (rev 80034)
@@ -35,7 +35,8 @@
>>> user.getControl('ASCII', index=0).value += u' Add on.'
>>> user.getControl('ASCII Line').value += u' Add on.'
- >>> user.getControl('no', index=0).click() # Boolean
+ >>> user.getControl(name='form.widgets.boolField:list')\
+ ... .getControl(value='false').click() # Boolean
>>> user.getControl('Bytes', index=0).add_file(
... cStringIO.StringIO('File contents'), 'text/plain', 'test.txt')
>>> user.getControl('Bytes Line').value += u' Add on.'
More information about the Checkins
mailing list