From 2239a2c36e607ad9a91f06b088b1f96b39084c58 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 13 Jan 2011 14:04:14 -0600
Subject: actually, the first set of warnings is unordered, account for that

---
 t/03-dist.t | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 't/03-dist.t')

diff --git a/t/03-dist.t b/t/03-dist.t
index 463c12f..277ccfd 100644
--- a/t/03-dist.t
+++ b/t/03-dist.t
@@ -5,6 +5,21 @@ use Test::More;
 use Test::Fatal;
 use lib 't/lib/03';
 
+sub use_ok_warnings {
+    my ($class, @conflicts) = @_;
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    @conflicts = sort map { "Conflict detected for $_->[0]:\n  $_->[1] is version $_->[2], but must be greater than version $_->[3]\n" } @conflicts;
+
+    my @warnings;
+    {
+        local $SIG{__WARN__} = sub { push @warnings, $_[0] };
+        use_ok($class);
+    }
+    @warnings = sort @warnings;
+
+    is_deeply(\@warnings, \@conflicts, "correct runtime warnings for $class");
+}
+
 {
     use_ok('Foo::Conflicts::Good');
     is_deeply(
@@ -21,17 +36,11 @@ use lib 't/lib/03';
 }
 
 {
-    {
-        my $warnings;
-        local $SIG{__WARN__} = sub { $warnings .= $_[0] };
-        use_ok('Foo::Conflicts::Bad');
-        is($warnings, <<'EOF', "got correct runtime warnings");
-Conflict detected for Foo:
-  Foo::Two is version 0.02, but must be greater than version 0.02
-Conflict detected for Foo:
-  Foo is version 0.02, but must be greater than version 0.03
-EOF
-    }
+    use_ok_warnings(
+        'Foo::Conflicts::Bad',
+        ['Foo', 'Foo::Two', '0.02', '0.02'],
+        ['Foo', 'Foo',      '0.02', '0.03'],
+    );
 
     is_deeply(
         [ Foo::Conflicts::Bad->calculate_conflicts ],
@@ -65,19 +74,12 @@ EOF
 }
 
 {
-    {
-        my $warnings;
-        local $SIG{__WARN__} = sub { $warnings .= $_[0] };
-        use_ok('Bar::Conflicts::Bad');
-        is($warnings, <<'EOF', "got correct runtime warnings");
-Conflict detected for Bar:
-  Bar::Two is version 0.02, but must be greater than version 0.02
-Conflict detected for Bar:
-  Bar::Two is version 0.02, but must be greater than version 0.02
-Conflict detected for Bar:
-  Bar is version 0.02, but must be greater than version 0.03
-EOF
-    }
+    use_ok_warnings(
+        'Bar::Conflicts::Bad',
+        ['Bar', 'Bar::Two', '0.02', '0.02'],
+        ['Bar', 'Bar::Two', '0.02', '0.02'],
+        ['Bar', 'Bar',      '0.02', '0.03'],
+    );
 
     is_deeply(
         [ Bar::Conflicts::Bad->calculate_conflicts ],
-- 
cgit v1.2.3-54-g00ecf