From b6f9cf0cd8b90c31a024581d524cf513a5446c93 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 14 Jun 2010 03:21:42 -0500
Subject: update dzil (and other packaging) stuff

---
 t/000-load.t   | 12 ------------
 t/001-term.t   | 60 ----------------------------------------------------------
 t/002-html.t   | 51 -------------------------------------------------
 t/003-detect.t | 37 ------------------------------------
 t/004-eval.t   | 40 ---------------------------------------
 t/005-object.t | 10 ----------
 t/01-term.t    | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 t/02-html.t    | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 t/03-detect.t  | 37 ++++++++++++++++++++++++++++++++++++
 t/04-eval.t    | 40 +++++++++++++++++++++++++++++++++++++++
 t/05-object.t  | 10 ++++++++++
 11 files changed, 198 insertions(+), 210 deletions(-)
 delete mode 100644 t/000-load.t
 delete mode 100644 t/001-term.t
 delete mode 100644 t/002-html.t
 delete mode 100644 t/003-detect.t
 delete mode 100644 t/004-eval.t
 delete mode 100644 t/005-object.t
 create mode 100644 t/01-term.t
 create mode 100644 t/02-html.t
 create mode 100644 t/03-detect.t
 create mode 100644 t/04-eval.t
 create mode 100644 t/05-object.t

(limited to 't')

