Merge lp:~fallaby/mvhub/remove_begin_block_578482 into lp:mvhub

[frank allaby]

[Dan MacNeil (omacneil)]

385 -use Test::More tests => 12 + 1; # +1 for NoWarnings
386 +use Test::More tests => 12; # +1 for NoWarnings

Better:

385 -use Test::More tests => 12 + 1; # +1 for NoWarnings
386 +use Test::More tests => 11 +1 ; # +1 for NoWarnings

see:

  man Test::NoWarnings;

review: Needs Fixing

[Dan MacNeil (omacneil)]

487 -use Test::More tests => 5 + 1; # +1 for NoWarnings
488 +use Test::More tests => 5;

better:

487 -use Test::More tests => 5 + 1; # +1 for NoWarnings
488 +use Test::More tests => 4 + 1 ; # +1 for NoWarnings

review: Needs Fixing

[Dan MacNeil (omacneil)]

otherwise pretty good, will approve & merge one these nits are fixed.

[lp:~fallaby/mvhub/remove_begin_block_578482]

496. By frank allaby on 2010-09-28

fixes from Dan

497. By frank allaby on 2010-09-28

merged trunk

=== modified file 'app-mvhub/t/bugs/admin_logout_bug.t'
--- app-mvhub/t/bugs/admin_logout_bug.t	2009-09-15 01:12:17 +0000
+++ app-mvhub/t/bugs/admin_logout_bug.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::WWW::Mechanize;
 use Test::More;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}    #BEGIN
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/bugs/categorize_link_missing_when_agency_login.t'
--- app-mvhub/t/bugs/categorize_link_missing_when_agency_login.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/bugs/categorize_link_missing_when_agency_login.t	2010-09-28 16:02:42 +0000
@@ -10,10 +10,6 @@
 
 use Params::Validate qw/:all/;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}    #BEGIN
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/bugs/guide.pl_incomplete_path.t'
--- app-mvhub/t/bugs/guide.pl_incomplete_path.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/bugs/guide.pl_incomplete_path.t	2010-09-28 16:02:42 +0000
@@ -9,11 +9,6 @@
 use Test::WWW::Mechanize;
 use WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}    #BEGIN
-
 {    #main
     my $host            = TestHelper::get_test_website_name('nsp');
     my @pages           = init_pages($host);

=== modified file 'app-mvhub/t/bugs/ql_display_agency_home_interaction.t'
--- app-mvhub/t/bugs/ql_display_agency_home_interaction.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/bugs/ql_display_agency_home_interaction.t	2010-09-28 16:02:42 +0000
@@ -10,10 +10,6 @@
 
 use Params::Validate qw/:all/;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}    #BEGIN
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/admin/01_add_complete_agency.t'
--- app-mvhub/t/mech/admin/01_add_complete_agency.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/admin/01_add_complete_agency.t	2010-09-28 16:02:42 +0000
@@ -8,10 +8,6 @@
 
 use English '-no_match_vars';
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    # main

=== modified file 'app-mvhub/t/mech/user/agency_search_form_found_mvh_only.t'
--- app-mvhub/t/mech/user/agency_search_form_found_mvh_only.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/agency_search_form_found_mvh_only.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/agency_search_form_found_nsp_only.t'
--- app-mvhub/t/mech/user/agency_search_form_found_nsp_only.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/agency_search_form_found_nsp_only.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/agency_search_form_not_found.t'
--- app-mvhub/t/mech/user/agency_search_form_not_found.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/agency_search_form_not_found.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/category_search_form_blank.t'
--- app-mvhub/t/mech/user/category_search_form_blank.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/category_search_form_blank.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/category_search_form_found_in_all_db.t'
--- app-mvhub/t/mech/user/category_search_form_found_in_all_db.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/category_search_form_found_in_all_db.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/category_search_form_not_found.t'
--- app-mvhub/t/mech/user/category_search_form_not_found.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/category_search_form_not_found.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/contact_having_required.t'
--- app-mvhub/t/mech/user/contact_having_required.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/contact_having_required.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/contact_missing_required.t'
--- app-mvhub/t/mech/user/contact_missing_required.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/contact_missing_required.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/login_with_bad_password.t'
--- app-mvhub/t/mech/user/login_with_bad_password.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/login_with_bad_password.t	2010-09-28 16:02:42 +0000
@@ -6,10 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/mech/user/stuff_search_contact.t'
--- app-mvhub/t/mech/user/stuff_search_contact.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/mech/user/stuff_search_contact.t	2010-09-28 16:02:42 +0000
@@ -6,11 +6,6 @@
 use Test::More;
 use Test::WWW::Mechanize;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-    use lib qw(../../lib);
-}
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/repo_matches_file_system.t'
--- app-mvhub/t/repo_matches_file_system.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/repo_matches_file_system.t	2010-09-28 16:02:42 +0000
@@ -4,12 +4,8 @@
 use warnings;
 
 use Test::More;
-use File::Basename qw/basename/;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
+use File::Basename;
+use FindBin;
 
 use TestHelper;
 
@@ -20,7 +16,7 @@
         '/etc/postgresql/8.1/main/postgresql.conf'
 );
 
