cleanup tests and commented out code

frioux · Jan 11, 2011 · 7b2244b · 7b2244b
1 parent 9f52f29
commit 7b2244b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 21 deletions.
diff --git a/lib/Config/JFDI/Source/Loader.pm b/lib/Config/JFDI/Source/Loader.pm
@@ -204,7 +204,6 @@ sub _get_path {
 
     my $name = $self->name;
     my $path;
-#    $path = _env($name, 'CONFIG') if $name && ! $self->no_env;
     $path = $self->_env_lookup('CONFIG') unless $self->no_env;
     $path ||= $self->path;
 

diff --git a/t/10-loader.t b/t/10-loader.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 
 use Test::More;
-plan qw/no_plan/;
 
 use Config::JFDI;
 
@@ -14,9 +13,7 @@ is($config->load->{'Controller::Foo'}->{new},         'key');
 is($config->load->{'Model::Baz'}->{qux},              'xyzzy');
 is($config->load->{'Model::Baz'}->{another},          'new key');
 is($config->load->{'view'},                           'View::TT::New');
-#is($config->load->{'foo_sub'},                       'x-y');
 is($config->load->{'foo_sub'},                        '__foo(x,y)__');
-#is($config->load->{'literal_macro'},                 '__DATA__');
 is($config->load->{'literal_macro'},                  '__literal(__DATA__)__');
 
-ok(1);
+done_testing;
diff --git a/t/11-loader-env.t b/t/11-loader-env.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 
 use Test::More;
-plan qw/no_plan/;
 
 use Config::JFDI;
 
@@ -15,12 +14,12 @@ is($config->load->{'Controller::Foo'}->{foo},       'bar');
 is($config->load->{'Model::Baz'}->{qux},            'xyzzy');
 is($config->load->{'view'},                         'View::TT');
 is($config->load->{'random'},                        1);
-#is($config->load->{'foo_sub'},                      '__foo(x,y)__' );
-#is($config->load->{'literal_macro'},                '__literal(__DATA__)__');
 
 $ENV{XYZZY_CONFIG} = "t/assets/some_non_existent_file.pl";
 
 $config->reload;
 
 ok($config->load);
 is(scalar keys %{ $config->load }, 0);
+
+done_testing;
diff --git a/t/12-loader-file.t b/t/12-loader-file.t
@@ -5,8 +5,6 @@ use Test::More;
 use Test::Deep;
 use Test::Warn;
 
-plan qw/no_plan/;
-
 use Config::JFDI;
 
 sub has_Config_General {
@@ -23,8 +21,6 @@ sub has_Config_General {
     is($config->load->{'Model::Baz'}->{qux},            'xyzzy');
     is($config->load->{'view'},                         'View::TT');
     is($config->load->{'random'},                        1);
-    #is($config->load->{'foo_sub'},                      '__foo(x,y)__' );
-    #is($config->load->{'literal_macro'},                '__literal(__DATA__)__');
 }
 
 SKIP: {
@@ -78,3 +74,5 @@ SKIP: {
     cmp_deeply( $config->load, {
     } );
 }
+
+done_testing;
diff --git a/t/13-loader-no-env.t b/t/13-loader-no-env.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 
 use Test::More;
-plan qw/no_plan/;
 
 use Config::JFDI;
 
@@ -18,3 +17,5 @@ is($config->load->{'Model::Baz'}->{another},        'new key');
 is($config->load->{'view'},                         'View::TT::New');
 is($config->load->{'foo_sub'},                      '__foo(x,y)__' );
 is($config->load->{'literal_macro'},                '__literal(__DATA__)__');
+
+done_testing;
diff --git a/t/14-loader-env-lookup.t b/t/14-loader-env-lookup.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 
 use Test::More;
-plan qw/no_plan/;
 
 use Config::JFDI;
 
@@ -18,8 +17,6 @@ ok($config->load);
 is($config->load->{'Controller::Foo'}->{foo},       'bar');
 is($config->load->{'Model::Baz'}->{qux},            'xyzzy');
 is($config->load->{'view'},                         'View::TT');
-#is($config->load->{'foo_sub'},                      '__foo(x,y)__' );
-#is($config->load->{'literal_macro'},                '__literal(__DATA__)__');
 is($config->load->{'random'},                        1);
 
 $ENV{XYZZY_CONFIG} = "t/assets/xyzzy.pl";
@@ -34,3 +31,5 @@ is($config->load->{'Model::Baz'}->{another},        'new key');
 is($config->load->{'view'},                         'View::TT::New');
 is($config->load->{'foo_sub'},                      '__foo(x,y)__' );
 is($config->load->{'literal_macro'},                '__literal(__DATA__)__');
+
+done_testing;
diff --git a/t/16-loader-order.t b/t/16-loader-order.t
@@ -4,7 +4,6 @@ use warnings;
 use Test::More;
 
 plan skip_all => "Config::General is required for this test" unless eval "require Config::General;";
-plan qw/no_plan/;
 
 use Config::JFDI;
 
@@ -13,3 +12,5 @@ my $config = Config::JFDI->new(qw{ name xyzzy path t/assets/order });
 ok($config->load);
 is($config->load->{'last'}, 'local_pl');
 is($config->load->{$_}, 1) for qw/pl perl local_pl local_perl cnf local_cnf conf local_conf/;
+
+done_testing;
diff --git a/t/17-found.t b/t/17-found.t
@@ -4,8 +4,6 @@ use warnings;
 use Test::More;
 use Test::Deep;
 
-plan qw/no_plan/;
-
 use Config::JFDI;
 
 sub has_Config_General {
@@ -46,3 +44,4 @@ sub has_Config_General {
     cmp_deeply( [ $config->found ], bag( 't/assets/some_random_file.pl' ) );
 }
 
+done_testing;
diff --git a/t/18-open.t b/t/18-open.t
@@ -4,8 +4,6 @@ use warnings;
 use Test::More;
 use Test::Warn;
 
-plan qw/no_plan/;
-
 use Config::JFDI;
 
 sub has_Config_General {
@@ -43,3 +41,4 @@ sub has_Config_General {
     ok( $config->isa('Config::JFDI') );
 }
 
+done_testing;