diff --git a/t/000-load.t b/t/000-load.t
deleted file mode 100644
index 49c3422..0000000
--- a/t/000-load.t
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::More tests => 3;
-
-package Foo;
-::use_ok('Carp::Always::Color')
-    or ::BAIL_OUT("couldn't load Carp::Always::Color");
-::use_ok('Carp::Always::Color::Term')
-    or ::BAIL_OUT("couldn't load Carp::Always::Color::Term");
-::use_ok('Carp::Always::Color::HTML')
-    or ::BAIL_OUT("couldn't load Carp::Always::Color::HTML");
diff --git a/t/001-term.t b/t/001-term.t
deleted file mode 100644
index b93af1e..0000000
--- a/t/001-term.t
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::More;
-BEGIN {
-    eval "use IO::Pty::Easy;";
-    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
-    plan tests => 5;
-}
-
-sub output_is {
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    my ($script, $expected, $desc) = @_;
-    my $pty = IO::Pty::Easy->new;
-    $pty->spawn("$^X", "-e", $script);
-    is($pty->read, $expected, $desc);
-}
-
-output_is(<<EOF,
-    use Carp::Always::Color::Term;
-    warn "foo";
-EOF
-    "\e[33mfoo\e[m at -e line 2\n",
-    "simple warns work");
-
-output_is(<<EOF,
-    use Carp::Always::Color::Term;
-    sub foo {
-        warn "foo";
-    }
-    foo();
-EOF
-    "\e[33mfoo\e[m at -e line 3\n\tmain::foo() called at -e line 5\n",
-    "warns with a stacktrace work");
-
-output_is(<<EOF,
-    use Carp::Always::Color::Term;
-    die "foo";
-EOF
-    "\e[31mfoo\e[m at -e line 2\n",
-    "simple dies work");
-
-output_is(<<EOF,
-    use Carp::Always::Color::Term;
-    sub foo {
-        die "foo";
-    }
-    foo();
-EOF
-    "\e[31mfoo\e[m at -e line 3\n\tmain::foo() called at -e line 5\n",
-    "dies with a stacktrace work");
-
-{ local $TODO = "this is a Carp::Always bug";
-output_is(<<EOF,
-    use Carp::Always::Color::Term;
-    die "foo at bar line 23";
-EOF
-    "\e[31mfoo at bar line 23\e[m at -e line 2\n",
-    "weird messages work");
-}
diff --git a/t/002-html.t b/t/002-html.t
deleted file mode 100644
index f51914d..0000000
--- a/t/002-html.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::More;
-BEGIN {
-    eval "use IO::Pty::Easy;";
-    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
-    plan tests => 4;
-}
-
-sub output_is {
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    my ($script, $expected, $desc) = @_;
-    my $pty = IO::Pty::Easy->new;
-    $pty->spawn("$^X", "-e", $script);
-    is($pty->read, $expected, $desc);
-}
-
-output_is(<<EOF,
-    use Carp::Always::Color::HTML;
-    warn "foo";
-EOF
-    "<span style=\"color:#880\">foo</span> at -e line 2\n",
-    "simple warns work");
-
-output_is(<<EOF,
-    use Carp::Always::Color::HTML;
-    sub foo {
-        warn "foo";
-    }
-    foo();
-EOF
-    "<span style=\"color:#880\">foo</span> at -e line 3\n\tmain::foo() called at -e line 5\n",
-    "warns with a stacktrace work");
-
-output_is(<<EOF,
-    use Carp::Always::Color::HTML;
-    die "foo";
-EOF
-    "<span style=\"color:#800\">foo</span> at -e line 2\n",
-    "simple dies work");
-
-output_is(<<EOF,
-    use Carp::Always::Color::HTML;
-    sub foo {
-        die "foo";
-    }
-    foo();
-EOF
-    "<span style=\"color:#800\">foo</span> at -e line 3\n\tmain::foo() called at -e line 5\n",
-    "dies with a stacktrace work");
diff --git a/t/003-detect.t b/t/003-detect.t
deleted file mode 100644
index 6c4f7d3..0000000
--- a/t/003-detect.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::More;
-BEGIN {
-    eval "use IO::Pty::Easy;";
-    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
-    plan tests => 2;
-}
-
-sub output_is {
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    my ($script, $expected, $desc) = @_;
-    my $pty = IO::Pty::Easy->new;
-    $pty->spawn("$^X", "-e", $script);
-    is($pty->read, $expected, $desc);
-}
-
-output_is(<<EOF,
-    use Carp::Always::Color;
-    warn "foo";
-EOF
-    "\e[33mfoo\e[m at -e line 2\n",
-    "detection works for terminal output");
-
-output_is(<<EOF,
-    my \$stderr;
-    BEGIN {
-        close(STDERR);
-        open(STDERR, '>', \\\$stderr);
-    }
-    use Carp::Always::Color;
-    warn "foo";
-    print \$stderr;
-EOF
-    "<span style=\"color:#880\">foo</span> at -e line 7\n",
-    "detection works for terminal output");
diff --git a/t/004-eval.t b/t/004-eval.t
deleted file mode 100644
index 3500dc0..0000000
--- a/t/004-eval.t
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::More;
-BEGIN {
-    eval "use IO::Pty::Easy;";
-    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
-    plan tests => 2;
-}
-
-sub output_is {
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    my ($script, $expected, $desc) = @_;
-    my $pty = IO::Pty::Easy->new;
-    $pty->spawn("$^X", "-e", $script);
-    is($pty->read, $expected, $desc);
-}
-
-output_is(<<EOF,
-    use Carp::Always::Color;
-    eval { die "foo" };
-    if (\$@) {
-        die \$@;
-    }
-EOF
-    "\e[31m\e[31mfoo\e[m\e[m at -e line 4\n",
-    "rethrowing works");
-
-output_is(<<EOF,
-    use Carp::Always::Color;
-    sub foo {
-        eval { die "foo" };
-        if (\$@) {
-            die \$@;
-        }
-    }
-    foo();
-EOF
-    "\e[31m\e[31mfoo\e[m\e[m at -e line 5\n\tmain::foo() called at -e line 8\n",
-    "rethrowing works inside functions");
diff --git a/t/005-object.t b/t/005-object.t
deleted file mode 100644
index 3a88dd3..0000000
--- a/t/005-object.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::More tests => 1;
-
-use Carp::Always::Color;
-
-my $err = bless({}, 'My::Error::Class');
-eval { die $err };
-is($@, $err, "exception objects aren't affected");
diff --git a/t/01-term.t b/t/01-term.t
new file mode 100644
index 0000000..b93af1e
--- /dev/null
+++ b/t/01-term.t
@@ -0,0 +1,60 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+BEGIN {
+    eval "use IO::Pty::Easy;";
+    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
+    plan tests => 5;
+}
+
+sub output_is {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    my ($script, $expected, $desc) = @_;
+    my $pty = IO::Pty::Easy->new;
+    $pty->spawn("$^X", "-e", $script);
+    is($pty->read, $expected, $desc);
+}
+
+output_is(<<EOF,
+    use Carp::Always::Color::Term;
+    warn "foo";
+EOF
+    "\e[33mfoo\e[m at -e line 2\n",
+    "simple warns work");
+
+output_is(<<EOF,
+    use Carp::Always::Color::Term;
+    sub foo {
+        warn "foo";
+    }
+    foo();
+EOF
+    "\e[33mfoo\e[m at -e line 3\n\tmain::foo() called at -e line 5\n",
+    "warns with a stacktrace work");
+
+output_is(<<EOF,
+    use Carp::Always::Color::Term;
+    die "foo";
+EOF
+    "\e[31mfoo\e[m at -e line 2\n",
+    "simple dies work");
+
+output_is(<<EOF,
+    use Carp::Always::Color::Term;
+    sub foo {
+        die "foo";
+    }
+    foo();
+EOF
+    "\e[31mfoo\e[m at -e line 3\n\tmain::foo() called at -e line 5\n",
+    "dies with a stacktrace work");
+
+{ local $TODO = "this is a Carp::Always bug";
+output_is(<<EOF,
+    use Carp::Always::Color::Term;
+    die "foo at bar line 23";
+EOF
+    "\e[31mfoo at bar line 23\e[m at -e line 2\n",
+    "weird messages work");
+}
diff --git a/t/02-html.t b/t/02-html.t
new file mode 100644
index 0000000..f51914d
--- /dev/null
+++ b/t/02-html.t
@@ -0,0 +1,51 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+BEGIN {
+    eval "use IO::Pty::Easy;";
+    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
+    plan tests => 4;
+}
+
+sub output_is {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    my ($script, $expected, $desc) = @_;
+    my $pty = IO::Pty::Easy->new;
+    $pty->spawn("$^X", "-e", $script);
+    is($pty->read, $expected, $desc);
+}
+
+output_is(<<EOF,
+    use Carp::Always::Color::HTML;
+    warn "foo";
+EOF
+    "<span style=\"color:#880\">foo</span> at -e line 2\n",
+    "simple warns work");
+
+output_is(<<EOF,
+    use Carp::Always::Color::HTML;
+    sub foo {
+        warn "foo";
+    }
+    foo();
+EOF
+    "<span style=\"color:#880\">foo</span> at -e line 3\n\tmain::foo() called at -e line 5\n",
+    "warns with a stacktrace work");
+
+output_is(<<EOF,
+    use Carp::Always::Color::HTML;
+    die "foo";
+EOF
+    "<span style=\"color:#800\">foo</span> at -e line 2\n",
+    "simple dies work");
+
+output_is(<<EOF,
+    use Carp::Always::Color::HTML;
+    sub foo {
+        die "foo";
+    }
+    foo();
+EOF
+    "<span style=\"color:#800\">foo</span> at -e line 3\n\tmain::foo() called at -e line 5\n",
+    "dies with a stacktrace work");
diff --git a/t/03-detect.t b/t/03-detect.t
new file mode 100644
index 0000000..6c4f7d3
--- /dev/null
+++ b/t/03-detect.t
@@ -0,0 +1,37 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+BEGIN {
+    eval "use IO::Pty::Easy;";
+    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
+    plan tests => 2;
+}
+
+sub output_is {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    my ($script, $expected, $desc) = @_;
+    my $pty = IO::Pty::Easy->new;
+    $pty->spawn("$^X", "-e", $script);
+    is($pty->read, $expected, $desc);
+}
+
+output_is(<<EOF,
+    use Carp::Always::Color;
+    warn "foo";
+EOF
+    "\e[33mfoo\e[m at -e line 2\n",
+    "detection works for terminal output");
+
+output_is(<<EOF,
+    my \$stderr;
+    BEGIN {
+        close(STDERR);
+        open(STDERR, '>', \\\$stderr);
+    }
+    use Carp::Always::Color;
+    warn "foo";
+    print \$stderr;
+EOF
+    "<span style=\"color:#880\">foo</span> at -e line 7\n",
+    "detection works for terminal output");
diff --git a/t/04-eval.t b/t/04-eval.t
new file mode 100644
index 0000000..3500dc0
--- /dev/null
+++ b/t/04-eval.t
@@ -0,0 +1,40 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+BEGIN {
+    eval "use IO::Pty::Easy;";
+    plan skip_all => "IO::Pty::Easy is required for this test" if $@;
+    plan tests => 2;
+}
+
+sub output_is {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    my ($script, $expected, $desc) = @_;
+    my $pty = IO::Pty::Easy->new;
+    $pty->spawn("$^X", "-e", $script);
+    is($pty->read, $expected, $desc);
+}
+
+output_is(<<EOF,
+    use Carp::Always::Color;
+    eval { die "foo" };
+    if (\$@) {
+        die \$@;
+    }
+EOF
+    "\e[31m\e[31mfoo\e[m\e[m at -e line 4\n",
+    "rethrowing works");
+
+output_is(<<EOF,
+    use Carp::Always::Color;
+    sub foo {
+        eval { die "foo" };
+        if (\$@) {
+            die \$@;
+        }
+    }
+    foo();
+EOF
+    "\e[31m\e[31mfoo\e[m\e[m at -e line 5\n\tmain::foo() called at -e line 8\n",
+    "rethrowing works inside functions");
diff --git a/t/05-object.t b/t/05-object.t
new file mode 100644
index 0000000..3a88dd3
--- /dev/null
+++ b/t/05-object.t
@@ -0,0 +1,10 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More tests => 1;
+
+use Carp::Always::Color;
+
+my $err = bless({}, 'My::Error::Class');
+eval { die $err };
+is($@, $err, "exception objects aren't affected");
-- 
cgit v1.2.3-54-g00ecf