-my @hosts = qw/groundhog /;
+my @hosts = qw/groundhog/;
 
 my $num_tests = scalar keys %installed;
 plan tests => $num_tests;
@@ -32,8 +28,9 @@
     if ($run_on_this_host) {
 
         foreach my $file ( keys %installed ) {
-            my $basename      = basename $file;
-            my $no_difference = TestHelper::no_difference( "$Bin/../$file",
+            my $basename = File::Basename::basename $file;
+            my $no_difference
+                = TestHelper::no_difference( "$FindBin::Bin/../$file",
                 $installed{$file} );
             is( $no_difference,, 1,
                 "installed version of $basename is in version control" );

=== modified file 'app-mvhub/t/required_comments_present.t'
--- app-mvhub/t/required_comments_present.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/required_comments_present.t	2010-09-28 16:02:42 +0000
@@ -7,11 +7,6 @@
 use File::Spec;
 use Carp;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use TestHelper;
 
 {    #main

=== modified file 'app-mvhub/t/sql_lib_sanity.t'
--- app-mvhub/t/sql_lib_sanity.t	2010-09-13 00:58:44 +0000
+++ app-mvhub/t/sql_lib_sanity.t	2010-09-28 16:02:42 +0000
@@ -33,11 +33,6 @@
         $test_placeholders_ref );
 }    #main
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 sub get_test_placeholders {
     my $agency_id      = shift or die 'missing param: agency_id';
     my $quick_login_id = shift or die 'missing param: quick_login_id';

=== modified file 'lib-mvhub/t/00-setup.t'
--- lib-mvhub/t/00-setup.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/00-setup.t	2010-09-28 16:02:42 +0000
@@ -3,11 +3,6 @@
 use strict;
 use warnings;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use DBI;
 use SQL::Library;
 use Test::More;

=== modified file 'lib-mvhub/t/01-load.t'
--- lib-mvhub/t/01-load.t	2009-12-17 22:04:09 +0000
+++ lib-mvhub/t/01-load.t	2010-09-28 16:02:42 +0000
@@ -6,11 +6,6 @@
 use warnings;
 use Test::More;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 eval ' use Test::NoWarnings; ';
 plan skip_all => "Test::NoWarnings needed "
     if $@;

=== modified file 'lib-mvhub/t/03-run_test_class.t'
--- lib-mvhub/t/03-run_test_class.t	2009-12-18 04:24:44 +0000
+++ lib-mvhub/t/03-run_test_class.t	2010-09-28 16:02:42 +0000
@@ -2,11 +2,6 @@
 
 use strict;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 eval {
     require Test::Class;
     require Test::Exception;

=== modified file 'lib-mvhub/t/AgencyAccount/new.t'
--- lib-mvhub/t/AgencyAccount/new.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/AgencyAccount/new.t	2010-09-28 16:02:42 +0000
@@ -5,14 +5,9 @@
 use Test::NoWarnings;
 
 # EDIT
-use Test::More tests => 4;
+use Test::More tests => 3;
 use CGI;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-    use_ok('MVHub::AgencyAccount') or die "couldn't use MVHub::AgencyAccount";
-}
+use MVHub::AgencyAccount;
 
 # return ->run() output instead of sending to stdout
 $ENV{CGI_APP_RETURN_ONLY} = 1;
@@ -42,7 +37,7 @@
 can_ok( 'MVHub::AgencyAccount', @methods );
 
 ###
-$test_name = 'can create new AgnecyAccount';
+$test_name = 'can create new AgencyAccount';
 ###
 my $object = MVHub::AgencyAccount->new();
 isa_ok( $object, 'MVHub::AgencyAccount', $test_name );

=== modified file 'lib-mvhub/t/ArgChecker/get_args.t'
--- lib-mvhub/t/ArgChecker/get_args.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/ArgChecker/get_args.t	2010-09-28 16:02:42 +0000
@@ -3,23 +3,16 @@
 use strict;
 use warnings;
 
-use Test::More tests => 12 + 1;    # +1 for NoWarnings
+use Test::More tests => 11 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::Exception;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::ArgChecker', qw/get_args/ )
-        or die "couldn't use MVHUb::ArgChecker";
-}
+use MVHub::ArgChecker;
 
 my $test_message;
 my $result = 1;
 
 $test_message = "returns all params, even optional ones";
-$result       = get_args(
+$result       = MVHub::ArgChecker::get_args(
     [ 'filename', '?param_href', '?print', '?doctype', '?options_href' ],
     (   'filename'     => 1,
         'param_href'   => 1,
@@ -32,36 +25,40 @@
 
 $test_message = "dies if parameter description is not defined";
 dies_ok {
-    get_args( undef, () );
+    MVHub::ArgChecker::get_args( undef, () );
 };
 
 $test_message = "dies if parameter description is not an array ref";
 dies_ok {
-    get_args( "not an array reference", () );
+    MVHub::ArgChecker::get_args( "not an array reference", () );
 };
 
 $test_message = "dies if missing required param and missing optional params";
 dies_ok {
-    get_args(
+    MVHub::ArgChecker::get_args(
         [ 'filename', '?param_href', '?print', '?doctype', '?options_href' ],
         ()
     );
 };
 
 $test_message = 'die on missing required parameter';
-dies_ok { get_args( [ 'name', 'email', 'address' ], () ) } $test_message;
+dies_ok { MVHub::ArgChecker::get_args( [ 'name', 'email', 'address' ], () ) }
+$test_message;
 
 $test_message
     = q/don't die if no required or optional parameters and no parameters passed/;
-$result = get_args( [], () );
+$result = MVHub::ArgChecker::get_args( [], () );
 is( $result, 0, $test_message );
 
 $test_message = q/ die if extra parameters are passed/;
-dies_ok { get_args( [], ( 'name' => 'yash', 'email' => '[e-mail]' ) ) }
+dies_ok {
+    MVHub::ArgChecker::get_args( [],
+        ( 'name' => 'yash', 'email' => '[e-mail]' ) );
+}
 $test_message;
 
 $test_message = q/don't die if (3) required parameters are present/;
-$result       = get_args(
+$result       = MVHub::ArgChecker::get_args(
     [ 'name', 'email', 'address' ],
     (   'name'    => 'yash',
         'email'   => '[e-mail]',
@@ -72,19 +69,19 @@
 
 $test_message = "die on unkown arguments or on extra arguments\n";
 dies_ok {
-    get_args( [ 'name', 'email', 'address' ],
+    MVHub::ArgChecker::get_args( [ 'name', 'email', 'address' ],
         ( 'name' => 1, 'email' => 1, 'address' => 1, 'extra_param' => 1 ) );
 }
 $test_message;
 
 $test_message = "doesn't die if missing optional params";
 $result
-    = get_args(
+    = MVHub::ArgChecker::get_args(
     [ 'filename', '?param_href', '?print', '?doctype', '?options_href' ],
     ( 'filename' => '/tmp/tmp.txt' ) );
 is( $result, 5, $test_message );
 
 $test_message
     = q/don't die if all parameters are optional and no params passed/;
-$result = get_args( [ '?email', 'name?' ], () );
+$result = MVHub::ArgChecker::get_args( [ '?email', 'name?' ], () );
 is( $result, 2, $test_message );

=== modified file 'lib-mvhub/t/Common/delimit_field.t'
--- lib-mvhub/t/Common/delimit_field.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Common/delimit_field.t	2010-09-28 16:02:42 +0000
@@ -3,17 +3,11 @@
 use strict;
 use warnings;
 
-use Test::More tests => 5 + 1;    # +1 for NoWarnings
+use Test::More tests => 4 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::Exception;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::Common', qw/delimit_field/ )
-        or die "couldn't use MVHUb::Common";
-}
+use MVHub::Common;
 
 my $result           = 1;
 my %arguments_passed = (
@@ -42,6 +36,6 @@
     my @results      = $arguments_passed{$each_arg}{'arg'};
     my $expected     = $arguments_passed{$each_arg}{'expect'};
     my $test_message = "Fields delimited  with " . substr $each_arg, 3;
-    $result = delimit_field(@results);
+    $result = MVHub::Common::delimit_field(@results);
     is( $result, $expected, $test_message );
 }

=== modified file 'lib-mvhub/t/HTMLTemplateUtils/columnize.t'
--- lib-mvhub/t/HTMLTemplateUtils/columnize.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/HTMLTemplateUtils/columnize.t	2010-09-28 16:02:42 +0000
@@ -2,15 +2,9 @@
 
 use strict;
 
-use Test::More tests => 13;
+use Test::More tests => 12;
 use CGI;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-    use_ok( 'MVHub::HTMLTemplateUtils', qw/columnize / )
-        or die "couldn't use MVHUb::HTMLTemplateUtils";
-}
+use MVHub::HTMLTemplateUtils;
 
 if (@ARGV) {
     my ( $columns, $ordering ) = @ARGV;
@@ -29,7 +23,8 @@
         { id => 11, name => 'K' }
     ];
 
-    my $after = columnize( $before, $columns, $ordering );
+    my $after
+        = MVHub::HTMLTemplateUtils::columnize( $before, $columns, $ordering );
     use Data::Dumper;
     print Dumper($after);
     exit(0);
@@ -38,9 +33,9 @@
 # TEST PLAN
 # For both "across" and "down":
 #    On a simple data set of 5 items:
-#       2 middle cases: columns = 2, 3 (also 4 for down)
-#       3 boundary cases: columns = 1, 5
-#       1 case where column number exceeds data size: columns = 10
+#       2 middle cases: MVHub::HTMLTemplateUtils::columns = 2, 3 (also 4 for down)
+#       3 boundary cases: MVHub::HTMLTemplateUtils::columns = 1, 5
+#       1 case where MVHub::HTMLTemplateUtils::column number exceeds data size: MVHub::HTMLTemplateUtils::columns = 10
 #
 # 1 case with a more complex data structure.
 
@@ -76,7 +71,8 @@
     },
     { 'COLUMN_LOOP' => [ { 'name' => 'D' }, { 'name' => 'E' } ] }
 ];
-is_deeply( columnize( $loop_ref, 3, "across" ), $across_3 );
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 3, "across" ),
+    $across_3 );
 
 my $across_5 = [
     {   'COLUMN_LOOP' => [
@@ -89,11 +85,13 @@
     }
 ];
 
-is_deeply( columnize( $loop_ref, 5,  "across" ), $across_5 );
-is_deeply( columnize( $loop_ref, 10, "across" ), $across_5 )
-    ;    # same as across 5
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 5, "across" ),
+    $across_5 );
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 10, "across" ),
+    $across_5 );    # same as across 5
 
-is_deeply( columnize( $loop_ref, 1, "down" ), $across_1 );    #same as across
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 1, "down" ),
+    $across_1 );    #same as across
 
 my $down_2 = [
     { 'COLUMN_LOOP' => [ { 'name' => 'A' }, { 'name' => 'D' } ] },
@@ -101,7 +99,8 @@
     { 'COLUMN_LOOP' => [ { 'name' => 'C' } ] }
 ];
 
