Merge lp:~henninge/launchpad/db-devel-688479-kill-ut-in-tests-1 into lp:launchpad/db-devel

[Henning Eggers]

[r=adeuring][ui=none][bug=688479][incr] Replace makeTranslationMessage with makeCurrentTranslationMessage

= Bug 688479, Part 1 =

This branch replaces all uses of makeTranslationMessage with makeCurrentTranslationMessage which does not use updateTranslation to create translations. It uses new methods that have been implemented to replace the old and complex updateTranslation method. They also implement the new model for sharing translations between upstream and Ubuntu. This is part of the work that was done in the recife branch which has now been merged into db-devel (again).

== Details ==

In most cases the new factory method can directly replace the old one. Sometimes parameters need to be renamed. In two cases the methods under test have not yet been converted to the new model so that the tests had to be disabled until that is fixed.

== Tests ==

Only tests were changed, so the branch can be verified by running those tests.

bin/test -vvcm lp.translations \
  -t language-views.txt \
  -t test_persontranslationview.py \
  -t test_translationmessage_view.py \
  -t gettext-check-messages.txt \
  -t translationmessage-destroy.txt \
  -t translationmessage.txt \
  -t xx-person-activity.txt \
  -t xx-pofile-details.txt \
  -t xx-translations-to-complete.txt \
  -t xx-translations-to-review.txt \
  -t test_potmsgset.py \
  -t test_translatablemessage.py \
  -t test_translationmessage.py \
  -t test_translationsperson.py

== Lint ==

I removed some lint.

[Abel Deuring (adeuring)]

(13:34:23) adeuring: henninge: overall, the changes look good. But the disabled tests conern me a bit: Couldn't you simply use the old factory method makeTranslationMessage() unitl the new method can be properly used in these tests?
(13:34:33) adeuring: s/conern/concern/
(13:46:03) 18VABWLF0 hat den Raum verlassen (quit: Ping timeout: 240 seconds).
(13:52:37) henninge: adeuring: yes, I could. OTHOH that bug will be the next to fix after this bug and I want to remove the old factory method in the next branch for this bug.
(13:52:59) henninge: adeuring: sorry for being afk, btw.
(13:54:44) adeuring: henninge: well, you can fix the factory method first and then change the tests. I am perhaps a bit paranoid, but I remeber a somewhat weird bug in Zope 2 which looked like somebody made a short coffee break while working on a feature but never properly finished that feature aufter the coffee break ;)
(13:55:13) henninge: ;-)
(13:55:23) henninge: The factory method will not be fixed but removed.
(13:56:23) adeuring: henninge: right, what I meant is: I think you should still use the old mehtod until the new one works properly for the currently disabled tests
(13:56:54) henninge: adeuring: we keep running into these hen-egg problems with this branch. ;)
(13:57:18) henninge: In this case it's not the factory that needs to be fixed but the method under test is still referring to the old model.
(13:58:15) henninge: adeuring: but I can do that, if you insist ;-)
(13:58:16) henninge: np
(13:58:33) henninge: I'll have to keep the old factory around a little longer.
(13:58:46) adeuring: henninge: I would feel defeinetly better if all tests stay enabled ;)
(13:59:07) henninge: adeuring: It is important that you feel well!
(13:59:27) adeuring: henninge: ok, so, r=me

review: Approve (code)

=== modified file 'lib/lp/translations/browser/tests/language-views.txt'
--- lib/lp/translations/browser/tests/language-views.txt	2010-08-31 18:10:51 +0000
+++ lib/lp/translations/browser/tests/language-views.txt	2010-12-10 13:47:12 +0000
@@ -156,11 +156,11 @@
 accounts.
 
     >>> for translator in translators:
