[z3-checkins] r33739 - in z3/deliverance/branches/packaged/deliverance: . test-data

ltucker at codespeak.net ltucker at codespeak.net
Wed Oct 25 21:57:05 CEST 2006 

Author: ltucker
Date: Wed Oct 25 21:57:02 2006
New Revision: 33739

Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
   z3/deliverance/branches/packaged/deliverance/utils.py
Log:
this seems to be a far less horrible change to cover error generation for non-ascii pages

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	Wed Oct 25 21:57:02 2006
@@ -74,8 +74,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;append theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	Wed Oct 25 21:57:02 2006
@@ -125,8 +125,7 @@
      </head>
      <body>
        <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;append-or-replace theme=".//div" content=".//div"/&gt;
-	 <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div&gt;Dummy Content&lt;/div&gt;
-&lt;div&gt;Dummy Content&lt;/div&gt;
+	 <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div&gt;Dummy Content&lt;/div&gt;&lt;div&gt;Dummy Content&lt;/div&gt;
        </textarea></div>
        <div>Dummy Content</div>
        <div>Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	Wed Oct 25 21:57:02 2006
@@ -70,8 +70,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;copy theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	Wed Oct 25 21:57:02 2006
@@ -74,8 +74,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;prepend theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Wed Oct 25 21:57:02 2006
@@ -82,8 +82,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;replace theme="//div[@class='foo']" content="//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Wed Oct 25 21:57:02 2006
@@ -103,7 +103,7 @@
             textArea.attrib['readonly'] = 'readonly'
             textArea.text = ''
             for el in elts:
-                textArea.append(el)
+                textArea.text += etree.tostring(el)
             d.append(textArea)
         return d

More information about the z3-checkins mailing list