[SCM] tool for reconciling source and copyright branch, master, updated. debian/0.1-4-gc414c73

Nicholas Bamber nicholas at periapt.co.uk
Mon Dec 17 17:29:12 UTC 2012


The following commit has been merged in the master branch:
commit c414c73cdca4c24ef5844257535feb0f8755cf91
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Mon Dec 17 17:28:54 2012 +0000

    sorted data in tests

diff --git a/t/10-get_files.t b/t/10-get_files.t
index bf7b154..1bbc1ca 100644
--- a/t/10-get_files.t
+++ b/t/10-get_files.t
@@ -4,20 +4,20 @@ use Test::More tests => 1;
 use Debian::LicenseReconcile::Utils qw(get_files);
 use Test::Deep;
 
-my @files = get_files('t/data/example');
+my @files = sort { $a cmp $b} get_files('t/data/example');
 cmp_deeply(\@files, [
-        'sample.png',
-	'base',
-	'base.h',
-	'a/base',
-	'a/2.h',
 	'a/0.h',
-	'a/scriggs.g',
-	'a/3.h',
 	'a/1.h',
-	'a/g/scriggs.t',
+	'a/2.h',
+	'a/3.h',
+	'a/base',
 	'a/g/blah',
-	'debian/control',
+	'a/g/scriggs.t',
+	'a/scriggs.g',
+	'base',
+	'base.h',
 	'debian/changelog',
+	'debian/control',
 	'debian/copyright',
+        'sample.png',
 ]);
diff --git a/t/14-rules-mmagic.t b/t/14-rules-mmagic.t
index d16ea0b..6e075e1 100644
--- a/t/14-rules-mmagic.t
+++ b/t/14-rules-mmagic.t
@@ -33,17 +33,17 @@ my $filter = Debian::LicenseReconcile::Filter::Rules->new(
 isa_ok($filter, 'Debian::LicenseReconcile::Filter');
 isa_ok($filter, 'Debian::LicenseReconcile::Filter::Rules');
 
-my @data = $filter->get_info;
+my @data = sort { $a->{file} cmp $b->{file} } $filter->get_info;
 cmp_deeply(\@data, [
     {
-        file=>'sample.png',
-        license=>'BSD',
+        file=>'base',
+        license=>'GPL-1',
         test=>'Rules5',
         copyright=>'[Copyright: 2012, Periapt Technologies. All rights reserved]',
     },
     {
-        file=>'base',
-        license=>'GPL-1',
+        file=>'sample.png',
+        license=>'BSD',
         test=>'Rules5',
         copyright=>'[Copyright: 2012, Periapt Technologies. All rights reserved]',
     },
diff --git a/t/15-rules-matches.t b/t/15-rules-matches.t
index e4a65b8..0ca0eb7 100644
--- a/t/15-rules-matches.t
+++ b/t/15-rules-matches.t
@@ -42,17 +42,17 @@ EOS
 isa_ok($filter, 'Debian::LicenseReconcile::Filter');
 isa_ok($filter, 'Debian::LicenseReconcile::Filter::Rules');
 
-my @data = $filter->get_info;
+my @data = sort { $a->{file} cmp $b->{file} } $filter->get_info;
 cmp_deeply(\@data, [
     {
-        file=>'sample.png',
-        license=>'BSD',
+        file=>'base',
+        license=>'GPL-1',
         test=>'Rules6',
         copyright=>'[Copyright: 2012, Periapt Technologies. All rights reserved]',
     },
     {
-        file=>'base',
-        license=>'GPL-1',
+        file=>'sample.png',
+        license=>'BSD',
         test=>'Rules6',
         copyright=>'[Copyright: 2012, Periapt Technologies. All rights reserved]',
     },

-- 
tool for reconciling source and copyright



More information about the Pkg-perl-cvs-commits mailing list