[libxml-dom-perl] 08/15: Make sure encodings.t fails if there are wide character warnings

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository libxml-dom-perl.

commit 6a97eb4abccc289a81c2f33a241041a7cd713f6b
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sat Aug 15 14:43:44 2015 +0200

    Make sure encodings.t fails if there are wide character warnings
    
    Using Test::NoWarnings required conversion to Test::More
---
 debian/control                     |  1 +
 debian/patches/encoding_test.patch | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index e2dd3db..5bd9f5e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: perl,
+                     libtest-nowarnings-perl,
                      libwww-perl,
                      libxml-parser-perl,
                      libxml-perl,
diff --git a/debian/patches/encoding_test.patch b/debian/patches/encoding_test.patch
index fd71d94..8619762 100644
--- a/debian/patches/encoding_test.patch
+++ b/debian/patches/encoding_test.patch
@@ -4,17 +4,15 @@ Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=6293
 
 --- /dev/null
 +++ b/t/encodings.t
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,48 @@
 +#!/usr/bin/perl
 +use strict;
 +use utf8; # for embedded strings
-+#use Encode;
 +use XML::DOM;
-+use Test;
++use Test::More tests => 16;
++use Test::NoWarnings;
 +use constant TMPFILE => "test_encoding.xml";
 +
-+BEGIN { plan tests => 15 }
-+
 +my $str =
 +q(<?xml version="1.0" encoding="UTF-8"?>
 +<blah>
@@ -25,16 +23,16 @@ Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=6293
 +# test 1 -- check for correct parsing of input string
 +my $parser = new XML::DOM::Parser;
 +my $doc = eval { $parser->parse($str); };
-+ok((not $@) && defined $doc);
++ok(((not $@) && defined $doc), 'loads ok, parses str');
 +
 +try($doc);
 +$doc->printToFile(TMPFILE);
 +$doc->dispose;
 +
-+ok(system("xmllint", "--noout", TMPFILE) == 0);
++ok(system("xmllint", "--noout", TMPFILE) == 0, 'xmllint runs ok');
 +
 +my $doc2 = eval { $parser->parsefile(TMPFILE) };
-+ok((not $@) && defined $doc2);
++ok(((not $@) && defined $doc2), 'parses TMPFILE ok');
 +
 +try($doc2);
 +$doc2->dispose;
@@ -48,10 +46,10 @@ Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=6293
 +	my $footext = $foo->getFirstChild->getData;
 +	my $bartext = $bar->getFirstChild->getData;
 +
-+	ok(utf8::is_utf8($baz));
-+	ok($baz, "\x{E4B6}\x{E4B7}");
-+	ok(utf8::is_utf8($footext));
-+	ok($footext, "\xE3\x{F8E8}");
-+	ok(utf8::is_utf8($bartext));
-+	ok($bartext, "\x{FB7E}\x{FB7F}\x{E4B5}\x{E4B6}\x{E4B7}\x{E4B8}\x{E4B9}\x{E4BA}\x{E4BB}\x{E4BC}\x{E4BD}\x{E4BE}");
++	ok(utf8::is_utf8($baz), 'baz is_utf8...');
++	is($baz, "\x{E4B6}\x{E4B7}", '...and correct');
++	ok(utf8::is_utf8($footext), 'footext is_utf8...');
++	is($footext, "\xE3\x{F8E8}", '...and correct');
++	ok(utf8::is_utf8($bartext), 'bartext is_utf8');
++	is($bartext, "\x{FB7E}\x{FB7F}\x{E4B5}\x{E4B6}\x{E4B7}\x{E4B8}\x{E4B9}\x{E4BA}\x{E4BB}\x{E4BC}\x{E4BD}\x{E4BE}", 'and correct');
 +}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libxml-dom-perl.git