-is_deeply( columnize( $loop_ref, 2, "down" ), $down_2 );
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 2, "down" ),
+    $down_2 );
 
 my $down_3 = [
     {   'COLUMN_LOOP' =>
@@ -110,13 +109,17 @@
     { 'COLUMN_LOOP' => [ { 'name' => 'B' }, { 'name' => 'D' } ] }
 ];
 
-is_deeply( columnize( $loop_ref, 3, "down" ), $down_3 );
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 3, "down" ),
+    $down_3 );
 
 # For reasons stated in columnize docs, 4 cols and 3 cols will be same:
-is_deeply( columnize( $loop_ref, 4, "down" ), $down_3 );
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 4, "down" ),
+    $down_3 );
 
-is_deeply( columnize( $loop_ref, 5,  "down" ), $across_5 );    #same as across
-is_deeply( columnize( $loop_ref, 10, "down" ), $across_5 );    #same as across
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 5, "down" ),
+    $across_5 );    #same as across
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $loop_ref, 10, "down" ),
+    $across_5 );    #same as across
 
 my $struct = [
     { id => 1, name => 'April' },
@@ -132,4 +135,5 @@
             [ { id => 2, name => 'Dan' }, { id => 4, name => 'Kevin' } ]
     }
 ];
-is_deeply( columnize( $struct, 2, "down" ), $struct_down_2 );
+is_deeply( MVHub::HTMLTemplateUtils::columnize( $struct, 2, "down" ),
+    $struct_down_2 );

