Write tests for msgmerge

 * Create basic tests to verify the functionality of msgmerge, specifically the merging of messages and their integration with a compendium.

 * Remove the definition of sort-output and sort-by-file, and add an additional check for input-files.

Author: soft-suroleb

babel/messages/frontend.py

@@ -1093,7 +1093,7 @@ def initialize_options(self):
         self.sort_by_file = False #
 
     def finalize_options(self):
-        if len(self.input_files) != 2:
+        if not self.input_files or len(self.input_files) != 2:
             raise OptionError('must be two po files')
         if not self.output_file:
             raise OptionError('you must specify the output file')
@@ -1105,11 +1105,6 @@ def finalize_options(self):
         elif self.width is not None:
             self.width = int(self.width)
 
-        if self.sort_output is None:
-            self.sort_output = False
-        if self.sort_by_file is None:
-            self.sort_by_file = True
-
     def run(self):
         def_file, ref_file = self.input_files
         with open(def_file, 'r') as pofile:
@@ -1132,6 +1127,7 @@ def run(self):
         if self.compendium:
             with open(self.compendium, 'r') as pofile:
                 compendium_catalog = read_po(pofile)
+
             for message in compendium_catalog:
                 if message.id in ref_catalog and not ref_catalog[message.id].string:
                     ref_catalog[message.id].string = message.string

tests/messages/test_frontend.py

@@ -926,6 +926,154 @@ def test_more_than(self):
         assert expected_content == actual_content
 
 
+class MergeMessagesTestCase(unittest.TestCase):
+
+    @freeze_time("1994-11-11")
+    def setUp(self):
+        self.olddir = os.getcwd()
+        os.chdir(data_dir)
+
+        self.dist = Distribution(TEST_PROJECT_DISTRIBUTION_DATA)
+        self.cmd = frontend.MessageMerge(self.dist)
+        self.cmd.initialize_options()
+
+        self.temp_def = f'{i18n_dir}/msgmerge_def.po'
+        self.temp_ref = f'{i18n_dir}/msgmerge_ref.pot'
+        self.compendium = f'{i18n_dir}/compenidum.po'
+        self.output_file = f'{i18n_dir}/msgmerge.po'
+
+        with open(self.temp_ref, 'wb') as file:
+            catalog = Catalog()
+            for word in ['word1', 'word2', 'word3', 'word4']:
+                catalog.add(word)
+            pofile.write_po(file, catalog)
+
+        with open(self.temp_def, 'wb') as file:
+            catalog = Catalog()
+            catalog.add('word1', string='Word 1')
+            catalog.add('word2', string='Word 2')
+            catalog.add('word3')
+            pofile.write_po(file, catalog)
+
+        with open(self.compendium, 'wb') as file:
+            catalog = Catalog()
+            catalog.add('word4', string='Word 4')
+            catalog.add('word5', string='Word 5')
+            pofile.write_po(file, catalog)
+
+    def tearDown(self):
+        for file in [self.temp_def, self.temp_ref, self.compendium, self.output_file]:
+            if os.path.isfile(file):
+                    os.unlink(file)
+
+    def test_no_input_files(self):
+        with pytest.raises(OptionError):
+            self.cmd.finalize_options()
+
+        with pytest.raises(OptionError):
+            self.cmd.input_files = ['1']
+            self.cmd.finalize_options()
+
+        with pytest.raises(OptionError):
+            self.cmd.input_files = ['1', '2', '3']
+            self.cmd.finalize_options()
+
+    def test_no_output_file(self):
+        self.cmd.input_files = ['1', '2']
+        with pytest.raises(OptionError):
+            self.cmd.finalize_options()
+
+    @freeze_time("1994-11-11")
+    def test_default(self):
+        self.cmd.input_files = [self.temp_def, self.temp_ref]
+        self.cmd.output_file = self.output_file
+        self.cmd.finalize_options()
+        self.cmd.run()
+
+        date = format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ', tzinfo=LOCALTZ, locale='en')
+        expected_content = fr"""# Translations template for PROJECT.
+# Copyright (C) 1994 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 1994.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: {date}\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel {VERSION}\n"
+
+msgid "word1"
+msgstr "Word 1"
+
+msgid "word2"
+msgstr "Word 2"
+
+msgid "word3"
+msgstr ""
+
+#, fuzzy
+msgid "word4"
+msgstr "Word 2"
+
+"""
+
+        with open(self.output_file, 'r') as f:
+                actual_content = f.read()
+        assert expected_content == actual_content
+
+    @freeze_time("1994-11-11")
+    def test_compenidum(self):
+        self.cmd.input_files = [self.temp_def, self.temp_ref]
+        self.cmd.output_file = self.output_file
+        self.cmd.compendium = self.compendium
+        self.cmd.finalize_options()
+        self.cmd.run()
+
+        date = format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ', tzinfo=LOCALTZ, locale='en')
+        expected_content = fr"""# Translations template for PROJECT.
+# Copyright (C) 1994 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 1994.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: {date}\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel {VERSION}\n"
+
+msgid "word1"
+msgstr "Word 1"
+
+msgid "word2"
+msgstr "Word 2"
+
+msgid "word3"
+msgstr ""
+
+msgid "word4"
+msgstr "Word 4"
+
+"""
+
+        with open(self.output_file, 'r') as f:
+                actual_content = f.read()
+        assert expected_content == actual_content
+
+
 class CommandLineInterfaceTestCase(unittest.TestCase):
 
     def setUp(self):