Delete basicrels tests. Modify run tests to use new syntax. Remove helperrels test...

[dbsrgits/DBIx-Class.git] / t / run / 29dbicadmin.tl

diff --git a/t/run/29dbicadmin.tl b/t/run/29dbicadmin.tl
index 6700abb..a411eb7 100644 (file)
--- a/t/run/29dbicadmin.tl
+++ b/t/run/29dbicadmin.tl
@@ -1,38 +1,41 @@
 # vim: filetype=perl
+use strict;
+use warnings;  
 
-sub run_tests {
+use Test::More;
+use lib qw(t/lib);
+use DBICTest;
 
-    eval{'require JSON'};
-    plan skip_all, 'Install JSON to run this test' if ($@);
+my $schema = DBICTest::init_schema();
 
-    eval{'require Text::CSV_XS'};
-    if ($@) {
-        eval{'require Text::CSV_PP'};
-        plan skip_all, 'Install Text::CSV_XS or Text::CSV_PP to run this test' if ($@);
-    }
+eval 'require JSON';
+plan skip_all => 'Install JSON to run this test' if ($@);
 
-    plan tests => 5;
-    my $schema = shift;
+eval 'require Text::CSV_XS';
+if ($@) {
+    eval 'require Text::CSV_PP';
+    plan skip_all => 'Install Text::CSV_XS or Text::CSV_PP to run this test' if ($@);
+}
 
-    my $employees = $schema->resultset('Employee');
-    my $cmd = qq|script/dbicadmin --schema=DBICTest::Schema --class=Employee --tlibs --connect='["dbi:SQLite:dbname=t/var/DBIxClass.db","",""]' --force --tlibs|;
+plan tests => 5;
 
-    `$cmd --op=insert --set='{name:"Matt"}'`;
-    ok( ($employees->count()==1), 'insert count' );
+my $employees = $schema->resultset('Employee');
+my $cmd = qq|script/dbicadmin --schema=DBICTest::Schema --class=Employee --tlibs --connect='["dbi:SQLite:dbname=t/var/DBIxClass.db","",""]' --force --tlibs|;
 
-    my $employee = $employees->find(1);
-    ok( ($employee->name() eq 'Matt'), 'insert valid' );
+`$cmd --op=insert --set='{name:"Matt"}'`;
+ok( ($employees->count()==1), 'insert count' );
 
-    `$cmd --op=update --set='{name:"Trout"}'`;
-    $employee = $employees->find(1);
-    ok( ($employee->name() eq 'Trout'), 'update' );
+my $employee = $employees->find(1);
+ok( ($employee->name() eq 'Matt'), 'insert valid' );
 
-    `$cmd --op=insert --set='{name:"Aran"}'`;
-    my $data = `$cmd --op=select --attrs='{order_by:"name"}'`;
-    ok( ($data=~/Aran.*Trout/s), 'select with attrs' );
+`$cmd --op=update --set='{name:"Trout"}'`;
+$employee = $employees->find(1);
+ok( ($employee->name() eq 'Trout'), 'update' );
 
-    `$cmd --op=delete --where='{name:"Trout"}'`;
-    ok( ($employees->count()==1), 'delete' );
-}
+`$cmd --op=insert --set='{name:"Aran"}'`;
+my $data = `$cmd --op=select --attrs='{order_by:"name"}'`;
+ok( ($data=~/Aran.*Trout/s), 'select with attrs' );
+
+`$cmd --op=delete --where='{name:"Trout"}'`;
+ok( ($employees->count()==1), 'delete' );
 
-1;