[Erp5-report] r41071 hugo.maia - in /erp5/trunk/utils/cloudooo/cloudooo: ./ tests/

[nobody at svn.erp5.org]

Author: hugo.maia
Date: Thu Dec  2 21:52:29 2010
New Revision: 41071

URL: http://svn.erp5.org?rev=41071&view=rev
Log:
Add parsed_content attribute to OdfDocument

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/document.py
    erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/document.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/document.py?rev=41071&r1=41070&r2=41071&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/document.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/document.py [utf8] Thu Dec  2 21:52:29 2010
@@ -34,6 +34,7 @@ from zope.interface import implements
 from zipfile import ZipFile, is_zipfile
 from shutil import rmtree
 from StringIO import StringIO
+from lxml import etree
 from interfaces.document import IDocument, IOdfDocument
 
 
@@ -154,6 +155,8 @@ class OdfDocument(object):
     """
     self._zipfile = ZipFile(StringIO(data))
     self.source_format = source_format
+    # XXX - I'm not confortable with this. Maybe it should be on OOGranulate
+    self.parsed_content = etree.fromstring(self.getContentXml())
 
   def getContentXml(self):
     """Returns the content.xml file as string"""

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py?rev=41071&r1=41070&r2=41071&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py [utf8] Thu Dec  2 21:52:29 2010
@@ -28,6 +28,7 @@
 
 import unittest
 from zipfile import ZipFile
+from lxml import etree
 from cloudoooTestCase import cloudoooTestCase, make_suite
 from cloudooo.document import OdfDocument
 
@@ -39,12 +40,12 @@ class TestOdfDocument(cloudoooTestCase):
 
   def testReceivedGoodFile(self):
     """Test if received path is from a good document returing an ZipFile"""
-    self.assertEquals(isinstance(self.oodocument._zipfile, ZipFile), True)
+    self.assertTrue(isinstance(self.oodocument._zipfile, ZipFile))
 
   def testGetContentXml(self):
     """Test if the getContentXml method returns the content.xml file"""
     content_xml = self.oodocument.getContentXml()
-    self.assertEquals('The content of this file is just' in content_xml, True)
+    self.assertTrue('The content of this file is just' in content_xml)
 
   def testGetExistentFile(self):
     """Test if the getFile method returns the requested file"""
@@ -56,6 +57,12 @@ class TestOdfDocument(cloudoooTestCase):
     requested_file = self.oodocument.getFile('not_present.xml')
     self.assertEquals(requested_file, None)
 
+  def testParseContent(self):
+    """Test if the _parsed_content attribute is the parsed content.xml"""
+    self.assertTrue(isinstance(self.oodocument.parsed_content, etree._Element))
+    self.assertTrue(self.oodocument.parsed_content.tag.endswith(
+                    'document-content'))
+
 
 def test_suite():
   return make_suite(TestOdfDocument)