x2t: add docy tests with image

cloudooo/handler/x2t/tests/testX2tHandler.py

@@ -58,6 +58,29 @@ class TestHandler(HandlerTestCase):
     y_body_data = ZipFile(StringIO(y_data)).open("body.txt").read()
     self.assertTrue(y_body_data.startswith("XLSY;v2;10579;"), "%r... does not start with 'XLSY;v2;10579;'" % (y_body_data[:20],))
 
+  def testConvertDocx(self):
+    """Test conversion of docx to docy and back"""
+    y_data = Handler(self.tmp_url, open("data/test_with_image.docx").read(), "docx", **self.kw).convert("docy")
+    y_zip = ZipFile(StringIO(y_data))
+    y_body_data = y_zip.open("body.txt").read()
+    self.assertTrue(y_body_data.startswith("DOCY;v5;2795;"), "%r... does not start with 'DOCY;v5;2795;'" % (y_body_data[:20],))
+    y_zip.open("media/image1.png")
+
+    x_data = Handler(self.tmp_url, y_data, "docy", **self.kw).convert("docx")
+    # magic inspired by https://github.com/minad/mimemagic/pull/19/files
+    self.assertIn("word/", x_data[:2000])
+
+  def testConvertDocy(self):
+    """Test conversion of docy to docx and back"""
+    x_data = Handler(self.tmp_url, open("data/test_with_image.docy").read(), "docy", **self.kw).convert("docx")
+    self.assertIn("word/", x_data[:2000])
+
+    y_data = Handler(self.tmp_url, x_data, "docx", **self.kw).convert("docy")
+    y_zip = ZipFile(StringIO(y_data))
+    y_body_data = y_zip.open("body.txt").read()
+    self.assertTrue(y_body_data.startswith("DOCY;v5;7519;"), "%r... does not start with 'DOCY;v5;7519;'" % (y_body_data[:20],))
+    y_zip.open("media/image1.png")
+
   def testgetMetadataFromImage(self):
     """Test getMetadata not implemented form yformats"""
     handler = Handler(self.tmp_url, "", "xlsy", **self.kw)

cloudooo/handler/x2t/tests/testX2tServer.py

@@ -35,10 +35,14 @@ class TestServer(TestCase):
     return [
       (join('data', 'test.xlsx'), "xlsx", "xlsy", "application/zip"),
       (join('data', 'test.xlsy'), "xlsy", "xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"),
+      (join('data', 'test_with_image.docx'), "docx", "docy", "application/zip"),
+      # Here, the content type should be application/vnd.openxmlformats-officedocument.wordprocessingml.document
+      # but "magic" seems to not detect it correctly. However, the document can be read correctly by LibreOffice.
+      (join('data', 'test_with_image.docy'), "docy", "docx", "application/octet-stream"),
     ]
 
   def testConvertHtmltoPdf(self):
-    """Converts xlsx to xlsy and xlsy to xlsx"""
+    """Converts xlsx,docx to their y format and y to x"""
     self.runConversionList(self.ConversionScenarioList())
 
   def FaultConversionScenarioList(self):