Merge 'resultset-new-refactor' into 'DBIx-Class-current'

[dbsrgits/DBIx-Class.git] / t / run / 08inflate_has_a.tl

diff --git a/t/run/08inflate_has_a.tl b/t/run/08inflate_has_a.tl
index e329c2a..50f78c4 100644 (file)
--- a/t/run/08inflate_has_a.tl
+++ b/t/run/08inflate_has_a.tl
@@ -1,19 +1,21 @@
 sub run_tests {
+my $schema = shift;
 
 eval { require DateTime };
 plan skip_all => "Need DateTime for inflation tests" if $@;
 
 plan tests => 6;
 
-DBICTest::CD->load_components(qw/CDBICompat::HasA/);
+DBICTest::Schema::CD->load_components(qw/CDBICompat::HasA/);
 
-DBICTest::CD->has_a( 'year', 'DateTime',
+DBICTest::Schema::CD->has_a( 'year', 'DateTime',
       inflate => sub { DateTime->new( year => shift ) },
       deflate => sub { shift->year }
 );
+Class::C3->reinitialize;
 
 # inflation test
-my $cd = DBICTest::CD->find(3);
+my $cd = $schema->resultset("CD")->find(3);
 
 is( ref($cd->year), 'DateTime', 'year is a DateTime, ok' );
 
@@ -24,17 +26,17 @@ my $now = DateTime->now;
 $cd->year( $now );
 $cd->update;
 
-($cd) = DBICTest::CD->search( year => $now->year );
+($cd) = $schema->resultset("CD")->search( year => $now->year );
 is( $cd->year->year, $now->year, 'deflate ok' );
 
 # re-test using alternate deflate syntax
-DBICTest::CD->has_a( 'year', 'DateTime',
+$schema->class("CD")->has_a( 'year', 'DateTime',
       inflate => sub { DateTime->new( year => shift ) },
       deflate => 'year'
 );
 
 # inflation test
-$cd = DBICTest::CD->find(3);
+$cd = $schema->resultset("CD")->find(3);
 
 is( ref($cd->year), 'DateTime', 'year is a DateTime, ok' );
 
@@ -45,7 +47,7 @@ $now = DateTime->now;
 $cd->year( $now );
 $cd->update;
 
-($cd) = DBICTest::CD->search( year => $now->year );
+($cd) = $schema->resultset("CD")->search( year => $now->year );
 is( $cd->year->year, $now->year, 'deflate ok' );
 
 }