[Erp5-report] r44486 gabriel.oliveira - in /experimental/bt5/erp5_experimental_cloudooo_web...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 22 08:40:51 CET 2011
Author: gabriel.oliveira
Date: Tue Mar 22 08:40:51 2011
New Revision: 44486
URL: http://svn.erp5.org?rev=44486&view=rev
Log:
2011-03-22 gabriel.oliveira
* Refactored objects due to updated erp5_experimental_web_service portal types
* Added a simple test - not finished yet
Added:
experimental/bt5/erp5_experimental_cloudooo_web_service/TestTemplateItem/
experimental/bt5/erp5_experimental_cloudooo_web_service/TestTemplateItem/testCloudoooWebService.py
experimental/bt5/erp5_experimental_cloudooo_web_service/bt/template_test_id_list
Modified:
experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_convertFile.xml
experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getAllowedExtensionList.xml
experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getFileMetadataItemList.xml
experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_updateFileMetadata.xml
experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/cloudooo.xml
experimental/bt5/erp5_experimental_cloudooo_web_service/bt/change_log
experimental/bt5/erp5_experimental_cloudooo_web_service/bt/revision
Modified: experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_convertFile.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_convertFile.xml?rev=44486&r1=44485&r2=44486&view=diff
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_convertFile.xml [utf8] (original)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_convertFile.xml [utf8] Tue Mar 22 08:40:51 2011
@@ -7,47 +7,18 @@
<pickle>
<dictionary>
<item>
- <key> <string>_local_properties</string> </key>
- <value>
- <tuple>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>source_object_type</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>string</string> </value>
- </item>
- </dictionary>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>brain_builder_script</string> </key>
- <value> <string>yyy</string> </value>
- </item>
- <item>
<key> <string>categories</string> </key>
<value>
<tuple>
- <string>source/portal_web_services/cloudooo</string>
+ <string>specialise/portal_web_services/cloudooo</string>
</tuple>
</value>
</item>
<item>
- <key> <string>data</string> </key>
- <value> <string>PGh0bWw+PGJvZHk+cXVhbCBlaCE8L2JvZHk+PC9odG1sPg==\\n</string> </value>
- </item>
- <item>
<key> <string>default_reference</string> </key>
<value> <string>convertFile</string> </value>
</item>
<item>
- <key> <string>destination_object_type</string> </key>
- <value> <string>PDF</string> </value>
- </item>
- <item>
<key> <string>id</string> </key>
<value> <string>Cloudooo_convertFile</string> </value>
</item>
@@ -55,14 +26,6 @@
<key> <string>portal_type</string> </key>
<value> <string>Web Service Data Query</string> </value>
</item>
- <item>
- <key> <string>source_object_type</string> </key>
- <value> <string>PDF</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>19</string> </value>
- </item>
</dictionary>
</pickle>
</record>
Modified: experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getAllowedExtensionList.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getAllowedExtensionList.xml?rev=44486&r1=44485&r2=44486&view=diff
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getAllowedExtensionList.xml [utf8] (original)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getAllowedExtensionList.xml [utf8] Tue Mar 22 08:40:51 2011
@@ -10,7 +10,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
- <string>source/portal_web_services/cloudooo</string>
+ <string>specialise/portal_web_services/cloudooo</string>
</tuple>
</value>
</item>
Modified: experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getFileMetadataItemList.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getFileMetadataItemList.xml?rev=44486&r1=44485&r2=44486&view=diff
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getFileMetadataItemList.xml [utf8] (original)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_getFileMetadataItemList.xml [utf8] Tue Mar 22 08:40:51 2011
@@ -10,11 +10,15 @@
<key> <string>categories</string> </key>
<value>
<tuple>
- <string>source/portal_web_service/cloudooo</string>
+ <string>specialise/portal_web_services/cloudooo</string>
</tuple>
</value>
</item>
<item>
+ <key> <string>default_reference</string> </key>
+ <value> <string>getFileMetadataItemList</string> </value>
+ </item>
+ <item>
<key> <string>id</string> </key>
<value> <string>Cloudooo_getFileMetadataItemList</string> </value>
</item>
Modified: experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_updateFileMetadata.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_updateFileMetadata.xml?rev=44486&r1=44485&r2=44486&view=diff
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_updateFileMetadata.xml [utf8] (original)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/Cloudooo_updateFileMetadata.xml [utf8] Tue Mar 22 08:40:51 2011
@@ -10,11 +10,15 @@
<key> <string>categories</string> </key>
<value>
<tuple>
- <string>source/portal_web_service/cloudooo</string>
+ <string>specialise/portal_web_services/cloudooo</string>
</tuple>
</value>
</item>
<item>
+ <key> <string>default_reference</string> </key>
+ <value> <string>updateFileMetadata</string> </value>
+ </item>
+ <item>
<key> <string>id</string> </key>
<value> <string>Cloudooo_updateFileMetadata</string> </value>
</item>
Modified: experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/cloudooo.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/cloudooo.xml?rev=44486&r1=44485&r2=44486&view=diff
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/cloudooo.xml [utf8] (original)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/PathTemplateItem/portal_web_services/cloudooo.xml [utf8] Tue Mar 22 08:40:51 2011
@@ -7,6 +7,31 @@
<pickle>
<dictionary>
<item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>resource_title</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>string</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>resource/xml-rpc</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
<key> <string>id</string> </key>
<value> <string>cloudooo</string> </value>
</item>
@@ -15,6 +40,10 @@
<value> <string>Web Service Data Adapter</string> </value>
</item>
<item>
+ <key> <string>resource_title</string> </key>
+ <value> <string>soap</string> </value>
+ </item>
+ <item>
<key> <string>title</string> </key>
<value> <string>Cloudooo</string> </value>
</item>
Added: experimental/bt5/erp5_experimental_cloudooo_web_service/TestTemplateItem/testCloudoooWebService.py
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/TestTemplateItem/testCloudoooWebService.py?rev=44486&view=auto
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/TestTemplateItem/testCloudoooWebService.py (added)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/TestTemplateItem/testCloudoooWebService.py [utf8] Tue Mar 22 08:40:51 2011
@@ -0,0 +1,164 @@
+##############################################################################
+#
+# Copyright (c) 2002-2011 Nexedi SA and Contributors. All Rights Reserved.
+# Gabriel Lima <ciberglo at gmail.com>
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+##############################################################################
+
+from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
+from Products.ERP5Type.tests.ERP5TypeTestCase import _getConversionServerDict
+
+class TestCloudoooWebService(ERP5TypeTestCase):
+ """
+ ERP5 Cloudooo Web Service - test connection mechanism
+ """
+
+ def getTitle(self):
+ return "ERP5 Cloudooo Web Service - sample request"
+
+ def getBusinessTemplateList(self):
+ """
+ Tuple of Business Templates we need to install
+ """
+ return ('erp5_base',
+ 'erp5_experimental_web_service',
+ 'erp5_experimental_cloudooo_web_service')
+
+ def afterSetUp(self):
+ """
+ This is ran before anything, used to set the environment
+ """
+ # here, you can create the categories and objects your test will depend on
+ self.login()
+ self.portal = self.getPortal()
+ self.setSystemPreference()
+ self.setDefaultSitePreference()
+ self.portal_web_services = getattr(self.portal, 'portal_web_services')
+
+ self.portal_web_services.cloudooo.setUrlString("http://localhost:8011/")
+
+ #create objects
+ #XXX: Implement dynamic conversion server address and port
+ self.conversion_dict = _getConversionServerDict()
+ print self.conversion_dict.items()
+# conversion_server_url = ':'.join([self.conversion_dict['hostname'], self.convertion_dict['port']])
+
+ # XXX Duplicated list of filters
+ self.text_expected_list = [['doc', 'Microsoft Word 6.0'],
+ ['doc', 'Microsoft Word 95'],
+ ['doc', 'Microsoft Word 97/2000/XP'],
+ ['docx', 'Microsoft Word 2007 XML'],
+ ['docx', 'Office Open XML Text'],
+ ['htm', 'HTML Document (OpenOffice.org Writer)'],
+ ['html', 'HTML Document (OpenOffice.org Writer)'],
+ ['html', 'XHTML'], ['odt', 'ODF Text Document'],
+ ['ott', 'ODF Text Document Template'],
+ ['pdf', 'PDF - Portable Document Format'],
+ ['rtf', 'Rich Text Format'], ['sdw', 'StarWriter 3.0'],
+ ['sdw', 'StarWriter 4.0'], ['sdw', 'StarWriter 5.0'],
+ ['sxw', 'OpenOffice.org 1.0 Text Document'],
+ ['txt', 'Text'], ['txt', 'Text Encoded'],
+ ['xhtml', 'XHTML'], ['pdb', 'AportisDoc (Palm)'],
+ ['psw', 'Pocket Word']]
+
+ self.text_expected_list.sort()
+
+ self.presentation_expected_list = [['bmp', 'BMP - Windows Bitmap'],
+ ['emf', 'EMF - Enhanced Metafile'],
+ ['eps', 'EPS - Encapsulated PostScript'],
+ ['gif', 'GIF - Graphics Interchange Format'],
+ ['htm', 'HTML Document (OpenOffice.org Impress)'],
+ ['html', 'HTML Document (OpenOffice.org Impress)'],
+ ['html', 'XHTML'], ['jfif', 'JPEG - Joint Photographic Experts Group'],
+ ['jif', 'JPEG - Joint Photographic Experts Group'],
+ ['jpe', 'JPEG - Joint Photographic Experts Group'],
+ ['jpeg', 'JPEG - Joint Photographic Experts Group'],
+ ['jpg', 'JPEG - Joint Photographic Experts Group'],
+ ['met', 'MET - OS/2 Metafile'], ['odg', 'ODF Drawing (Impress)'],
+ ['odp', 'ODF Presentation'],
+ ['otp', 'ODF Presentation Template'],
+ ['pbm', 'PBM - Portable Bitmap'], ['pct', 'PCT - Mac Pict'],
+ ['pdf', 'PDF - Portable Document Format'],
+ ['pgm', 'PGM - Portable Graymap'], ['pict', 'PCT - Mac Pict'],
+ ['png', 'PNG - Portable Network Graphic'],
+ ['pot', 'Microsoft PowerPoint 97/2000/XP Template'],
+ ['ppm', 'PPM - Portable Pixelmap'],
+ ['pps', 'Microsoft PowerPoint 97/2000/XP'],
+ ['ppt', 'Microsoft PowerPoint 97/2000/XP'],
+ ['ras', 'RAS - Sun Raster Image'],
+ ['sda', 'StarDraw 5.0 (OpenOffice.org Impress)'],
+ ['sdd', 'StarDraw 3.0 (OpenOffice.org Impress)'],
+ ['sdd', 'StarImpress 4.0'], ['sdd', 'StarImpress 5.0'],
+ ['svg', 'SVG - Scalable Vector Graphics'],
+ ['svm', 'SVM - StarView Metafile'],
+ ['sxd', 'OpenOffice.org 1.0 Drawing (OpenOffice.org Impress)'],
+ ['sxi', 'OpenOffice.org 1.0 Presentation'],
+ ['tif', 'TIFF - Tagged Image File Format'],
+ ['tiff', 'TIFF - Tagged Image File Format'],
+ ['wmf', 'WMF - Windows Metafile'],
+ ['xhtml', 'XHTML'], ['xpm', 'XPM - X PixMap']]
+
+ self.presentation_expected_list.sort()
+
+ def setDefaultSitePreference(self):
+ default_pref = self.portal.portal_preferences.default_site_preference
+ #XXX: Implement dynamic conversion server address and port
+# conversion_dict = self.conversion_dict
+# default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname'])
+# default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port'])
+ default_pref.setPreferredOoodocServerAddress('localhost')
+ default_pref.setPreferredOoodocServerPortNumber('8011')
+ if self.portal.portal_workflow.isTransitionPossible(default_pref, 'enable'):
+ default_pref.enable()
+ return default_pref
+
+ def setSystemPreference(self):
+ portal_type = 'System Preference'
+ preference_list = self.portal.portal_preferences.contentValues(
+ portal_type=portal_type)
+ if not preference_list:
+ preference = self.portal.portal_preferences.newContent(
+ portal_type=portal_type)
+ else:
+ preference = preference_list[0]
+ if self.portal.portal_workflow.isTransitionPossible(preference, 'enable'):
+ preference.enable()
+ return preference
+
+ def testGetAllowedExtensionListByType(self):
+ """
+ Test if connection return requested extension lists
+ """
+ getAllowedExtensionList = getattr(self.portal_web_services, 'Cloudooo_getAllowedExtensionList')
+ text_request = {'document_type': "text"}
+ text_allowed_list = getAllowedExtensionList(text_request)
+ text_allowed_list.sort()
+ for arg in text_allowed_list:
+ self.assertTrue(arg in self.text_expected_list,
+ "%s not in %s" % (arg, self.text_expected_list))
+ request_dict = {'document_type': "presentation"}
+ presentation_allowed_list = getAllowedExtensionList(request_dict)
+ presentation_allowed_list.sort()
+ for arg in presentation_allowed_list:
+ self.assertTrue(arg in self.presentation_expected_list,
+ "%s not in %s" % (arg, self.presentation_expected_list))
Modified: experimental/bt5/erp5_experimental_cloudooo_web_service/bt/change_log
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/bt/change_log?rev=44486&r1=44485&r2=44486&view=diff
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/bt/change_log [utf8] (original)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/bt/change_log [utf8] Tue Mar 22 08:40:51 2011
@@ -1,3 +1,7 @@
+2011-03-22 gabriel.oliveira
+* Refactored objects due to updated erp5_experimental_web_service portal types
+* Added a simple test - not finished yet
+
2011-03-21 gabriel.oliveira
* Added erp5_experimental_web_service objects used by this business template
Modified: experimental/bt5/erp5_experimental_cloudooo_web_service/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/bt/revision?rev=44486&r1=44485&r2=44486&view=diff
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/bt/revision [utf8] Tue Mar 22 08:40:51 2011
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
Added: experimental/bt5/erp5_experimental_cloudooo_web_service/bt/template_test_id_list
URL: http://svn.erp5.org/experimental/bt5/erp5_experimental_cloudooo_web_service/bt/template_test_id_list?rev=44486&view=auto
==============================================================================
--- experimental/bt5/erp5_experimental_cloudooo_web_service/bt/template_test_id_list (added)
+++ experimental/bt5/erp5_experimental_cloudooo_web_service/bt/template_test_id_list [utf8] Tue Mar 22 08:40:51 2011
@@ -0,0 +1 @@
+testCloudoooWebService
\ No newline at end of file
More information about the Erp5-report
mailing list