format - some additional tests for messages/terms in terms

Thanks @stasm

Author: spookylukey

fluent.runtime/tests/format/test_parameterized_terms.py

@@ -16,6 +16,7 @@ def setUp(self):
             -thing = { $article ->
                   *[definite] the thing
                    [indefinite] a thing
+                   [none] thing
             }
             thing-no-arg = { -thing }
             thing-no-arg-alt = { -thing() }
@@ -56,6 +57,11 @@ def test_no_implicit_access_to_external_args(self):
         self.assertEqual(val, 'the thing')
         self.assertEqual(errs, [])
 
+    def test_no_implicit_access_to_external_args_but_term_args_still_passed(self):
+        val, errs = self.ctx.format('thing-with-arg', {'article': 'none'})
+        self.assertEqual(val, 'a thing')
+        self.assertEqual(errs, [])
+
     def test_bad_term(self):
         val, errs = self.ctx.format('bad-term', {})
         self.assertEqual(val, '-missing')
@@ -138,7 +144,53 @@ def test_inner_arg(self):
         self.assertEqual(val, 'The thing.')
         self.assertEqual(errs, [])
 
+    def test_inner_arg_with_external_args(self):
+        val, errs = self.ctx.format('inner-arg', {'article': 'indefinite'})
+        self.assertEqual(val, 'The thing.')
+        self.assertEqual(errs, [])
+
     def test_neither_arg(self):
         val, errs = self.ctx.format('neither-arg', {})
         self.assertEqual(val, 'the thing.')
         self.assertEqual(errs, [])
+
+
+class TestTermsCalledFromTerms(unittest.TestCase):
+
+    def setUp(self):
+        self.ctx = FluentBundle(['en-US'], use_isolating=False)
+        self.ctx.add_messages(dedent_ftl("""
+            -foo = {$a} {$b}
+            -bar = {-foo(b: 2)}
+            -baz = {-foo}
+            ref-bar = {-bar(a: 1)}
+            ref-baz = {-baz(a: 1)}
+        """))
+
+    def test_term_args_isolated_with_call_syntax(self):
+        val, errs = self.ctx.format('ref-bar', {})
+        self.assertEqual(val, 'a 2')
+        self.assertEqual(errs, [])
+
+    def test_term_args_isolated_without_call_syntax(self):
+        val, errs = self.ctx.format('ref-baz', {})
+        self.assertEqual(val, 'a b')
+        self.assertEqual(errs, [])
+
+
+class TestMessagesCalledFromTerms(unittest.TestCase):
+
+    def setUp(self):
+        self.ctx = FluentBundle(['en-US'], use_isolating=False)
+        self.ctx.add_messages(dedent_ftl("""
+            msg = Msg is {$arg}
+            -foo = {msg}
+            ref-foo = {-foo(arg: 1)}
+        """))
+
+    def test_messages_inherit_term_args(self):
+        # This behaviour may change in future, message calls might be
+        # disallowed from inside terms
+        val, errs = self.ctx.format('ref-foo', {'arg': 2})
+        self.assertEqual(val, 'Msg is 1')
+        self.assertEqual(errs, [])