po: Add failing test for Debian bug #911356

Signed-off-by: Simon McVittie <smcv@debian.org>

diff --git a/doc/todo/Re-use_translated_content_instead_of_skipping_if_previously_translated.mdwn b/doc/todo/Re-use_translated_content_instead_of_skipping_if_previously_translated.mdwn
index 57386ad7553e7616ece43e19d2c928a1e16b3852..749551cccb5410a7b1127ca5e6a95d7752d1d64a 100644 (file)
--- a/doc/todo/Re-use_translated_content_instead_of_skipping_if_previously_translated.mdwn
+++ b/doc/todo/Re-use_translated_content_instead_of_skipping_if_previously_translated.mdwn
@@ -95,5 +95,13 @@
 
 > I've filed this in Debian GNU/Linux at https://bugs.debian.org/911356 — [[lamby]], Thu, 18 Oct 2018 20:18:58 -0400
 
 
 > I've filed this in Debian GNU/Linux at https://bugs.debian.org/911356 — [[lamby]], Thu, 18 Oct 2018 20:18:58 -0400
 

-
-
+>> As I said on the Debian bug, I think we badly need test coverage for
+>> this sort of thing, otherwise it *will* regress. The po plugin is
+>> relatively complicated and hooks into lots of places in ikiwiki,
+>> and I don't think any of the active ikiwiki maintainers use it
+>> themselves, which means it can easily break (or have pre-existing
+>> bugs) without anyone realising.
+>>
+>> For now I've added a failing test-case for this particular bug.
+>> I'll try to review this soon and understand the po plugin, the patch,
+>> why the bug exists and why the patch fixes it. --[[smcv]]

diff --git a/t/po.t b/t/po.t
index 0db56edc9efae236deeaf8b7348b4bc9e65bbcf9..3e9b9b7fd2387c8d290e2caa10849d67a49328f3 100755 (executable)
--- a/t/po.t
+++ b/t/po.t
@@ -3,6 +3,7 @@
 use warnings;
 use strict;
 use File::Temp qw{tempdir};
 use warnings;
 use strict;
 use File::Temp qw{tempdir};

+use utf8;

 
 BEGIN {
        unless (eval { require Locale::Po4a::Chooser }) {
 
 BEGIN {
        unless (eval { require Locale::Po4a::Chooser }) {


@@ -17,7 +18,7 @@ BEGIN {
        }
 }
 
        }
 }
 

-use Test::More tests => 114;
+use Test::More;

 
 BEGIN { use_ok("IkiWiki"); }
 
 
 BEGIN { use_ok("IkiWiki"); }
 


@@ -44,7 +45,7 @@ $config{po_slave_languages} = {
                               es => 'Castellano',
                               fr => "Français"
                              };
                               es => 'Castellano',
                               fr => "Français"
                              };

-$config{po_translatable_pages}='index or test1 or test2 or translatable';
+$config{po_translatable_pages}='index or test1 or test2 or translatable or debian*';

 $config{po_link_to}='negotiated';
 IkiWiki::loadplugins();
 ok(IkiWiki::loadplugin('meta'), "meta plugin loaded");
 $config{po_link_to}='negotiated';
 IkiWiki::loadplugins();
 ok(IkiWiki::loadplugin('meta'), "meta plugin loaded");


@@ -67,8 +68,15 @@ $pagesources{'translatable'}='translatable.mdwn';
 $pagesources{'translatable.fr'}='translatable.fr.po';
 $pagesources{'translatable.es'}='translatable.es.po';
 $pagesources{'nontranslatable'}='nontranslatable.mdwn';
 $pagesources{'translatable.fr'}='translatable.fr.po';
 $pagesources{'translatable.es'}='translatable.es.po';
 $pagesources{'nontranslatable'}='nontranslatable.mdwn';

+$pagesources{'debian911356'}='debian911356.mdwn';
+$pagesources{'debian911356.fr'}='debian911356.fr.po';
+$pagesources{'debian911356-inlined'}='debian911356-inlined.mdwn';
+$pagesources{'debian911356-inlined.fr'}='debian911356-inlined.fr.po';
+my $now=time;

 foreach my $page (keys %pagesources) {
        $IkiWiki::pagecase{lc $page}=$page;
 foreach my $page (keys %pagesources) {
        $IkiWiki::pagecase{lc $page}=$page;

+       $IkiWiki::pagectime{$page}=$now;
+       $IkiWiki::pagemtime{$page}=$now;

 }
 
 ### populate srcdir
 }
 
 ### populate srcdir