=== modified file 'lib-mvhub/t/HTMLTemplateUtils/format_template.t'
--- lib-mvhub/t/HTMLTemplateUtils/format_template.t	2009-09-15 01:12:17 +0000
+++ lib-mvhub/t/HTMLTemplateUtils/format_template.t	2010-09-28 16:02:42 +0000
@@ -1,14 +1,8 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 8;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-    use_ok( 'MVHub::HTMLTemplateUtils', qw/format_template/ )
-        or die "couldn't use MVHUb::HTMLTemplateUtils";
-}
+use Test::More tests => 7;
+use MVHub::HTMLTemplateUtils;
 
 use Test::NoWarnings;
 use IO::Scalar;
@@ -32,7 +26,7 @@
 
 $params_href = { variable => "Hello World", };
 
-# format_template() can only to some output when printing
+# MVHub::HTMLTemplateUtils::format_template() can only to some output when printing
 # we have to send it's output to a file (sigh)
 
 $output  = '';

=== modified file 'lib-mvhub/t/Notifications/_push_and_return_programs.t'
--- lib-mvhub/t/Notifications/_push_and_return_programs.t	2010-03-30 21:00:29 +0000
+++ lib-mvhub/t/Notifications/_push_and_return_programs.t	2010-09-28 16:02:42 +0000
@@ -13,11 +13,6 @@
 use TestData qw/ @agency /;
 use MVHub::Notifications qw/ _push_and_return_programs /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $test_message;
 my @agency_dummy_data = @TestData::agency;
 

=== modified file 'lib-mvhub/t/Notifications/create_final_notification_emails_with.t'
--- lib-mvhub/t/Notifications/create_final_notification_emails_with.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Notifications/create_final_notification_emails_with.t	2010-09-28 16:02:42 +0000
@@ -3,11 +3,6 @@
 use strict;
 use warnings;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use Test::More tests => 5 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::Exception;

=== modified file 'lib-mvhub/t/Notifications/create_fourth_notification_emails_with.t'
--- lib-mvhub/t/Notifications/create_fourth_notification_emails_with.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Notifications/create_fourth_notification_emails_with.t	2010-09-28 16:02:42 +0000
@@ -3,11 +3,6 @@
 use strict;
 use warnings;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use Test::More tests => 4 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::Exception;

=== modified file 'lib-mvhub/t/Notifications/create_notifications_using.t'
--- lib-mvhub/t/Notifications/create_notifications_using.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Notifications/create_notifications_using.t	2010-09-28 16:02:42 +0000
@@ -3,11 +3,6 @@
 use strict;
 use warnings;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use Test::More tests => 5 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::Exception;

=== modified file 'lib-mvhub/t/Notifications/create_standard_notification_emails_with.t'
--- lib-mvhub/t/Notifications/create_standard_notification_emails_with.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Notifications/create_standard_notification_emails_with.t	2010-09-28 16:02:42 +0000
@@ -3,11 +3,6 @@
 use strict;
 use warnings;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use Test::More tests => 3 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::Exception;

