Test C::D::G::Atom->fold

And make it sort the returned atoms.

diff --git a/lib/CPANPLUS/Dist/Gentoo/Atom.pm b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
index b58ebc3a9e28f7a8912e6a288cff0c683d91be5f..59f1d6ac959c4430a8207ad493a95d70f87f0408 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo/Atom.pm
+++ b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
@@ -295,7 +295,7 @@ sub fold {
   $seen{$key} = defined $cur ? $cur->and($atom) : $atom;
  }
 
- return values %seen;
+ return map $seen{$_}, sort keys %seen;
 }
 
 =pod

diff --git a/t/32-atom-and.t b/t/32-atom-and.t
index 22ceb814003cd23489f2d734a6c9eac28951d16e..4fff4bbb43e66c254263e2c09a059f11b36cca2c 100644 (file)
--- a/t/32-atom-and.t
+++ b/t/32-atom-and.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 2 * (2 + (8 * 7) / 2 + 2);
+use Test::More tests => 2 * (2 + (8 * 7) / 2 + 2) + 3 * 4;
 
 use CPANPLUS::Dist::Gentoo::Atom;
 
@@ -123,3 +123,41 @@ for my $t (@tests) {
   }
  }
 }
+
+my $a1b = A->new(
+ category => 'test',
+ name     => 'a',
+ version  => '1.0',
+);
+
+my $b1 = A->new(
+ category => 'test',
+ name     => 'b',
+ version  => '1.0',
+ range    => '<',
+);
+
+my $b2 = A->new(
+ category => 'test',
+ name     => 'b',
+ version  => '3.0',
+ range    => '<',
+);
+
+my @folded = eval { A->fold($a1b, $a5, $b1, $b2) };
+is $@,      '', 'aabb: no error';
+is @folded, 2,  'aabb: fold results in two atoms';
+ok $folded[0] == $a5, 'aabb: first result is >=test/a-2.0';
+ok $folded[1] == $b1, 'aabb: second result is <test/b-1.0';
+
+@folded = eval { A->fold($a1b, $b1, $b2, $a5) };
+is $@,      '', 'abba: no error';
+is @folded, 2,  'abba: fold results in two atoms';
+ok $folded[0] == $a5, 'abba: first result is >=test/a-2.0';
+ok $folded[1] == $b1, 'abba: second result is <test/b-1.0';
+
+@folded = eval { A->fold($a1b, $b1, $a5, $b2) };
+is $@,      '', 'abab: no error';
+is @folded, 2,  'abab: fold results in two atoms';
+ok $folded[0] == $a5, 'abab: first result is >=test/a-2.0';
+ok $folded[1] == $b1, 'abab: second result is <test/b-1.0';