[libical-parser-html-perl] 01/09: fix test failures in 01parse.t

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository libical-parser-html-perl.

commit 95179ba088fbc9e67e01274fd94f8533bbf7a2f9
Author: Florian Schlichting <fsfs at debian.org>
Date:   Wed Apr 23 16:26:24 2014 +0200

    fix test failures in 01parse.t
---
 debian/patches/normlize-test-output.patch | 16 ++++++++++++++++
 debian/patches/series                     |  3 ++-
 debian/patches/skip-content-tests.patch   | 18 ------------------
 debian/patches/this-month.patch           | 17 +++++++++++++++++
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/debian/patches/normlize-test-output.patch b/debian/patches/normlize-test-output.patch
new file mode 100644
index 0000000..b62d26b
--- /dev/null
+++ b/debian/patches/normlize-test-output.patch
@@ -0,0 +1,16 @@
+Description: fix test failure due to output formatting differences
+Author: Florian Schlichting <fsfs at debian.org>
+Forwarded: not_yet
+
+--- a/t/01parse.t
++++ b/t/01parse.t
+@@ -20,6 +20,9 @@
+ 	$got=~s/ class=""//g;
+ 	dump_html("$caldir/$f.$type.html",$got) if $ENV{_DUMP_TEST_HTML_};
+ 	my $expect=slurp("$caldir/$f.$type.html");
++        $got    =~ s/^ *//gm; # $got is indented
++        $expect =~ s/^ *//gm; # $expect is not intendet but once
++        $expect =~ s/; charset=utf-8/;             charset=UTF-8/;
+ 	is($got,$expect,"$f -> $type");
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 0d81bb3..a8647c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+normlize-test-output.patch
+this-month.patch
 perl5.18.patch
-skip-content-tests.patch
diff --git a/debian/patches/skip-content-tests.patch b/debian/patches/skip-content-tests.patch
deleted file mode 100644
index 1e09f89..0000000
--- a/debian/patches/skip-content-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: skip t/01parse.t, as it fails massively (19/19)
- Some day someone may fix it, but until then we want it disabled.
- Previously all errors from the test suite were ignored, which led to
- undetected syntax errors (#741000)
-Author: Damyan Ivanov <dmn at debian.org>
-Forwarded: no
-
---- a/t/01parse.t
-+++ b/t/01parse.t
-@@ -2,6 +2,8 @@
- use Test::More;
- use iCal::Parser::HTML;
- 
-+plan skip_all => 'Content tests are terribly broken';
-+
- my $parser=iCal::Parser::HTML->new;
- #map of calendars to start dates
- my %testmap=(
diff --git a/debian/patches/this-month.patch b/debian/patches/this-month.patch
new file mode 100644
index 0000000..23fa366
--- /dev/null
+++ b/debian/patches/this-month.patch
@@ -0,0 +1,17 @@
+Description: fix rendering of previous and following month in sidebar
+ Otherwise, only the first week of the month would be rendered as $month
+ is the current month (11 for the complex.ics tests)
+Author: Florian Schlichting <fsfs at debian.org>
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=94968
+
+--- a/lib/iCal/Parser/HTML/stylesheet/month-util.xsl
++++ b/lib/iCal/Parser/HTML/stylesheet/month-util.xsl
+@@ -86,7 +86,7 @@
+ 	 </xsl:call-template>
+       </tr>
+       <xsl:variable name="next-week" select="date:add($start-date,'P7D')"/>
+-      <xsl:if test="date:month-in-year($next-week) = $month">
++      <xsl:if test="date:month-in-year($next-week) = $this-month">
+ 	 <xsl:call-template name="week">
+ 	    <xsl:with-param name="start-date"  select="$next-week"/>
+ 	    <xsl:with-param name="month" select="$month"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libical-parser-html-perl.git