@@ -80,6 +88,42 @@ writefile('test2.mdwn', $config{srcdir}, 'test2 content');
 writefile('test3.mdwn', $config{srcdir}, 'test3 content');
 writefile('translatable.mdwn', $config{srcdir}, '[[nontranslatable]]');
 writefile('nontranslatable.mdwn', $config{srcdir}, '[[/]] [[translatable]]');
 writefile('test3.mdwn', $config{srcdir}, 'test3 content');
 writefile('translatable.mdwn', $config{srcdir}, '[[nontranslatable]]');
 writefile('nontranslatable.mdwn', $config{srcdir}, '[[/]] [[translatable]]');

+writefile('debian911356.mdwn', $config{srcdir}, <<EOF);
+Before first inline
+
+[[!inline pages="debian911356-inlined" raw="yes"]]
+
+Between inlines
+
+[[!inline pages="debian911356-inlined" raw="yes"]]
+
+After inlines
+EOF
+writefile('debian911356-inlined.mdwn', $config{srcdir}, <<EOF);
+English content
+EOF
+writefile('debian911356.fr.po', $config{srcdir}, <<EOF);
+msgid "" msgstr ""
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+
+msgid "Before first inline"
+msgstr "Avant la première inline"
+
+msgid "[[!inline pages=\\"debian911356-inlined\\" raw=\\"yes\\"]]\\n"
+msgstr "[[!inline pages=\\"debian911356-inlined.fr\\" raw=\\"yes\\"]]\\n"
+
+msgid "Between inlines"
+msgstr "Entre les inlines"
+
+msgid "After inlines"
+msgstr "Après les inlines"
+EOF
+writefile('debian911356-inlined.fr.po', $config{srcdir}, <<EOF);
+msgid "English content"
+msgstr "Contenu français"
+EOF

 
 ### istranslatable/istranslation
 # we run these tests twice because memoization attempts made them
 
 ### istranslatable/istranslation
 # we run these tests twice because memoization attempts made them


@@ -248,3 +292,68 @@ ok(IkiWiki::Plugin::po::islanguagecode('es'));
 ok(IkiWiki::Plugin::po::islanguagecode('arn'));
 ok(! IkiWiki::Plugin::po::islanguagecode('es_'));
 ok(! IkiWiki::Plugin::po::islanguagecode('_en'));
 ok(IkiWiki::Plugin::po::islanguagecode('arn'));
 ok(! IkiWiki::Plugin::po::islanguagecode('es_'));
 ok(! IkiWiki::Plugin::po::islanguagecode('_en'));

+
+# Actually render translated pages
+use IkiWiki::Render;
+
+my %output;
+foreach my $page (keys %pagesources) {
+       my $source = "$config{srcdir}/$pagesources{$page}";
+       if (-e $source) {
+               IkiWiki::scan($pagesources{$page});
+               my $content = readfile($source);
+               print STDERR "-------------------------------------\n";
+               #print STDERR "SOURCE: $page: $content\n";
+               $content = IkiWiki::filter($page, $page, $content);
+               #print STDERR "FILTERED: $page: $content\n";
+               $content = IkiWiki::preprocess($page, $page, $content);
+               #print STDERR "PREPROCESSED: $page: $content\n";
+               $content = IkiWiki::linkify($page, $page, $content);
+               #print STDERR "LINKIFIED: $page: $content\n";
+               $content = IkiWiki::htmlize($page, $page, IkiWiki::pagetype($pagesources{$page}), $content);
+               print STDERR "HTMLIZED: $page: $content\n";
+               $output{$page} = $content;
+               ok(utf8::is_utf8($content), "htmlized content should be utf8");
+       }
+}
+
+like($output{debian911356}, qr{
+       <p>Before\sfirst\sinline</p>
+       \s*
+       <p>English\scontent</p>
+       \s*
+       <p>Between\sinlines</p>
+       \s*
+       <p>English\scontent</p>
+       \s*
+       <p>After\sinlines</p>
+}sx);
+
+like($output{'debian911356.fr'}, qr{
+       <p>Avant\sla\spremière\sinline</p>
+       \s*
+       <p>Contenu\sfrançais</p>
+       \s*
+       <p>Entre\sles\sinlines</p>
+       \s*
+       .*      # TODO: This paragraph gets mangled (Debian #911356)
+       \s*
+       <p>Après\sles\sinlines</p>
+}sx);
+
+TODO: {
+local $TODO = "Debian bug #911356";
+like($output{'debian911356.fr'}, qr{
+       <p>Avant\sla\spremière\sinline</p>
+       \s*
+       <p>Contenu\sfrançais</p>
+       \s*
+       <p>Entre\sles\sinlines</p>
+       \s*
+       <p>Contenu\sfrançais</p>
+       \s*
+       <p>Après\sles\sinlines</p>
+}sx);
+};
+
+done_testing;