On 03/27/2012 10:34 AM, John Dennis wrote:
This patch addresses ticket 2582, see comments in commit message.
Sorry, the patch I originally posted was incorrect, the work had been
done in several commits but I forgot to "squash" them into one commit
and patch before posting it. This new patch fixes that mistake.
--
John Dennis <jden...@redhat.com>
Looking to carve out IT costs?
www.redhat.com/carveoutcosts/
>From 03ffa8e2b1419de80c4769d8391ca56ffb4e2695 Mon Sep 17 00:00:00 2001
From: John Dennis <jden...@redhat.com>
Date: Mon, 26 Mar 2012 22:26:35 -0400
Subject: [PATCH 68-1] text unit test should validate using installed mo file
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
We use custom gettext classes (e.g. GettextFactory &
NGettextFactory). We should exercise those classes with an installed
binary mo file to demonstrate we are actually returning the expected
translated strings for all strings defined as being translatable.
The test logic in install/po/test_i18n.py was recently enhanced to
make this type of testing easier and more complete.
tests/test_ipalib/test_text.py should import the new i18n test support
and run it.
Previously tests/test_ipalib/test_text.py made a feeble but incomplete
attempt to do the above but even that was often not run because the
test would skip because the necessary test files were not available
unless they had been manually created in the install/po subdir. It is
now possible to correct those deficiencies in the test.
This patch does the following:
* Modfies test function in test_i18n.py to accept function pointers
for retreiving a translation.
* Imports test_i18n.py from the install/po directory in the tree
* Creates a tmp directory for the test localedir
* Parses the current ipa.pot file in install/po and generates
a test po and mo file with special unicode markers. It installs
the test mo file in the tmp localedir. This is accomplished by
calling create_po() from the test_i18n.py file.
* If any of the above does not work it raises nose.SkipTest with
the reason, and skips the test.
* It sets up functions to get a translation and a plural translation
via our text.GettextFactory class and text.NGettextFactory class
respectively. This are the functions we use intenally to get
translations. It set the localdir and lang which are used by those
classes to match our test configuration. It then runs a validation
test on every translation and it's plural found in the test.po file
by calling po_file_iterate and passed it the function pointers to
our internal routines.
* At the conclusion of the test it cleans up after itself.
Note: extraneous files are not created in the tree, only a tmp
directory is utilized.
---
install/po/test_i18n.py | 35 +++++----
tests/test_ipalib/test_text.py | 168 +++++++++++++++++++---------------------
2 files changed, 101 insertions(+), 102 deletions(-)
diff --git a/install/po/test_i18n.py b/install/po/test_i18n.py
index beb43cc..c97874f 100755
--- a/install/po/test_i18n.py
+++ b/install/po/test_i18n.py
@@ -387,23 +387,28 @@ def validate_unicode_edit(msgid, msgstr):
def test_translations(po_file, lang, domain, locale_dir):
- try:
+ # The test installs the test message catalog under the xh_ZA
+ # (e.g. Zambia Xhosa) language by default. It would be nice to
+ # use a dummy language not associated with any real language,
+ # but the setlocale function demands the locale be a valid
+ # known locale, Zambia Xhosa is a reasonable choice :)
- # The test installs the test message catalog under the xh_ZA
- # (e.g. Zambia Xhosa) language by default. It would be nice to
- # use a dummy language not associated with any real language,
- # but the setlocale function demands the locale be a valid
- # known locale, Zambia Xhosa is a reasonable choice :)
+ os.environ['LANG'] = lang
- os.environ['LANG'] = lang
+ # Create a gettext translation object specifying our domain as
+ # 'ipa' and the locale_dir as 'test_locale' (i.e. where to
+ # look for the message catalog). Then use that translation
+ # object to obtain the translation functions.
- # Create a gettext translation object specifying our domain as
- # 'ipa' and the locale_dir as 'test_locale' (i.e. where to
- # look for the message catalog). Then use that translation
- # object to obtain the translation functions.
+ t = gettext.translation(domain, locale_dir)
+
+ get_msgstr = t.ugettext
+ get_msgstr_plural = t.ungettext
- t = gettext.translation(domain, locale_dir)
+ return po_file_iterate(po_file, get_msgstr, get_msgstr_plural)
+def po_file_iterate(po_file, get_msgstr, get_msgstr_plural):
+ try:
# Iterate over the msgid's
if not os.path.isfile(po_file):
print >>sys.stderr, 'file does not exist "%s"' % (po_file)
@@ -422,8 +427,8 @@ def test_translations(po_file, lang, domain, locale_dir):
if entry.msgid_plural:
msgid = entry.msgid
msgid_plural = entry.msgid_plural
- msgstr = t.ungettext(msgid, msgid_plural, 1)
- msgstr_plural = t.ungettext(msgid, msgid_plural, 2)
+ msgstr = get_msgstr_plural(msgid, msgid_plural, 1)
+ msgstr_plural = get_msgstr_plural(msgid, msgid_plural, 2)
try:
n_translations += 1
@@ -448,7 +453,7 @@ def test_translations(po_file, lang, domain, locale_dir):
else:
msgid = entry.msgid
- msgstr = t.ugettext(msgid)
+ msgstr = get_msgstr(msgid)
try:
n_translations += 1
diff --git a/tests/test_ipalib/test_text.py b/tests/test_ipalib/test_text.py
index 1931ca4..45a6ca5 100644
--- a/tests/test_ipalib/test_text.py
+++ b/tests/test_ipalib/test_text.py
@@ -22,6 +22,9 @@ Test the `ipalib.text` module.
"""
import os
+import sys
+import shutil
+import tempfile
import re
import nose
import locale
@@ -35,93 +38,6 @@ singular = '%(count)d goose makes a %(dish)s'
plural = '%(count)d geese make a %(dish)s'
-# Unicode right pointing arrow
-prefix = u'\u2192' # utf-8 == '\xe2\x86\x92'
-# Unicode left pointing arrow
-suffix = u'\u2190' # utf-8 == '\xe2\x86\x90'
-
-def get_msgid(po_file):
- 'Get the first non-empty msgid from the po file'
-
- msgid_re = re.compile(r'^\s*msgid\s+"(.+)"\s*$')
- f = open(po_file)
- for line in f.readlines():
- match = msgid_re.search(line)
- if match:
- msgid = match.group(1)
- f.close()
- return msgid
- f.close()
- raise ValueError('No msgid found in %s' % po_file)
-
-def test_gettext():
- '''
- Test gettext translation
-
- We test our translations by taking the original untranslated
- string (e.g. msgid) and prepend a prefix character and then append
- a suffix character. The test consists of asserting that the first
- character in the translated string is the prefix, the last
- character in the translated string is the suffix and the
- everything between the first and last character exactly matches
- the original msgid.
-
- We use unicode characters not in the ascii character set for the
- prefix and suffix to enhance the test. To make reading the
- translated string easier the prefix is the unicode right pointing
- arrow and the suffix left pointing arrow, thus the translated
- string looks like the original string enclosed in arrows. In ASCII
- art the string "foo" would render as: "-->foo<--"
- '''
-
- localedir='install/po/test_locale'
- test_file='install/po/test.po'
-
- lang = os.environ['LANG']
- os.environ['LANG'] = 'xh_ZA'
-
- # Tell gettext that our domain is 'ipa', that locale_dir is
- # 'test_locale' (i.e. where to look for the message catalog)
- _ = text.GettextFactory('ipa', localedir)
-
- # We need a translatable string to test with, read one from the
- # test po file
- if not file_exists(test_file):
- raise nose.SkipTest(
- 'Test language not available, run "make test_lang" in install/po'
- )
- msgid = get_msgid(test_file)
-
- # Get the localized instance of the msgid, it should be a Gettext
- # instance.
- localized = _(msgid)
- assert(isinstance(localized, text.Gettext))
-
- # Get the translated string from the Gettext instance by invoking
- # unicode on it.
- translated = unicode(localized)
-
- # Perform the verifications on the translated string.
-
- # Verify the first character is the test prefix
- assert(translated[0] == prefix)
-
- # Verify the last character is the test suffix
- assert(translated[-1] == suffix)
-
- # Verify everything between the first and last character is the
- # original untranslated string
- assert(translated[1:-1] == msgid)
-
- # Reset the language and assure we don't get the test values
- context.__dict__.clear()
- os.environ['LANG'] = lang
-
- translated = unicode(localized)
-
- assert(translated[0] != prefix)
- assert(translated[-1] != suffix)
-
def test_create_translation():
f = text.create_translation
key = ('foo', None)
@@ -129,6 +45,84 @@ def test_create_translation():
assert context.__dict__[key] is t
+class test_TestLang(object):
+ def setUp(self):
+ self.tmp_dir = None
+ self.saved_lang = None
+
+ self.lang = 'xh_ZA'
+ self.domain = 'ipa'
+
+ self.ipa_i18n_dir = os.path.join(os.path.dirname(__file__), '../../install/po')
+ sys.path.insert(0, self.ipa_i18n_dir)
+ try:
+ import test_i18n
+ except ImportError, e:
+ raise nose.SkipTest('cannot import test_i18n: %s')
+
+ self.pot_basename = '%s.pot' % self.domain
+ self.po_basename = '%s.po' % self.lang
+ self.mo_basename = '%s.mo' % self.domain
+
+ self.tmp_dir = tempfile.mkdtemp()
+ self.saved_lang = os.environ['LANG']
+
+ self.locale_dir = os.path.join(self.tmp_dir, 'test_locale')
+ self.msg_dir = os.path.join(self.locale_dir, self.lang, 'LC_MESSAGES')
+
+ if not os.path.exists(self.msg_dir):
+ os.makedirs(self.msg_dir)
+
+ self.pot_file = os.path.join(self.ipa_i18n_dir, self.pot_basename)
+ self.mo_file = os.path.join(self.msg_dir, self.mo_basename)
+ self.po_file = os.path.join(self.tmp_dir, self.po_basename)
+
+ result = test_i18n.create_po(self.pot_file, self.po_file, self.mo_file)
+ if result:
+ raise nose.SkipTest('Unable to create po file "%s" & mo file "%s" from pot file "%s"' %
+ (self.po_file, self.mo_file, self.pot_file))
+
+ if not file_exists(self.po_file):
+ raise nose.SkipTest('Test po file unavailable, run "make test" in install/po')
+
+ if not file_exists(self.mo_file):
+ raise nose.SkipTest('Test mo file unavailable, run "make test" in install/po')
+
+ self.po_file_iterate = test_i18n.po_file_iterate
+
+ def tearDown(self):
+ if self.saved_lang is not None:
+ os.environ['LANG'] = self.saved_lang
+
+ if self.tmp_dir is not None:
+ shutil.rmtree(self.tmp_dir)
+
+ def test_test_lang(self):
+ print "test_test_lang"
+ # The test installs the test message catalog under the xh_ZA
+ # (e.g. Zambia Xhosa) language by default. It would be nice to
+ # use a dummy language not associated with any real language,
+ # but the setlocale function demands the locale be a valid
+ # known locale, Zambia Xhosa is a reasonable choice :)
+
+ os.environ['LANG'] = self.lang
+
+ # Create a gettext translation object specifying our domain as
+ # 'ipa' and the locale_dir as 'test_locale' (i.e. where to
+ # look for the message catalog). Then use that translation
+ # object to obtain the translation functions.
+
+ def get_msgstr(msg):
+ gt = text.GettextFactory(localedir=self.locale_dir)(msg)
+ return unicode(gt)
+
+ def get_msgstr_plural(singular, plural, count):
+ ng = text.NGettextFactory(localedir=self.locale_dir)(singular, plural, count)
+ return ng(count)
+
+ result = self.po_file_iterate(self.po_file, get_msgstr, get_msgstr_plural)
+ assert result == 0
+
class test_LazyText(object):
klass = text.LazyText
--
1.7.7.6
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
