Revert "From: Todd Rinaldo <toddr@cpanel.net>"

This reverts commit 213a5d2cb3aa3b5c246b024e7e9c9903eba9decf.

2 files changed, 11 insertions, 36 deletions

diff --git a/dist/Locale-Maketext/t/30_local.t b/dist/Locale-Maketext/t/30_local.t
index 23fa2ac551..8b89777e20 100644
--- a/dist/Locale-Maketext/t/30_local.t
+++ b/dist/Locale-Maketext/t/30_local.t
@@ -2,8 +2,12 @@
 
 use strict;
 
-use Test::More tests => 3;
+use Test::More tests => 4;
 use Locale::Maketext;
+print "# Hi there...\n";
+pass();
+
+print "# --- Making sure that Perl globals are localized ---\n";
 
 # declare a class...
 {
@@ -16,8 +20,11 @@ use Locale::Maketext;
 }
 
 my $lh = Woozle->new();
-isa_ok($lh, 'Woozle');
+ok(ref $lh, 'Basic sanity');
 
 $@ = 'foo';
-is($lh->maketext('Eval error: [_1]', $@), 'Eval error: foo', "Make sure \$@ is localized when passed to maketext");
-is($@, 'foo', "\$@ wasn't modified during call");
+is($lh->maketext('Eval error: [_1]', $@), 'Eval error: foo',
+  'Make sure $@ is localized');
+
+print "# Byebye!\n";
+pass();
diff --git a/dist/Locale-Maketext/t/70_fail_auto.t b/dist/Locale-Maketext/t/70_fail_auto.t
deleted file mode 100644
index 44fe54d1b5..0000000000
--- a/dist/Locale-Maketext/t/70_fail_auto.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Test::More tests => 5;
-
-BEGIN {
-    use_ok( 'Locale::Maketext' );
-}
-
-{
-    package Whunk::L10N;
-    use vars qw(@ISA);
-    @ISA =  'Locale::Maketext';
-}
-
-{
-    package Whunk::L10N::en;
-    use vars qw(@ISA);
-    @ISA = 'Whunk::L10N';
-}
-
-my $lh = Whunk::L10N->get_handle('en');
-$lh->fail_with('failure_handler_auto');
-
-is($lh->maketext('abcd'), 'abcd', "simple missing keys are handled"); 
-is($lh->maketext('abcd'), 'abcd', "even in repeated calls"); 
-# CPAN RT #25877 - $value Not Set After Second Call to failure_handler_auto()
-
-is($lh->maketext('Hey, [_1]', 'you'), 'Hey, you', "keys with bracket notation ok");
-
-is($lh->maketext('_key'), '_key', "keys which start with _ ok");
-