=== modified file 'lib-mvhub/t/Notifications/die_if_record_count_mismatch.t'
--- lib-mvhub/t/Notifications/die_if_record_count_mismatch.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Notifications/die_if_record_count_mismatch.t	2010-09-28 16:02:42 +0000
@@ -3,11 +3,6 @@
 use strict;
 use warnings;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use Test::More tests => 2 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::Exception;

=== modified file 'lib-mvhub/t/Notifications/get_email_constants_from.t'
--- lib-mvhub/t/Notifications/get_email_constants_from.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Notifications/get_email_constants_from.t	2010-09-28 16:02:42 +0000
@@ -12,11 +12,6 @@
     get_email_constants_from
     /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $test_message;
 
 ###

=== modified file 'lib-mvhub/t/Notifications/get_expired_records.t'
--- lib-mvhub/t/Notifications/get_expired_records.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Notifications/get_expired_records.t	2010-09-28 16:02:42 +0000
@@ -12,10 +12,6 @@
 use MVHub::Notifications qw/ get_expired_records /;
 use MVHub::Utils::DB qw/ get_dbh /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
 my $cfg
     = MVHub::Utils::ConfigSimple::create_config_from( $ENV{MV_CONFIG_FILE} );
 my $dbh = MVHub::Utils::DB::get_dbh( $ENV{MV_CONFIG_FILE} );

=== modified file 'lib-mvhub/t/Notifications/increment_reminder_levels_for.t'
--- lib-mvhub/t/Notifications/increment_reminder_levels_for.t	2010-04-01 18:19:48 +0000
+++ lib-mvhub/t/Notifications/increment_reminder_levels_for.t	2010-09-28 16:02:42 +0000
@@ -11,11 +11,6 @@
 use MVHub::Notifications qw/ increment_reminder_levels_for /;
 use TestData qw/ notifications_href /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $test_message;
 
 ###

=== modified file 'lib-mvhub/t/Notifications/print_emails_contained_in.t'
--- lib-mvhub/t/Notifications/print_emails_contained_in.t	2010-03-30 21:00:29 +0000
+++ lib-mvhub/t/Notifications/print_emails_contained_in.t	2010-09-28 16:02:42 +0000
@@ -12,11 +12,6 @@
 
 use MVHub::Notifications qw/ print_emails_contained_in /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $CFG
     = MVHub::Utils::ConfigSimple::create_config_from( $ENV{MV_CONFIG_FILE} );
 

=== modified file 'lib-mvhub/t/Notifications/send_emails_contained_in.t'
--- lib-mvhub/t/Notifications/send_emails_contained_in.t	2010-03-30 21:00:29 +0000
+++ lib-mvhub/t/Notifications/send_emails_contained_in.t	2010-09-28 16:02:42 +0000
@@ -12,11 +12,6 @@
 
 use MVHub::Notifications qw/ send_emails_contained_in /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $CFG
     = MVHub::Utils::ConfigSimple::create_config_from( $ENV{MV_CONFIG_FILE} );
 

=== modified file 'lib-mvhub/t/Notifications/set_reminder_level_in_db.t'
--- lib-mvhub/t/Notifications/set_reminder_level_in_db.t	2010-03-31 20:04:36 +0000
+++ lib-mvhub/t/Notifications/set_reminder_level_in_db.t	2010-09-28 16:02:42 +0000
@@ -17,11 +17,6 @@
 use TestHelper qw/ add_test_data create_sqlite_db /;
 use TestData qw/ notifications_href /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $cfg = MVHub::Utils::ConfigSimple::create_config_from(
     $ENV{MV_TEST_CONFIG_FILE} );
 my $max_notifications = $cfg->param('NOTIFICATION.max_notifications');

=== modified file 'lib-mvhub/t/Notifications/shift_off_notifications_with_reminder_count.t'
--- lib-mvhub/t/Notifications/shift_off_notifications_with_reminder_count.t	2010-03-30 21:00:29 +0000
+++ lib-mvhub/t/Notifications/shift_off_notifications_with_reminder_count.t	2010-09-28 16:02:42 +0000
@@ -13,11 +13,6 @@
 use TestData qw/ notifications_href /;
 use MVHub::Notifications qw/ shift_off_notifications_with_reminder_count /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $test_message;
 
 ###

=== modified file 'lib-mvhub/t/Utils/ConfigSimple/_calculate_extra_cfg_params_from.t'
--- lib-mvhub/t/Utils/ConfigSimple/_calculate_extra_cfg_params_from.t	2010-05-21 14:26:58 +0000
+++ lib-mvhub/t/Utils/ConfigSimple/_calculate_extra_cfg_params_from.t	2010-09-28 16:02:42 +0000
@@ -10,11 +10,6 @@
 
 use MVHub::Utils::ConfigSimple qw/ _calculate_extra_cfg_params_from /;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 my $cfg = new Config::Simple( syntax => 'ini' );
 my $test_name;
 

=== modified file 'lib-mvhub/t/Utils/DB/get_data_source.t'
--- lib-mvhub/t/Utils/DB/get_data_source.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/DB/get_data_source.t	2010-09-28 16:02:42 +0000
@@ -5,11 +5,6 @@
 
 use Test::More tests => 5;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use MVHub::Utils::DB qw/get_data_source/;
 use MVHub::Utils::ConfigSimple qw/create_config_from/;
 