-    ...     translation = factory.makeTranslationMessage(
+    ...     translation = factory.makeCurrentTranslationMessage(
     ...         pofile=pofile, translator=translator, potmsgset=potmsgset)
-    >>> translation = factory.makeTranslationMessage(
+    >>> translation = factory.makeCurrentTranslationMessage(
     ...     pofile=pofile, translator=translator_merged, potmsgset=potmsgset)
-    >>> translation = factory.makeTranslationMessage(
+    >>> translation = factory.makeCurrentTranslationMessage(
     ...     pofile=pofile, translator=translator_main, potmsgset=potmsgset)
 
 Langauge.translators is Monkey-patched to avoid fetching KarmaCache.

=== modified file 'lib/lp/translations/browser/tests/test_persontranslationview.py'
--- lib/lp/translations/browser/tests/test_persontranslationview.py	2010-10-04 19:50:45 +0000
+++ lib/lp/translations/browser/tests/test_persontranslationview.py	2010-12-10 13:47:12 +0000
@@ -55,7 +55,7 @@
             if previously_worked_on:
                 potmsgset = self.factory.makePOTMsgSet(
                     potemplate=pofile.potemplate, singular='x', sequence=1)
-                self.factory.makeTranslationMessage(
+                self.factory.makeCurrentTranslationMessage(
                     potmsgset=potmsgset, pofile=pofile,
                     translator=self.view.context, translations=['y'])
 

=== modified file 'lib/lp/translations/browser/tests/test_translationmessage_view.py'
--- lib/lp/translations/browser/tests/test_translationmessage_view.py	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/browser/tests/test_translationmessage_view.py	2010-12-10 13:47:12 +0000
@@ -117,7 +117,7 @@
         allows for the "In Ubuntu" or "In Upstream" line to be grayed out
         upon dismissal. This flag is only used in the view to select the
         right css class to achieve that.
-        
+
         :param can_confirm_and_dismiss: The expected stage of that flag.
         :param can_dismiss_on_empty: The expected stage of that flag.
         :param can_dismiss_on_plural: The expected stage of that flag.
@@ -305,7 +305,7 @@
     layer = ZopelessDatabaseLayer
 
     def _makeView(self):
-        message = self.factory.makeTranslationMessage()
+        message = self.factory.makeCurrentTranslationMessage()
         request = LaunchpadTestRequest()
         view = CurrentTranslationMessagePageView(message, request)
         view.lock_timestamp = datetime.now(pytz.utc)
@@ -415,7 +415,7 @@
         # message, if any.
         new_translations = {0: self.getUniqueString()}
         original_translations = {0: self.getUniqueString()}
-        current_message = self.factory.makeTranslationMessage(
+        current_message = self.factory.makeCurrentTranslationMessage(
             translations=original_translations)
         self.assertEqual(
             original_translations,
@@ -435,7 +435,7 @@
         # empty string.
         new_translations = {1: self.getUniqueString()}
         original_translations = {0: self.getUniqueString()}
-        current_message = self.factory.makeTranslationMessage(
+        current_message = self.factory.makeCurrentTranslationMessage(
             translations=original_translations)
         self.assertEqual(
             {1: u''},

=== modified file 'lib/lp/translations/doc/gettext-check-messages.txt'
--- lib/lp/translations/doc/gettext-check-messages.txt	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/doc/gettext-check-messages.txt	2010-12-10 13:47:12 +0000
@@ -68,15 +68,14 @@
 The sample message has an upstream translation, and an Ubuntu
 in Launchpad that differs from the upstream one.
 
-    >>> ubuntu_message = factory.makeTranslationMessage(
+    >>> ubuntu_message = factory.makeCurrentTranslationMessage(
     ...     pofile=pofile, potmsgset=potmsgset, translator=template.owner,
     ...     reviewer=template.owner, translations=[u'%d c'])
     >>> ubuntu_message = removeSecurityProxy(ubuntu_message)
 
-    >>> upstream_message = factory.makeTranslationMessage(
+    >>> upstream_message = factory.makeCurrentTranslationMessage(
     ...     pofile=pofile, potmsgset=potmsgset, translator=template.owner,
-    ...     reviewer=template.owner, translations=[u'%d i'],
-    ...     lock_timestamp=datetime.now(UTC))
+    ...     reviewer=template.owner, translations=[u'%d i'])
     >>> upstream_message = removeSecurityProxy(upstream_message)
 
     >>> upstream_message.is_current_ubuntu = False

=== modified file 'lib/lp/translations/doc/translationmessage-destroy.txt'
--- lib/lp/translations/doc/translationmessage-destroy.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/translations/doc/translationmessage-destroy.txt	2010-12-10 13:47:12 +0000
@@ -58,7 +58,7 @@
     ...     'sr', stable_potemplate)
     >>> potmsgset = factory.makePOTMsgSet(devel_potemplate, sequence=1)
     >>> potmsgset.setSequence(stable_potemplate, 1)
-    >>> tm = factory.makeTranslationMessage(
+    >>> tm = factory.makeCurrentTranslationMessage(
     ...     pofile=devel_sr_pofile,
     ...     potmsgset=potmsgset,
     ...     translations=[u"blah"])

=== modified file 'lib/lp/translations/doc/translationmessage.txt'
--- lib/lp/translations/doc/translationmessage.txt	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/doc/translationmessage.txt	2010-12-10 13:47:12 +0000
@@ -21,7 +21,7 @@
 associated POFile and POTMsgSet.  TranslationMessage and
 DummyTranslationMessage both implement ITranslationMessage:
 
-    >>> translationmessage = factory.makeTranslationMessage(
+    >>> translationmessage = factory.makeCurrentTranslationMessage(
     ...     potmsgset=potmsgset, pofile=pofile_es)
     >>> verifyObject(ITranslationMessage, translationmessage)
     True
@@ -233,7 +233,7 @@
     >>> plural_potmsgset = factory.makePOTMsgSet(potemplate=potemplate,
     ...                                          singular=u"%d contact",
     ...                                          plural=u"%d contacts")
-    >>> plural_message = factory.makeTranslationMessage(
+    >>> plural_message = factory.makeCurrentTranslationMessage(
     ...     potmsgset=plural_potmsgset, pofile=pofile_es,
     ...     translations=[u'%d contacto', u'%d contactos'])
     >>> plural_message.translations

=== modified file 'lib/lp/translations/stories/standalone/xx-person-activity.txt'
--- lib/lp/translations/stories/standalone/xx-person-activity.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/translations/stories/standalone/xx-person-activity.txt	2010-12-10 13:47:12 +0000
@@ -19,7 +19,6 @@
 listed which Carlos has contributed to.
 
     # Prints a heading and formatted list of POFiles and latest submissions.
-    >>> import re
     >>> def print_activity_list(listing):
     ...     for row in listing.findAll('tr'):
     ...         print extract_text(row)
@@ -42,7 +41,8 @@
 Clicking one of the entries takes you to a page listing all of Carlos'
 contributions to the selected translation.
 
-    >>> alsa_utils_link = 'Spanish (es) translation of alsa-utils in alsa-utils trunk'
+    >>> alsa_utils_link = (
+    ...     'Spanish (es) translation of alsa-utils in alsa-utils trunk')
     >>> anon_browser.getLink(alsa_utils_link).click()
     >>> print anon_browser.title
     Translations by ... in...Spanish (es) translation...
@@ -58,7 +58,9 @@
 
     >>> login('[e-mail]')
     >>> ab = factory.makePerson(name='a+b')
-    >>> message = factory.makeTranslationMessage(translator=ab)
+    >>> sr_pofile = factory.makePOFile('sr')
+    >>> message = factory.makeCurrentTranslationMessage(
+    ...     pofile=sr_pofile, translator=ab)
     >>> person_url = canonical_url(ab, rootsite='translations')
     >>> logout()
 

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-details.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-details.txt	2010-12-03 12:47:47 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-details.txt	2010-12-10 13:47:12 +0000
@@ -102,8 +102,8 @@
 A POTMsgSet sequence number is also a link to edit a translation.
 
     >>> anon_browser.getLink('14.').click()
-    >>> anon_browser.url
-    'http://translations.launchpad.dev/evolution/trunk/+pots/evolution-2.2/es/14/+translate'
+    >>> print anon_browser.url
+    http://.../evolution/trunk/+pots/evolution-2.2/es/14/+translate
     >>> print anon_browser.title
     Browsing Spanish translation...
 
@@ -131,7 +131,7 @@
 Merged accounts
 ---------------
 
-On the overview page of each translation pofile, users will not see merged 
+On the overview page of each translation pofile, users will not see merged
 accounts.
 
 We'll create two new accounts to demonstrate this.
@@ -152,9 +152,9 @@
     >>> language_code = 'es'
     >>> pofile = factory.makePOFile(language_code, potemplate=template)
     >>> potmsgset = factory.makePOTMsgSet(template)
-    >>> translation = factory.makeTranslationMessage(pofile=pofile,
+    >>> translation = factory.makeCurrentTranslationMessage(pofile=pofile,
     ...     translator=merged_translator, potmsgset=potmsgset)
-    >>> translation = factory.makeTranslationMessage(pofile=pofile,
+    >>> translation = factory.makeCurrentTranslationMessage(pofile=pofile,
     ...     translator=translator, potmsgset=potmsgset)
     >>> from zope.security.proxy import removeSecurityProxy
     >>> removeSecurityProxy(merged_translator).merged = translator

=== modified file 'lib/lp/translations/stories/standalone/xx-translations-to-complete.txt'
--- lib/lp/translations/stories/standalone/xx-translations-to-complete.txt	2009-11-25 16:51:53 +0000
+++ lib/lp/translations/stories/standalone/xx-translations-to-complete.txt	2010-12-10 13:47:12 +0000
@@ -19,7 +19,7 @@
 
     >>> potmsgset = factory.makePOTMsgSet(
     ...     potemplate=template, singular='a', sequence=1)
-    >>> message = factory.makeTranslationMessage(
+    >>> message = factory.makeCurrentTranslationMessage(
     ...     potmsgset=potmsgset, pofile=pofile, translator=jean,
     ...     translations=['un'])
 
@@ -77,7 +77,7 @@
     ...     ILaunchpadCelebrities)
     >>> pofile = factory.makePOFile('ru')
     >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
-    >>> message = factory.makeTranslationMessage(
+    >>> message = factory.makeCurrentTranslationMessage(
     ...     pofile=pofile, translator=rosetta_experts, translations=['x'])
     >>> logout()
 

=== modified file 'lib/lp/translations/stories/standalone/xx-translations-to-review.txt'
--- lib/lp/translations/stories/standalone/xx-translations-to-review.txt	2009-08-31 13:04:32 +0000
+++ lib/lp/translations/stories/standalone/xx-translations-to-review.txt	2010-12-10 13:47:12 +0000
@@ -46,7 +46,7 @@
     ...     """Let `user` add a suggestion to `pofile`."""
     ...     potmsgset = factory.makePOTMsgSet(
     ...         potemplate=pofile.potemplate, singular='x', sequence=1)
-    ...     factory.makeTranslationMessage(
+    ...     factory.makeCurrentTranslationMessage(
     ...         potmsgset=potmsgset, pofile=pofile, translator=user,
     ...         translations=['y'])
 

=== modified file 'lib/lp/translations/tests/test_potmsgset.py'
--- lib/lp/translations/tests/test_potmsgset.py	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/tests/test_potmsgset.py	2010-12-10 13:47:12 +0000
@@ -165,9 +165,9 @@
 
         # A diverged (translation.potemplate != None) English translation
         # is not used as a singular_text.
-        translation = self.factory.makeTranslationMessage(
+        translation = self.factory.makeCurrentTranslationMessage(
             pofile=en_pofile, potmsgset=potmsgset,
-            translations=[DIVERGED_ENGLISH_STRING], force_diverged=True)
+            translations=[DIVERGED_ENGLISH_STRING], diverged=True)
         self.assertEquals(potmsgset.singular_text, ENGLISH_STRING)
 
     def test_getCurrentTranslationMessageOrDummy_returns_upstream_tm(self):
@@ -219,6 +219,8 @@
         self.assertTrue(dummy.is_current_ubuntu)
         self.assertFalse(dummy.is_current_upstream)
 
+    # XXX henninge 2010-12-10 bug=688519: getCurrentTranslationMessage is not
+    # side-aware yet.
     def test_getCurrentTranslationMessage(self):
         """Test how shared and diverged current translation messages
         interact."""
@@ -244,6 +246,9 @@
         self.assertEquals(self.potmsgset.getCurrentTranslationMessage(
             self.stable_potemplate, serbian), shared_translation)
 
+
+    # XXX henninge 2010-12-10 bug=688519: The meaning of  imported is gone
+    # and so this test and the method it is testing need to be updated.
     def test_getImportedTranslationMessage(self):
         """Test how shared and diverged current translation messages
         interact."""
@@ -286,8 +291,8 @@
             shared_translation)
 
         # Adding a diverged translation doesn't break getSharedTM.
-        diverged_translation = self.factory.makeTranslationMessage(
-            pofile=sr_pofile, potmsgset=self.potmsgset, force_diverged=True)
+        diverged_translation = self.factory.makeCurrentTranslationMessage(
+            pofile=sr_pofile, potmsgset=self.potmsgset, diverged=True)
         self.assertEquals(
             self.potmsgset.getSharedTranslationMessage(serbian),
             shared_translation)
@@ -506,9 +511,9 @@
         # If there's a current, diverged translation, and an imported
         # non-current one, it's changed in Ubuntu.
         imported_shared.makeCurrentUbuntu(False)
-        current_diverged = self.factory.makeTranslationMessage(
+        current_diverged = self.factory.makeCurrentTranslationMessage(
             pofile=sr_pofile, potmsgset=self.potmsgset,
-            is_current_upstream=False)
+            current_other=False)
         self.assertEquals(
             self.potmsgset.hasTranslationChangedInLaunchpad(
                 self.devel_potemplate, serbian),
@@ -819,10 +824,10 @@
         self.pofile = self.factory.makePOFile('eo', self.potemplate)
         # Set up some translation messages with dummy timestamps that will be
         # changed in the tests.
-        self.translation = self.factory.makeTranslationMessage(
+        self.translation = self.factory.makeCurrentTranslationMessage(
             removeSecurityProxy(self.pofile), self.potmsgset,
             translations=[u'trans1'], reviewer=self.factory.makePerson(),
-            is_current_upstream=True, date_updated=self.now())
+            current_other=True, date_created=self.now())
         self.suggestion1 = self.factory.makeSuggestion(
             self.pofile, self.potmsgset, translations=[u'sugg1'],
             date_created=self.now())
@@ -1428,8 +1433,9 @@
 
         credits = self.factory.makePOTMsgSet(
             self.potemplate, u'translator-credits', sequence=1)
-        translation = self.factory.makeTranslationMessage(eo_pofile, credits,
-             translations=[imported_credits], is_current_upstream=True)
+        self.factory.makeCurrentTranslationMessage(
+            eo_pofile, credits, translations=[imported_credits],
+            current_other=True)
 
         eo_translation = credits.getCurrentTranslationMessage(
             self.potemplate, eo_pofile.language)
@@ -1598,9 +1604,9 @@
         pofile, potmsgset = self._makePOFileAndPOTMsgSet()
         owner = pofile.potemplate.owner
         translation = {0: self.factory.getUniqueString()}
-        diverged_message = self.factory.makeTranslationMessage(
+        diverged_message = self.factory.makeCurrentTranslationMessage(
             pofile=pofile, potmsgset=potmsgset, translator=owner,
-            translations=translation, force_diverged=True)
+            translations=translation, diverged=True)
 
         suggestion = potmsgset.submitSuggestion(pofile, owner, translation)
 
@@ -1618,9 +1624,9 @@
             productseries=series2, name=pofile.potemplate.name)
         pofile2 = template2.getPOFileByLang(pofile.language.code)
         translation = {0: self.factory.getUniqueString()}
-        diverged_message = self.factory.makeTranslationMessage(
+        diverged_message = self.factory.makeCurrentTranslationMessage(
             pofile=pofile2, potmsgset=potmsgset, translator=owner,
-            translations=translation, force_diverged=True)
+            translations=translation, diverged=True)
 
         suggestion = potmsgset.submitSuggestion(pofile, owner, translation)
 
@@ -1637,9 +1643,9 @@
         shared_message = self.factory.makeSharedTranslationMessage(
             pofile=pofile, potmsgset=potmsgset, translator=owner,
             translations=translation)
-        diverged_message = self.factory.makeTranslationMessage(
+        diverged_message = self.factory.makeCurrentTranslationMessage(
             pofile=pofile, potmsgset=potmsgset, translator=owner,
-            translations=translation2, force_diverged=True)
+            translations=translation2, diverged=True)
 
         suggestion = potmsgset.submitSuggestion(pofile, owner, translation)
 

=== modified file 'lib/lp/translations/tests/test_translatablemessage.py'
--- lib/lp/translations/tests/test_translatablemessage.py	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/tests/test_translatablemessage.py	2010-12-10 13:47:12 +0000
@@ -163,9 +163,9 @@
         self.external_pofile = self.factory.makePOFile(
             potemplate=self.external_potemplate, language_code='eo')
 
-        self.external_suggestion = self.factory.makeTranslationMessage(
+        self.external_suggestion = self.factory.makeCurrentTranslationMessage(
             pofile=self.external_pofile, potmsgset=self.external_potmsgset)
-        self.external_current = self.factory.makeTranslationMessage(
+        self.external_current = self.factory.makeCurrentTranslationMessage(
             pofile=self.external_pofile, potmsgset=self.external_potmsgset)
 
         self.message = TranslatableMessage(self.potmsgset, self.pofile)

=== modified file 'lib/lp/translations/tests/test_translationmessage.py'
--- lib/lp/translations/tests/test_translationmessage.py	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/tests/test_translationmessage.py	2010-12-10 13:47:12 +0000
@@ -38,7 +38,7 @@
     layer = ZopelessDatabaseLayer
 
     def test_baseline(self):
-        message = self.factory.makeTranslationMessage()
+        message = self.factory.makeCurrentTranslationMessage()
         verifyObject(ITranslationMessage, message)
 
     def test_dummy_translationmessage(self):
@@ -51,15 +51,15 @@
         # ITranslationMessage.is_diverged is a little helper to let you
         # say "message.is_diverged" which can be clearer than
         # "message.potemplate is not None."
-        message = self.factory.makeTranslationMessage(force_diverged=False)
+        message = self.factory.makeCurrentTranslationMessage(diverged=False)
         self.assertFalse(message.is_diverged)
 
     def test_is_diverged_true(self):
-        message = self.factory.makeTranslationMessage(force_diverged=True)
+        message = self.factory.makeCurrentTranslationMessage(diverged=True)
         self.assertTrue(message.is_diverged)
 
     def test_markReviewed(self):
-        message = self.factory.makeTranslationMessage()
+        message = self.factory.makeCurrentTranslationMessage()
         reviewer = self.factory.makePerson()
         tomorrow = datetime.now(UTC) + timedelta(days=1)
 
@@ -484,14 +484,14 @@
     def test_getOnePOFile(self):
         language = self.factory.makeLanguage('sr@test')
         pofile = self.factory.makePOFile(language.code)
-        tm = self.factory.makeTranslationMessage(pofile=pofile)
+        tm = self.factory.makeCurrentTranslationMessage(pofile=pofile)
         self.assertEquals(pofile, tm.getOnePOFile())
 
     def test_getOnePOFile_shared(self):
         language = self.factory.makeLanguage('sr@test')
         pofile1 = self.factory.makePOFile(language.code)
         pofile2 = self.factory.makePOFile(language.code)
-        tm = self.factory.makeTranslationMessage(pofile=pofile1)
+        tm = self.factory.makeCurrentTranslationMessage(pofile=pofile1)
         # Share this POTMsgSet with the other POTemplate (and POFile).
         tm.potmsgset.setSequence(pofile2.potemplate, 1)
         self.assertTrue(tm.getOnePOFile() in [pofile1, pofile2])
@@ -501,7 +501,7 @@
         # is returned.
         language = self.factory.makeLanguage('sr@test')
         pofile = self.factory.makePOFile(language.code)
-        tm = self.factory.makeTranslationMessage(pofile=pofile)
+        tm = self.factory.makeCurrentTranslationMessage(pofile=pofile)
         tm.potmsgset.setSequence(pofile.potemplate, 0)
         self.assertEquals(None, tm.getOnePOFile())
 
@@ -543,12 +543,12 @@
             'foe%d' % form
             for form in xrange(TranslationConstants.MAX_PLURAL_FORMS)]
 
-        self.message = self.factory.makeTranslationMessage(
+        self.message = self.factory.makeCurrentTranslationMessage(
             pofile=self.pofile, potmsgset=self.potmsgset,
             translations=self.translation_strings)
         self.message.potemplate = self.template
 
-        self.other_message = self.factory.makeTranslationMessage(
+        self.other_message = self.factory.makeCurrentTranslationMessage(
             pofile=self.other_pofile, potmsgset=self.other_potmsgset,
             translations=self.translation_strings)
         self.other_message.potemplate = self.other_template

=== modified file 'lib/lp/translations/tests/test_translationsperson.py'
--- lib/lp/translations/tests/test_translationsperson.py	2010-10-04 19:50:45 +0000
+++ lib/lp/translations/tests/test_translationsperson.py	2010-12-10 13:47:12 +0000
@@ -22,6 +22,5 @@
         person = self.factory.makePerson()
         translationsperson = ITranslationsPerson(person)
         self.assertFalse(translationsperson.hasTranslated())
-        self.factory.makeTranslationMessage(
-            translator=person, suggestion=True)
+        self.factory.makeSuggestion(translator=person)
         self.assertTrue(translationsperson.hasTranslated())