Fix test failures on Windows

The test failures on Windows (which are not present on Linux) are caused by the test code using simple string compare (through dict) when simulating files. On Windows, paths are formed with "\" instead of "/", which causes inconsistency in the string compare. (Specifically, the "\" were inserted by os.path.join in FluentResourceLoader.)

Author: studyingegret

fluent.runtime/tests/__init__.py

@@ -0,0 +1,6 @@
+import os
+
+# Unify path separator, default path separator on Windows is \ not /
+# Needed because many tests uses dict + string compare to make a virtual file structure
+def normalize_path(path):
+    return "/".join(os.path.split(path))

fluent.runtime/tests/test_fallback.py

@@ -3,10 +3,19 @@
 import unittest
 from unittest import mock
 
+from . import normalize_path
+
 from fluent.runtime import FluentLocalization, FluentResourceLoader
 
 ISFILE = os.path.isfile
 
+def show_bundle(bundle):
+    for name in ["one", "two", "three", "four", "five"]:
+        if bundle.has_message(name):
+            print(name + ":", bundle.format_pattern(bundle.get_message(name).value))
+        else:
+            print(name + ": Not present")
+
 
 class TestLocalization(unittest.TestCase):
     def test_init(self):
@@ -25,22 +34,28 @@ def test_bundles(self, codecs_open, isfile):
             "en/one.ftl": "four = exists",
             "en/two.ftl": "five = exists",
         }
-        isfile.side_effect = lambda p: p in data or ISFILE(p)
-        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[p])
+        #isfile.side_effect = lambda p: p in data or ISFILE(p)
+        isfile.side_effect = lambda p: normalize_path(p) in data or ISFILE(p)
+        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[normalize_path(p)])
         l10n = FluentLocalization(
             ["de", "fr", "en"], ["one.ftl", "two.ftl"], FluentResourceLoader("{locale}")
         )
+        # Curious
+        print("\ntest_bundles")
         bundles_gen = l10n._bundles()
         bundle_de = next(bundles_gen)
+        show_bundle(bundle_de)
         self.assertEqual(bundle_de.locales[0], "de")
         self.assertTrue(bundle_de.has_message("one"))
         self.assertTrue(bundle_de.has_message("two"))
         bundle_fr = next(bundles_gen)
+        show_bundle(bundle_fr)
         self.assertEqual(bundle_fr.locales[0], "fr")
         self.assertFalse(bundle_fr.has_message("one"))
         self.assertTrue(bundle_fr.has_message("three"))
         self.assertListEqual(list(l10n._bundles())[:2], [bundle_de, bundle_fr])
         bundle_en = next(bundles_gen)
+        show_bundle(bundle_en)
         self.assertEqual(bundle_en.locales[0], "en")
         self.assertEqual(l10n.format_value("one"), "in German")
         self.assertEqual(l10n.format_value("two"), "in German")
@@ -57,8 +72,8 @@ def test_all_exist(self, codecs_open, isfile):
             "en/one.ftl": "one = exists",
             "en/two.ftl": "two = exists",
         }
-        isfile.side_effect = lambda p: p in data
-        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[p])
+        isfile.side_effect = lambda p: normalize_path(p) in data
+        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[normalize_path(p)])
         loader = FluentResourceLoader("{locale}")
         resources_list = list(loader.resources("en", ["one.ftl", "two.ftl"]))
         self.assertEqual(len(resources_list), 1)
@@ -69,8 +84,8 @@ def test_one_exists(self, codecs_open, isfile):
         data = {
             "en/two.ftl": "two = exists",
         }
-        isfile.side_effect = lambda p: p in data
-        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[p])
+        isfile.side_effect = lambda p: normalize_path(p) in data
+        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[normalize_path(p)])
         loader = FluentResourceLoader("{locale}")
         resources_list = list(loader.resources("en", ["one.ftl", "two.ftl"]))
         self.assertEqual(len(resources_list), 1)
@@ -79,8 +94,8 @@ def test_one_exists(self, codecs_open, isfile):
 
     def test_none_exist(self, codecs_open, isfile):
         data = {}
-        isfile.side_effect = lambda p: p in data
-        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[p])
+        isfile.side_effect = lambda p: normalize_path(p) in data
+        codecs_open.side_effect = lambda p, _, __: io.StringIO(data[normalize_path(p)])
         loader = FluentResourceLoader("{locale}")
         resources_list = list(loader.resources("en", ["one.ftl", "two.ftl"]))
         self.assertEqual(len(resources_list), 0)