X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fadmin%2F03data.t;h=faad5becd6b40141c6bbd9444920a41592d0a654;hb=268310425c798353b02b928d43f0bd1ed9601032;hp=1d51c26d5e03fe3ffbf911f3a272aeea072eca4e;hpb=a705b1758c359438b683daa2c2b1e8cb5a3377da;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/admin/03data.t b/t/admin/03data.t
index 1d51c26..faad5be 100644
--- a/t/admin/03data.t
+++ b/t/admin/03data.t
@@ -1,90 +1,64 @@
-#
-#===============================================================================
-#
-#         FILE:  03sql.t
-#
-#  DESCRIPTION:  test sql manipulation funtions
-#
-#        FILES:  ---
-#         BUGS:  ---
-#        NOTES:  ---
-#       AUTHOR:  Gordon Irving (), <goraxe@cpan.org>
-#      VERSION:  1.0
-#      CREATED:  12/12/09 12:44:57 GMT
-#     REVISION:  ---
-#===============================================================================
-
 use strict;
 use warnings;
 
 use Test::More;
 
 use Test::Exception;
-use Test::Deep;
 
 BEGIN {
-
-    use FindBin qw($Bin);
-    use File::Spec::Functions qw(catdir);
-    use lib catdir($Bin,'..', '..','lib');
-    use lib catdir($Bin,'..', 'lib');
-    eval "use DBIx::Class::Admin";
-    plan skip_all => "Deps not installed: $@" if $@;
+    require DBIx::Class;
+    plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('admin')
+      unless DBIx::Class::Optional::Dependencies->req_ok_for('admin');
 }
 
-use Path::Class;
+use lib 't/lib';
+use DBICTest;
 
 use ok 'DBIx::Class::Admin';
 
-use DBICTest;
 
 { # test data maniplulation functions
 
-	# create a DBICTest so we can steal its connect info
-	my $schema = DBICTest->init_schema(
-	#    no_deploy=>1,
-	#	no_populate=>1,
-		sqlite_use_file => 1,
-		);
-
-
-	my $admin = DBIx::Class::Admin->new(
-		schema_class=> "DBICTest::Schema",
-		connect_info => $schema->storage->connect_info(),
-		quiet	=> 1,
-		_confirm=>1,
-	);
-	isa_ok ($admin, 'DBIx::Class::Admin', 'create the admin object');
-
-	$admin->insert('Employee', { name => 'Matt' });
-	my $employees = $schema->resultset('Employee');
-	is ($employees->count(), 1, "insert okay" );
-
-	my $employee = $employees->find(1);
-	is($employee->name(),  'Matt', "insert valid" );
-
-	$admin->update('Employee', {name => 'Trout'}, {name => 'Matt'});
-
-	$employee = $employees->find(1);
-	is($employee->name(),  'Trout', "update Matt to Trout" );
-
-	$admin->insert('Employee', {name =>'Aran'});
-
-	my $expected_data = [ 
-		[$employee->result_source->columns() ],
-		[1,1,undef,undef,undef,'Trout'],
-		[2,2,undef,undef,undef,'Aran']
-	];
-	my $data;
-	lives_ok { $data = $admin->select('Employee')} 'can retrive data from database';
-	cmp_deeply($data, $expected_data, 'DB matches whats expected');
-
-	$admin->delete('Employee', {name=>'Trout'});
-	my $del_rs  = $employees->search({name => 'Trout'});
-	is($del_rs->count(), 0, "delete Trout" );
-	is ($employees->count(), 1, "left Aran" );
+  # create a DBICTest so we can steal its connect info
+  my $schema = DBICTest->init_schema(
+    sqlite_use_file => 1,
+  );
+
+  my $admin = DBIx::Class::Admin->new(
+    schema_class=> "DBICTest::Schema",
+    connect_info => $schema->storage->connect_info(),
+    quiet  => 1,
+    _confirm=>1,
+  );
+  isa_ok ($admin, 'DBIx::Class::Admin', 'create the admin object');
+
+  $admin->insert('Employee', { name => 'Matt' });
+  my $employees = $schema->resultset('Employee');
+  is ($employees->count(), 1, "insert okay" );
+
+  my $employee = $employees->find(1);
+  is($employee->name(),  'Matt', "insert valid" );
+
+  $admin->update('Employee', {name => 'Trout'}, {name => 'Matt'});
+
+  $employee = $employees->find(1);
+  is($employee->name(),  'Trout', "update Matt to Trout" );
+
+  $admin->insert('Employee', {name =>'Aran'});
+
+  my $expected_data = [ 
+    [$employee->result_source->columns() ],
+    [1,1,undef,undef,undef,'Trout'],
+    [2,2,undef,undef,undef,'Aran']
+  ];
+  my $data;
+  lives_ok { $data = $admin->select('Employee')} 'can retrive data from database';
+  is_deeply($data, $expected_data, 'DB matches whats expected');
+
+  $admin->delete('Employee', {name=>'Trout'});
+  my $del_rs  = $employees->search({name => 'Trout'});
+  is($del_rs->count(), 0, "delete Trout" );
+  is ($employees->count(), 1, "left Aran" );
 }
 
-
-
 done_testing;