Imported Upstream version 6.4.0upstream/6.4.0

1 files changed, 78 insertions, 5 deletions

diff --git a/tests/test_command_import_wordpress.py b/tests/test_command_import_wordpress.py
index d12c7f6..04e0631 100644
--- a/tests/test_command_import_wordpress.py
+++ b/tests/test_command_import_wordpress.py
@@ -51,6 +51,79 @@ Easy.
         self.assertEqual(expected_xml, self.import_command._glue_xml_lines(xml))
 
 
+class TestQTranslateContentSeparation(BasicCommandImportWordpress):
+
+    def test_conserves_qtranslate_less_post(self):
+        content = """Si vous préférez savoir à qui vous parlez commencez par visiter l'<a title="À propos" href="http://some.blog/about/">À propos</a>.
+
+Quoiqu'il en soit, commentaires, questions et suggestions sont les bienvenues !"""
+        content_translations = self.module.separate_qtranslate_content(content)
+        self.assertEqual(1, len(content_translations))
+        self.assertEqual(content, content_translations[""])
+
+    def test_split_a_two_language_post(self):
+        content = """<!--:fr-->Si vous préférez savoir à qui vous parlez commencez par visiter l'<a title="À propos" href="http://some.blog/about/">À propos</a>.
+
+Quoiqu'il en soit, commentaires, questions et suggestions sont les bienvenues !
+<!--:--><!--:en-->If you'd like to know who you're talking to, please visit the <a title="À propos" href="http://some.blog/about/">about page</a>.
+
+Comments, questions and suggestions are welcome !
+<!--:-->"""
+        content_translations = self.module.separate_qtranslate_content(content)
+        self.assertEqual("""Si vous préférez savoir à qui vous parlez commencez par visiter l'<a title="À propos" href="http://some.blog/about/">À propos</a>.
+
+Quoiqu'il en soit, commentaires, questions et suggestions sont les bienvenues !
+""", content_translations["fr"])
+        self.assertEqual("""If you'd like to know who you're talking to, please visit the <a title="À propos" href="http://some.blog/about/">about page</a>.
+
+Comments, questions and suggestions are welcome !
+""", content_translations["en"])
+
+    def test_split_a_two_language_post_with_teaser(self):
+        content = """<!--:fr-->Si vous préférez savoir à qui vous parlez commencez par visiter l'<a title="À propos" href="http://some.blog/about/">À propos</a>.
+
+Quoiqu'il en soit, commentaires, questions et suggestions sont les bienvenues !
+<!--:--><!--:en-->If you'd like to know who you're talking to, please visit the <a title="À propos" href="http://some.blog/about/">about page</a>.
+
+Comments, questions and suggestions are welcome !
+<!--:--><!--more--><!--:fr-->
+Plus de détails ici !
+<!--:--><!--:en-->
+More details here !
+<!--:-->"""
+        content_translations = self.module.separate_qtranslate_content(content)
+        self.assertEqual("""Si vous préférez savoir à qui vous parlez commencez par visiter l'<a title="À propos" href="http://some.blog/about/">À propos</a>.
+
+Quoiqu'il en soit, commentaires, questions et suggestions sont les bienvenues !
+ <!--more--> \n\
+Plus de détails ici !
+""", content_translations["fr"])
+        self.assertEqual("""If you'd like to know who you're talking to, please visit the <a title="À propos" href="http://some.blog/about/">about page</a>.
+
+Comments, questions and suggestions are welcome !
+ <!--more--> \n\
+More details here !
+""", content_translations["en"])
+
+    def test_split_a_two_language_post_with_intermission(self):
+        content = """<!--:fr-->Voila voila<!--:-->COMMON<!--:en-->BLA<!--:-->"""
+        content_translations = self.module.separate_qtranslate_content(content)
+        self.assertEqual("Voila voila COMMON", content_translations["fr"])
+        self.assertEqual("COMMON BLA", content_translations["en"])
+
+    def test_split_a_two_language_post_with_uneven_repartition(self):
+        content = """<!--:fr-->Voila voila<!--:-->COMMON<!--:fr-->MOUF<!--:--><!--:en-->BLA<!--:-->"""
+        content_translations = self.module.separate_qtranslate_content(content)
+        self.assertEqual("Voila voila COMMON MOUF", content_translations["fr"])
+        self.assertEqual("COMMON BLA", content_translations["en"])
+
+    def test_split_a_two_language_post_with_uneven_repartition_bis(self):
+        content = """<!--:fr-->Voila voila<!--:--><!--:en-->BLA<!--:-->COMMON<!--:fr-->MOUF<!--:-->"""
+        content_translations = self.module.separate_qtranslate_content(content)
+        self.assertEqual("Voila voila COMMON MOUF", content_translations["fr"])
+        self.assertEqual("BLA COMMON", content_translations["en"])
+
+
 class CommandImportWordpressRunTest(BasicCommandImportWordpress):
     def setUp(self):
         super(self.__class__, self).setUp()
