Test::Simple/More/Builder/Tutorial 0.41

[p5sagit/p5-mst-13.2.git] / lib / Test / Simple / t / plan_no_plan.t

diff --git a/lib/Test/Simple/t/plan_no_plan.t b/lib/Test/Simple/t/plan_no_plan.t
index 0ccc817..b39b101 100644 (file)
--- a/lib/Test/Simple/t/plan_no_plan.t
+++ b/lib/Test/Simple/t/plan_no_plan.t
@@ -1,56 +1,28 @@
 BEGIN {
-    chdir 't' if -d 't';
-    @INC = '../lib';
+    if( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
 }
 
-# Can't use Test.pm, that's a 5.005 thing.
-package My::Test;
+use Test::More;
 
-print "1..2\n";
-
-my $test_num = 1;
-# Utility testing functions.
-sub ok ($;$) {
-    my($test, $name) = @_;
-    my $ok = '';
-    $ok .= "not " unless $test;
-    $ok .= "ok $test_num";
-    $ok .= " - $name" if defined $name;
-    $ok .= "\n";
-    print $ok;
-    $test_num++;
+BEGIN {
+    if( !$ENV{HARNESS_ACTIVE} && $ENV{PERL_CORE} ) {
+        plan skip_all => "Won't work with t/TEST";
+    }
 }
 
-
-package main;
-
-require Test::More;
-Test::More->import;
-my($out, $err);
-
 BEGIN {
     require Test::Harness;
 }
 
 if( $Test::Harness::VERSION < 1.20 ) {
-    plan(skip_all => 'Need Test::Harness 1.20 or up');
+    plan skip_all => 'Need Test::Harness 1.20 or up';
 }
 else {
-    push @INC, '../t/lib';
-    require Test::Simple::Catch;
-    ($out, $err) = Test::Simple::Catch::caught();
-    plan('no_plan');
+    plan 'no_plan';
 }
 
 pass('Just testing');
 ok(1, 'Testing again');
-
-END {
-    My::Test::ok($$out eq <<OUT);
-ok 1 - Just testing
-ok 2 - Testing again
-1..2
-OUT
-
-    My::Test::ok($$err eq '');
-}