[Z3lab-checkins] r1826 - azax/trunk/tests

[svn]

Author: fschulze
Date: Wed Nov 16 09:42:20 2005
New Revision: 1826

Modified:
   azax/trunk/tests/test_azaxresponse.py
Log:
Use config.py to get etree.
Fixed tests to work again.

Modified: azax/trunk/tests/test_azaxresponse.py
==============================================================================
--- azax/trunk/tests/test_azaxresponse.py       (original)
+++ azax/trunk/tests/test_azaxresponse.py       Wed Nov 16 09:42:20 2005
@@ -21,9 +21,9 @@
 import unittest, os
 from zope.testing import doctest
 from Testing.ZopeTestCase import ZopeTestCase
-from lxml import etree
 
 from Products.azax.azaxresponse import AzaxResponse
+from Products.azax.config import etree
 
 class FakeResponse:
     _stuff = {}
@@ -33,41 +33,45 @@
 
 class AzaxResponseTestCase(ZopeTestCase):
 
+    def cleanupXMLForTesting(self, xml):
+        return xml.replace(' />', '/>')
+
     def test_instanciation(self):
         ob = AzaxResponse()
         self.assertNotEquals(ob, None)
 
     def test_str_(self):
         ob = AzaxResponse()
-        self.assertEquals(str(ob), '<selectors/>')
+        self.assertEquals(self.cleanupXMLForTesting(str(ob)), '<selectors/>')
 
     def test__createSelector(self):
         ob = AzaxResponse()
         selector = ob._createSelector('div.class')
-        self.assertEquals(str(ob),
+        self.assertEquals(self.cleanupXMLForTesting(str(ob)),
          
'<selectors><selector><value>div.class</value><commands/></selector></selectors>')
 
-        self.assertEquals(etree.tostring(selector),
+        
self.assertEquals(self.cleanupXMLForTesting(etree.tostring(selector.ob)),
          '<selector><value>div.class</value><commands/></selector>')
 
-    def test_updateTag(self):
+    def test_setHtmlAsChild(self):
         ob = AzaxResponse()
-        ob.updateTag('div.class', 'new_content')
-        self.assertEquals(str(ob),
-         
'<selectors><selector><value>div.class</value><commands><command><name>innerHTML</name><data>new_content</data></command></commands></selector></selectors>')
+        ob.setHtmlAsChild('div.class', 'new_content')
+        self.assertEquals(self.cleanupXMLForTesting(str(ob)),
+         
'<selectors><selector><value>div.class</value><commands><command><name>setHtmlAsChild</name><data
 name="html">new_content</data></command></commands></selector></selectors>')
 
     def test__getSelector(self):
         ob = AzaxResponse()
         selector = ob._createSelector('div.class')
         selector2 = ob._getSelector('div.class')
-        self.assertEquals(len(selector2), 1)
-        self.assertEquals(selector2[0], selector)
+        self.assertEquals(len(ob.selectors), 1)
+        self.assertEquals(selector2, selector)
 
     def test___call__(self):
         response = FakeResponse()
         ob = AzaxResponse(response)
-        ob.updateTag('div.class', 'new_content')
-        self.assertEquals(ob(), 
'<selectors><selector><value>div.class</value><commands><command><name>innerHTML</name><data>new_content</data></command></commands></selector></selectors>')
+        ob.setHtmlAsChild('div.class', 'new_content')
+        self.assertEquals(self.cleanupXMLForTesting(ob()),
+         
'<selectors><selector><value>div.class</value><commands><command><name>setHtmlAsChild</name><data
 name="html">new_content</data></command></commands></selector></selectors>')
 
         self.assertEquals(response._stuff['Content-Type'], 'text/xml')
 
@@ -76,3 +80,4 @@
         unittest.makeSuite(AzaxResponseTestCase),
         doctest.DocTestSuite('Products.azax.azaxresponse'),
         ))
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins