update tests since LibreOffice 3.3 supports more document types than OpenOffice.org 3.2.1.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@43056 20353a03-c40f-0410-a6d1-a30d3c3de9de

cloudooo/handler/ooo/tests/testMimemapper.py

@@ -35,7 +35,8 @@ text_expected_tuple = (
     ('doc', 'Microsoft Word 6.0'),
     ('doc', 'Microsoft Word 95'),
     ('doc', 'Microsoft Word 97/2000/XP'),
-    # ('docx', 'Microsoft Word 2007 XML'),
+    ('docx', 'Microsoft Word 2007 XML'),
+    ('docx', 'Office Open XML Text'),
     ('html', 'HTML Document (OpenOffice.org Writer)'),
     ('html', 'XHTML'),
     ('odt', 'ODF Text Document'),
@@ -114,7 +115,7 @@ presentation_expected_tuple = (
     ('png', 'PNG - Portable Network Graphic'),
     ('pot', 'Microsoft PowerPoint 97/2000/XP Template'),
     ('ppm', 'PPM - Portable Pixelmap'),
-    # ('pps', 'Microsoft PowerPoint 97/2000/XP'),
+    ('pps', 'Microsoft PowerPoint 97/2000/XP'),
     ('ppt', 'Microsoft PowerPoint 97/2000/XP'),
     ('ras', 'RAS - Sun Raster Image'),
     ('sda', 'StarDraw 5.0 (OpenOffice.org Impress)'),

cloudooo/handler/ooo/tests/testServer.py

@@ -49,6 +49,8 @@ class TestServer(CloudoooTestCase):
     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'],