=== modified file 'lib-mvhub/t/Utils/DB/get_sql_insert_statement.t'
--- lib-mvhub/t/Utils/DB/get_sql_insert_statement.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/DB/get_sql_insert_statement.t	2010-09-28 16:02:42 +0000
@@ -7,11 +7,6 @@
 use Test::NoWarnings;
 use Test::Exception;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use MVHub::Utils::DB qw/get_sql_insert_statement/;
 
 my $test_message;

=== modified file 'lib-mvhub/t/Utils/DB/get_sql_select_statement.t'
--- lib-mvhub/t/Utils/DB/get_sql_select_statement.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/DB/get_sql_select_statement.t	2010-09-28 16:02:42 +0000
@@ -7,11 +7,6 @@
 use Test::NoWarnings;
 use Test::Exception;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use MVHub::Utils::DB qw/get_sql_select_statement/;
 
 my $test_message;

=== modified file 'lib-mvhub/t/Utils/DB/get_sql_update_statement.t'
--- lib-mvhub/t/Utils/DB/get_sql_update_statement.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/DB/get_sql_update_statement.t	2010-09-28 16:02:42 +0000
@@ -7,11 +7,6 @@
 use Test::NoWarnings;
 use Test::Exception;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}
-
 use MVHub::Utils::DB qw/get_sql_update_statement/;
 
 my $test_message;