@@ -134,7 +207,7 @@ class CommandImportWordpressTest(BasicCommandImportWordpress):
         self.assertEqual('Wordpress blog title', context['BLOG_TITLE'])
         self.assertEqual('Nikola test blog ;) - with moré Ümläüts',
                          context['BLOG_DESCRIPTION'])
-        self.assertEqual('http://some.blog', context['SITE_URL'])
+        self.assertEqual('http://some.blog/', context['SITE_URL'])
         self.assertEqual('mail@some.blog', context['BLOG_EMAIL'])
         self.assertEqual('Niko', context['BLOG_AUTHOR'])
 
@@ -173,7 +246,7 @@ class CommandImportWordpressTest(BasicCommandImportWordpress):
             'kontakt', '2009-07-16 20:20:32', None, [])
 
         self.assertTrue(write_content.called)
-        write_content.assert_any_call('new_site/posts/200704hoert.wp'.replace('/', os.sep),
+        write_content.assert_any_call('new_site/posts/2007/04/hoert.wp'.replace('/', os.sep),
                                       """An image.
 
 <img class="size-full wp-image-16" title="caption test" src="http://some.blog/wp-content/uploads/2009/07/caption_test.jpg" alt="caption test" width="739" height="517" />
@@ -193,7 +266,7 @@ The end.
 """)
 
         write_content.assert_any_call(
-            'new_site/posts/200807arzt-und-pfusch-s-i-c-k.wp'.replace('/', os.sep),
+            'new_site/posts/2008/07/arzt-und-pfusch-s-i-c-k.wp'.replace('/', os.sep),
             '''<img class="size-full wp-image-10 alignright" title="Arzt+Pfusch - S.I.C.K." src="http://some.blog/wp-content/uploads/2008/07/arzt_und_pfusch-sick-cover.png" alt="Arzt+Pfusch - S.I.C.K." width="210" height="209" />Arzt+Pfusch - S.I.C.K.Gerade bin ich \xfcber das Album <em>S.I.C.K</em> von <a title="Arzt+Pfusch" href="http://www.arztpfusch.com/" target="_blank">Arzt+Pfusch</a> gestolpert, welches Arzt+Pfusch zum Download f\xfcr lau anbieten. Das Album steht unter einer Creative Commons <a href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">BY-NC-ND</a>-Lizenz.
 Die Ladung <em>noisebmstupidevildustrial</em> gibts als MP3s mit <a href="http://www.archive.org/download/dmp005/dmp005_64kb_mp3.zip">64kbps</a> und <a href="http://www.archive.org/download/dmp005/dmp005_vbr_mp3.zip">VBR</a>, als Ogg Vorbis und als FLAC (letztere <a href="http://www.archive.org/details/dmp005">hier</a>). <a href="http://www.archive.org/download/dmp005/dmp005-artwork.zip">Artwork</a> und <a href="http://www.archive.org/download/dmp005/dmp005-lyrics.txt">Lyrics</a> gibts nochmal einzeln zum Download.''')
         write_content.assert_any_call(
@@ -214,11 +287,11 @@ Diese Daten sind f\xfcr mich nicht bestimmten Personen zuordenbar. Eine Zusammen
 
         self.assertEqual(
             self.import_command.url_map['http://some.blog/2007/04/hoert/'],
-            'http://some.blog/posts/200704hoert.html')
+            'http://some.blog/posts/2007/04/hoert.html')
         self.assertEqual(
             self.import_command.url_map[
                 'http://some.blog/2008/07/arzt-und-pfusch-s-i-c-k/'],
-            'http://some.blog/posts/200807arzt-und-pfusch-s-i-c-k.html')
+            'http://some.blog/posts/2008/07/arzt-und-pfusch-s-i-c-k.html')
         self.assertEqual(
             self.import_command.url_map['http://some.blog/kontakt/'],
             'http://some.blog/stories/kontakt.html')