[license-reconcile] 01/01: Fix random order issues in t/17-copyright.t

[Axel Beckert]

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

abe pushed a commit to branch master
in repository license-reconcile.

commit aee13a5848c623f01ce4899c7c23aa14f052ac40
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Sep 28 18:30:23 2013 +0200

    Fix random order issues in t/17-copyright.t
---
 t/17-copyright.t |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/17-copyright.t b/t/17-copyright.t
index c220f51..3c3cf24 100644
--- a/t/17-copyright.t
+++ b/t/17-copyright.t
@@ -42,7 +42,7 @@ EOS
 my $d5=Debian::LicenseReconcile::CopyrightDatum->new($text);
 isa_ok($d5, 'Debian::LicenseReconcile::CopyrightDatum');
 my @dk5 = $d5->copyright_holders;
-cmp_deeply(\@dk5, ['Woo Goo & Co','Blah Wah Ltd'], 'copyright holders');
+cmp_deeply(\@dk5, bag('Woo Goo & Co','Blah Wah Ltd'), 'copyright holders');
 isa_ok($d5->years('Woo Goo & Co'), 'Set::IntSpan');
 isa_ok($d5->years('Blah Wah Ltd'), 'Set::IntSpan');
 my $woo_years = $d5->years('Woo Goo & Co')->elements;
@@ -70,7 +70,7 @@ my $text2=<<'EOS';
 EOS
 $test2='haha';
 is($d5->contains($text2, \$test2), 0);
-is($test2, "Was trying to match 'Blah1 Wah Ltd' to 'Blah Wah Ltd', but 'Blah Wah8 Ltd' would match as well so giving up.");
+like($test2, qr/Was trying to match 'Blah1? Wah8? Ltd' to 'Blah Wah Ltd', but 'Blah1? Wah8? Ltd' would match as well so giving up\./, "Does not match: '$test2'");
 
 my $text3=<<'EOS';
  1997, 1999-2006, Blah4 Wah Ltd
@@ -79,7 +79,7 @@ EOS
 my $d6=Debian::LicenseReconcile::CopyrightDatum->new($text3);
 $test2='haha';
 is($d6->contains($text, \$test2), 0);
-is($test2, "Was trying to match 'Blah Wah Ltd' to 'Blah4 Wah Ltd', but 'Blah WaT Ltd' would be matched as well so giving up.");
+like($test2, qr/Was trying to match 'Blah Wah Ltd' to 'Blah4? Wa[hT] Ltd', but 'Blah4? Wa[hT] Ltd' would be matched as well so giving up\./, "Does not match: '$test2'");
 is(Debian::LicenseReconcile::Errors->how_many,0,'how many');
 
 my $text4='Copyright: 1997--1998 Jan Pazdziora, adelton at fi.muni.cz';

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