C::D::G::Atom->and ought to handle only one atom

diff --git a/lib/CPANPLUS/Dist/Gentoo/Atom.pm b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
index e285b0ce32a28b8220f4a4a36739e9bcbe1461c9..5cd01e3b3aa3f376a17f244079a1d3b8274ee46f 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo/Atom.pm
+++ b/lib/CPANPLUS/Dist/Gentoo/Atom.pm
@@ -215,6 +215,8 @@ sub and {
  shift unless length ref $_[0];
 
  my $a1 = shift;
+ return $a1 unless @_;
+
  my $a2 = shift;
  $a2 = $a2->and(@_) if @_;
 

diff --git a/t/31-atom-and.t b/t/31-atom-and.t
index 6de1b3acaced228ccab3c3629d62905b8b8cdac9..9dcf18c975509b8057b8dd0a992709140028f28e 100644 (file)
--- a/t/31-atom-and.t
+++ b/t/31-atom-and.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 2 * ((8 * 7) / 2 + 2);
+use Test::More tests => 2 * (2 + (8 * 7) / 2 + 2);
 
 use CPANPLUS::Dist::Gentoo::Atom;
 
@@ -60,6 +60,9 @@ my $x_ver   = qr/Version mismatch/;
 my $x_range = qr/Incompatible ranges/;
 
 my @tests = (
+ [ [ $a0 ] => $a0 ],
+ [ [ $a1 ] => $a1 ],
+
  [ [ $a0, $a0 ] => $a0 ],
  [ [ $a0, $a1 ] => $a1 ],
  [ [ $a0, $a2 ] => $a2 ],