=== modified file 'lib-mvhub/t/Utils/assert.t'
--- lib-mvhub/t/Utils/assert.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/assert.t	2010-09-28 16:02:42 +0000
@@ -1,23 +1,18 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 5;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::Utils', qw/ assert / ) or die "couldn't use MVHub::Utils";
-}
-
-is( assert( 1, 'an assertion message' ),
+use Test::More tests => 4;
+use MVHub::Utils;
+
+is( MVHub::Utils::assert( 1, 'an assertion message' ),
     undef, "assert doesn't die with true assertion" );
-is( assert(1), undef, "assert doesn't die with true assertion (no message)" );
+is( MVHub::Utils::assert(1), undef,
+    "assert doesn't die with true assertion (no message)" );
 
-eval { assert(0); };
+eval { MVHub::Utils::assert(0); };
 like( $@, qr(Assertion failed), "Assert dies with false assertion" );
 
-eval { assert( 0, "an assertion messag" ); };
+eval { MVHub::Utils::assert( 0, "an assertion message" ); };
 like(
     $@,
     qr(Assertion failed),

=== modified file 'lib-mvhub/t/Utils/clean_cgi_params.t'
--- lib-mvhub/t/Utils/clean_cgi_params.t	2009-09-15 01:12:17 +0000
+++ lib-mvhub/t/Utils/clean_cgi_params.t	2010-09-28 16:02:42 +0000
@@ -1,16 +1,9 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 8;
+use Test::More tests => 7;
 use CGI;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::Utils', qw/ clean_cgi_params / )
-        or die "couldn't use Common";
-}
+use MVHub::Utils;
 
 my $q = CGI->new();
 my $test_name;
@@ -18,13 +11,13 @@
 ####
 $test_name = "parameterless cgi object ummodified";
 ####
-is_deeply( $q, clean_cgi_params($q), $test_name );
+is_deeply( $q, MVHub::Utils::clean_cgi_params($q), $test_name );
 
 ####
 $test_name = "single clean parameter doesn't change";
 ####
 $q->param( clean => "A clean parameter" );
-clean_cgi_params($q);
+MVHub::Utils::clean_cgi_params($q);
 
 is( $q->param("clean"), "A clean parameter", $test_name );
 
@@ -33,7 +26,7 @@
 ####
 $q->param( "cleaner" => "clean" );
 $q->param( "clean"   => "A clean parameter" );
-clean_cgi_params($q);
+MVHub::Utils::clean_cgi_params($q);
 
 is( $q->param("clean") . $q->param("cleaner"),
     "A clean parameterclean", $test_name );
@@ -42,14 +35,14 @@
 $test_name = "destroys entire param with HTML tags";
 ####
 $q->param( all_html_code => "<script type=\"text/javascript\">" );
-clean_cgi_params($q);
+MVHub::Utils::clean_cgi_params($q);
 is( $q->param("all_html_code"), "", $test_name );
 
 ####
 $test_name = "removes HTML tags and leaves other text";
 ####
 $q->param( part_html_code => "<p>This is a paragraph</p>" );
-clean_cgi_params($q);
+MVHub::Utils::clean_cgi_params($q);
 
 is( $q->param("part_html_code"), "This is a paragraph", $test_name );
 
@@ -57,7 +50,7 @@
 $test_name = "multitple clean parameters with same name don't change";
 ####
 $q->param( multi_clean => "clean", "cleaner", "cleanest" );
-clean_cgi_params($q);
+MVHub::Utils::clean_cgi_params($q);
 {
     my @param = $q->param("multi_clean");
     ok( (           ( $param[0] eq "clean" )
@@ -77,7 +70,7 @@
     mixed_multi => "clean",
     "<input>not clean</p>", "sorta", "<br><hr>"
 );
-&clean_cgi_params($q);
+&MVHub::Utils::clean_cgi_params($q);
 {
     my @param = $q->param("mixed_multi");
     ok( (           ( $param[0] eq "clean" )

=== modified file 'lib-mvhub/t/Utils/die_if_missing_env_vars.t'
--- lib-mvhub/t/Utils/die_if_missing_env_vars.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/die_if_missing_env_vars.t	2010-09-28 16:02:42 +0000
@@ -4,17 +4,11 @@
 use warnings;
 
 # EDIT
-use Test::More tests => 5;
+use Test::More tests => 4;
 use Test::NoWarnings;
 use Test::Warn;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::Utils', qw/die_if_missing_env_vars/ )
-        or die "couldn't use MVHUb::Utils";
-}
+use MVHub::Utils;
+
 my $test_name;
 
 ###
@@ -25,7 +19,7 @@
 my $placeholder = $ENV{MV_TEST_CONFIG_FILE};
 delete $ENV{MV_TEST_CONFIG_FILE};
 
-eval { die_if_missing_env_vars(); };
+eval { MVHub::Utils::die_if_missing_env_vars(); };
 like( $@, qr/MV_TEST_CONFIG_FILE/, $test_name );
 
 # restore ENV
@@ -38,7 +32,7 @@
 $ENV{MV_TEST_CONFIG_FILE} = 1;
 $ENV{PERL5LIB}            = 1;
 $ENV{HTML_TEMPLATE_ROOT}  = 1;
-eval { die_if_missing_env_vars(); };
+eval { MVHub::Utils::die_if_missing_env_vars(); };
 is( $@, '', $test_name );
 
 ###
@@ -47,4 +41,5 @@
 
 $ENV{MV_TEST_CONFIG_FILE} = 1;
 $ENV{MV_foo}              = 1;
-warning_like { die_if_missing_env_vars() } qr/MV_foo/, $test_name;
+warning_like { MVHub::Utils::die_if_missing_env_vars() } qr/MV_foo/,
+    $test_name;

=== modified file 'lib-mvhub/t/Utils/mm_dd_yyyy_to_yyyy_mm_dd.t'
--- lib-mvhub/t/Utils/mm_dd_yyyy_to_yyyy_mm_dd.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/mm_dd_yyyy_to_yyyy_mm_dd.t	2010-09-28 16:02:42 +0000
@@ -2,19 +2,15 @@
 
 use strict;
 use warnings;
-use Test::More tests => 5;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::Utils', qw/ mm_dd_yyyy_to_yyyy_mm_dd / )
-        or die "couldn't use Common";
-}
-
-eval { mm_dd_yyyy_to_yyyy_mm_dd('asdf'); };
+use Test::More tests => 4;
+use MVHub::Utils;
+
+eval { MVHub::Utils::mm_dd_yyyy_to_yyyy_mm_dd('asdf'); };
 ok( $@, 'died on bad date' );
 
-is( mm_dd_yyyy_to_yyyy_mm_dd(undef), undef, 'date not defined' );
-is( mm_dd_yyyy_to_yyyy_mm_dd('12-31-2003'), '2003-12-31', 'date test 3' );
-is( mm_dd_yyyy_to_yyyy_mm_dd('1-9-2003'),   '2003-1-9',   'date test 4' );
+is( MVHub::Utils::mm_dd_yyyy_to_yyyy_mm_dd(undef), undef,
+    'date not defined' );
+is( MVHub::Utils::mm_dd_yyyy_to_yyyy_mm_dd('12-31-2003'),
+    '2003-12-31', 'date test 3' );
+is( MVHub::Utils::mm_dd_yyyy_to_yyyy_mm_dd('1-9-2003'),
+    '2003-1-9', 'date test 4' );

=== modified file 'lib-mvhub/t/Utils/parse_zip_code.t'
--- lib-mvhub/t/Utils/parse_zip_code.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/parse_zip_code.t	2010-09-28 16:02:42 +0000
@@ -1,22 +1,17 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 10;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::Utils', qw/ parse_zip_code / )
-        or die "couldn't use Utils";
-}
-
-is( parse_zip_code(''),      undef,   'in: "" , out: undef' );
-is( parse_zip_code(0),       undef,   'in: 0, out: undef' );
-is( parse_zip_code(undef),   undef,   'in: undef , out: undef' );
-is( parse_zip_code('0'),     undef,   "in: '0', out: undef" );
-is( parse_zip_code(55555),   55555,   "in 55555, out: 55555" );
-is( parse_zip_code(555551),  55555,   "in: 555551,  out: 55555" );
-is( parse_zip_code(4),       undef,   "4 in,  undef out" );
-is( parse_zip_code('00000'), '00000', "in: '00000', out: '00000'" );
-is( parse_zip_code('01234'), '01234', "in: '01234', out: '01234'" );
+use Test::More tests => 9;
+use MVHub::Utils;
+
+is( MVHub::Utils::parse_zip_code(''),     undef, 'in: "" , out: undef' );
+is( MVHub::Utils::parse_zip_code(0),      undef, 'in: 0, out: undef' );
+is( MVHub::Utils::parse_zip_code(undef),  undef, 'in: undef , out: undef' );
+is( MVHub::Utils::parse_zip_code('0'),    undef, "in: '0', out: undef" );
+is( MVHub::Utils::parse_zip_code(55555),  55555, "in 55555, out: 55555" );
+is( MVHub::Utils::parse_zip_code(555551), 55555, "in: 555551,  out: 55555" );
+is( MVHub::Utils::parse_zip_code(4),      undef, "4 in,  undef out" );
+is( MVHub::Utils::parse_zip_code('00000'),
+    '00000', "in: '00000', out: '00000'" );
+is( MVHub::Utils::parse_zip_code('01234'),
+    '01234', "in: '01234', out: '01234'" );

=== modified file 'lib-mvhub/t/Utils/trim.t'
--- lib-mvhub/t/Utils/trim.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/trim.t	2010-09-28 16:02:42 +0000
@@ -2,6 +2,7 @@
 
 use strict;
 use Test::More tests => 7;
+use MVHub::Utils;
 
 BEGIN {
     use FindBin qw($Bin);
@@ -17,49 +18,49 @@
 ######
 $in  = '  test';
 $out = 'test';
-is( trim($in), $out, $test_name );
+is( MVHub::Utils::trim($in), $out, $test_name );
 
 ######
 $test_name = 'text with trailing space';
 ######
 $in  = 'test   ';
 $out = 'test';
-is( trim($in), $out, $test_name );
+is( MVHub::Utils::trim($in), $out, $test_name );
 
 ######
 $test_name = 'text with leading and trailing spaces';
 ######
 $in  = ' test   ';
 $out = 'test';
-is( trim($in), $out, $test_name );
+is( MVHub::Utils::trim($in), $out, $test_name );
 
 ######
 $test_name = 'call trim with no parameters';
 ######
 $in  = ' test   ';
 $out = 'test';
-is( trim(), undef, $test_name );
+is( MVHub::Utils::trim(), undef, $test_name );
 
 ################ array tests ############
 
 my ( @in, @expected_out, @out );
 
 ######
-$test_name = 'call trim in list context with a list';
+$test_name = 'call MVHub::Utils::trim in list context with a list';
 ######
 @in           = ( " a", "b ", " c" );
 @expected_out = qw/a b c/;
-@out          = trim(@in);
+@out          = MVHub::Utils::trim(@in);
 is_deeply( \@out, \@expected_out, $test_name );
 
 ######
 $test_name
-    = 'call trim in list context with a list that has an undefined element';
+    = 'call MVHub::Utils::trim in list context with a list that has an undefined element';
 ######
 @in = ( " a", "b ", " c" );
 $in[2]           = undef;
 @expected_out    = qw/a b/;
 $expected_out[2] = undef;
-@out             = trim(@in);
+@out             = MVHub::Utils::trim(@in);
 is_deeply( \@out, \@expected_out, $test_name );
 

=== modified file 'lib-mvhub/t/Utils/yyyy_mm_dd_to_mm_dd_yyyy.t'
--- lib-mvhub/t/Utils/yyyy_mm_dd_to_mm_dd_yyyy.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/Utils/yyyy_mm_dd_to_mm_dd_yyyy.t	2010-09-28 16:02:42 +0000
@@ -4,19 +4,16 @@
 
 use strict;
 use warnings;
-use Test::More tests => 5;
-
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-
-    use_ok( 'MVHub::Utils', qw/ yyyy_mm_dd_to_mm_dd_yyyy / )
-        or die "couldn't use Common";
-}
-eval { yyyy_mm_dd_to_mm_dd_yyyy('asdf'); };
+use Test::More tests => 4;
+use MVHub::Utils;
+
+eval { MVHub::Utils::yyyy_mm_dd_to_mm_dd_yyyy('asdf'); };
 ok( $@, 'died on bad date' );
 
-is( yyyy_mm_dd_to_mm_dd_yyyy(undef), undef, 'date not defined' );
+is( MVHub::Utils::yyyy_mm_dd_to_mm_dd_yyyy(undef), undef,
+    'date not defined' );
 
-is( yyyy_mm_dd_to_mm_dd_yyyy('2003-12-31'), '12-31-2003', 'date test 1' );
-is( yyyy_mm_dd_to_mm_dd_yyyy('2003-1-9'),   '1-9-2003',   'date test 2' );
+is( MVHub::Utils::yyyy_mm_dd_to_mm_dd_yyyy('2003-12-31'),
+    '12-31-2003', 'date test 1' );
+is( MVHub::Utils::yyyy_mm_dd_to_mm_dd_yyyy('2003-1-9'),
+    '1-9-2003', 'date test 2' );

=== modified file 'lib-mvhub/t/pod_valid.t'
--- lib-mvhub/t/pod_valid.t	2010-09-13 00:58:44 +0000
+++ lib-mvhub/t/pod_valid.t	2010-09-28 16:02:42 +0000
@@ -3,11 +3,6 @@
 use warnings;
 use strict;
 
-BEGIN {
-    use FindBin qw($Bin);
-    chdir $Bin;
-}    #BEGIN
-
 use Test::More;
 eval "use Test::Pod 1.00";
 plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;