Test::Deep actually isn't required

[dbsrgits/DBIx-Class.git] / t / admin / 03data.t

diff --git a/t/admin/03data.t b/t/admin/03data.t
index 35c285e..faad5be 100644 (file)
--- a/t/admin/03data.t
+++ b/t/admin/03data.t
@@ -1,52 +1,28 @@
-#
-#===============================================================================
-#
-#         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",
@@ -77,7 +53,7 @@ use DBICTest;
   ];
   my $data;
   lives_ok { $data = $admin->select('Employee')} 'can retrive data from database';
-  cmp_deeply($data, $expected_data, 'DB matches whats expected');
+  is_deeply($data, $expected_data, 'DB matches whats expected');
 
   $admin->delete('Employee', {name=>'Trout'});
   my $del_rs  = $employees->search({name => 'Trout'});
@@ -85,6 +61,4 @@ use DBICTest;
   is ($employees->count(), 1, "left Aran" );
 }
 
-
-
 done_testing;