X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi%2F02-Film.t;h=fe4a6917b08c6238475f59d2019ae51b55f07a48;hb=4a233f3019d2baa4bf2abee0c873c74d5cdf3a11;hp=3a4d70a7561c8a21aa27735dc1aba4f95a690f1a;hpb=6a3bf2519832866d037740c5fb22341dad6f8bb3;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi/02-Film.t b/t/cdbi/02-Film.t
index 3a4d70a..fe4a691 100644
--- a/t/cdbi/02-Film.t
+++ b/t/cdbi/02-Film.t
@@ -1,16 +1,11 @@
 use strict;
+use warnings;
+
 use Test::More;
+use Scalar::Util 'refaddr';
+use namespace::clean;
 $| = 1;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-    next;
-  }
-  plan tests => 98;
-}
-
 INIT {
   use lib 't/cdbi/testlib';
   use Film;
@@ -34,7 +29,7 @@ is(Film->__driver, "SQLite", "Driver set correctly");
   eval { my $id = Film->title };
   #like $@, qr/class method/, "Can't get title with no object";
   ok $@, "Can't get title with no object";
-} 
+}
 
 eval { my $duh = Film->insert; };
 like $@, qr/create needs a hashref/, "needs a hashref";
@@ -228,7 +223,7 @@ ok(
 
 # Test that a disconnect doesnt harm anything.
 {
-    # SQLite is loud on disconnect/reconnect. 
+    # SQLite is loud on disconnect/reconnect.
     # This is solved in DBIC but not in ContextualFetch
     local $SIG{__WARN__} = sub {
       warn @_ unless $_[0] =~
@@ -383,23 +378,23 @@ SKIP: {
   # my bad taste is your bad taste
   my $btaste  = Film->retrieve('Bad Taste');
   my $btaste2 = Film->retrieve('Bad Taste');
-  is Scalar::Util::refaddr($btaste), Scalar::Util::refaddr($btaste2),
+  is refaddr $btaste, refaddr $btaste2,
     "Retrieving twice gives ref to same object";
 
   my ($btaste5) = Film->search(title=>'Bad Taste');
-  is Scalar::Util::refaddr($btaste), Scalar::Util::refaddr($btaste5),
+  is refaddr $btaste, refaddr $btaste5,
     "Searching also gives ref to same object";
 
   $btaste2->remove_from_object_index;
   my $btaste3 = Film->retrieve('Bad Taste');
-  isnt Scalar::Util::refaddr($btaste2), Scalar::Util::refaddr($btaste3),
+  isnt refaddr $btaste2, refaddr $btaste3,
     "Removing from object_index and retrieving again gives new object";
 
   $btaste3->clear_object_index;
   my $btaste4 = Film->retrieve('Bad Taste');
-  isnt Scalar::Util::refaddr($btaste2), Scalar::Util::refaddr($btaste4),
+  isnt refaddr $btaste2, refaddr $btaste4,
     "Clearing cache and retrieving again gives new object";
- 
+
   $btaste=Film->insert({
     Title             => 'Bad Taste 2',
     Director          => 'Peter Jackson',
@@ -407,7 +402,9 @@ SKIP: {
     NumExplodingSheep => 2,
   });
   $btaste2 = Film->retrieve('Bad Taste 2');
-  is Scalar::Util::refaddr($btaste), Scalar::Util::refaddr($btaste2),
+  is refaddr $btaste, refaddr $btaste2,
     "Creating and retrieving gives ref to same object";
- 
+
 }
+
+done_testing;