[Erp5-report] r41104 hugo.maia - in /erp5/trunk/utils/cloudooo/cloudooo: granulate/ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Dec 3 16:43:09 CET 2010
Author: hugo.maia
Date: Fri Dec 3 16:43:09 2010
New Revision: 41104
URL: http://svn.erp5.org?rev=41104&view=rev
Log:
Refactoring
Modified:
erp5/trunk/utils/cloudooo/cloudooo/granulate/oogranulate.py
erp5/trunk/utils/cloudooo/cloudooo/tests/testOOGranulate.py
Modified: erp5/trunk/utils/cloudooo/cloudooo/granulate/oogranulate.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/granulate/oogranulate.py?rev=41104&r1=41103&r2=41104&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/granulate/oogranulate.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/granulate/oogranulate.py [utf8] Fri Dec 3 16:43:09 2010
@@ -83,10 +83,10 @@ class OOGranulate(object):
def getImageItemList(self):
"""Return a list of tuples with the id and title of image files"""
- xml_images = self._getElementsByTagName(self.document.parsed_content,
- 'draw:image')
+ xml_image_list = self._getElementsByTagName(self.document.parsed_content,
+ 'draw:image')
image_list = []
- for image in xml_images:
+ for image in xml_image_list:
title = self._getImageTitle(image)
id = image.values()[0].split('/')[-1]
image_list.append((id, title))
Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testOOGranulate.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testOOGranulate.py?rev=41104&r1=41103&r2=41104&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testOOGranulate.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testOOGranulate.py [utf8] Fri Dec 3 16:43:09 2010
@@ -39,27 +39,27 @@ class TestOOGranulate(cloudoooTestCase):
def testGetElementsByTagName(self):
"""Test if _getElementsByTagName() returns right elements list"""
- elements = self.oogranulate._getElementsByTagName(
+ element_list = self.oogranulate._getElementsByTagName(
self.oogranulate.document.parsed_content,
'draw:image')
- self.assertEquals(len(elements), 5)
- for element in elements:
+ self.assertEquals(len(element_list), 5)
+ for element in element_list:
self.assertTrue(element.tag.endswith('image'))
def testHasAncertor(self):
- images = self.oogranulate._getElementsByTagName(
+ image_list = self.oogranulate._getElementsByTagName(
self.oogranulate.document.parsed_content,
'draw:image')
- self.assertFalse(self.oogranulate._hasAncestor(images[0], 'text-box'))
- self.assertTrue(self.oogranulate._hasAncestor(images[0], 'frame'))
- self.assertTrue(self.oogranulate._hasAncestor(images[2], 'text-box'))
+ self.assertFalse(self.oogranulate._hasAncestor(image_list[0], 'text-box'))
+ self.assertTrue(self.oogranulate._hasAncestor(image_list[0], 'frame'))
+ self.assertTrue(self.oogranulate._hasAncestor(image_list[2], 'text-box'))
def testGetImageTitle(self):
- images = self.oogranulate._getElementsByTagName(
+ image_list = self.oogranulate._getElementsByTagName(
self.oogranulate.document.parsed_content,
'draw:image')
- self.assertEquals(self.oogranulate._getImageTitle(images[0]), '')
- self.assertEquals(self.oogranulate._getImageTitle(images[2]),
+ self.assertEquals(self.oogranulate._getImageTitle(image_list[0]), '')
+ self.assertEquals(self.oogranulate._getImageTitle(image_list[2]),
'Illustration 1: TioLive Logo')
def testgetTableItemList(self):
More information about the Erp5-report
mailing list