X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi-t%2F01-columns.t;h=658c50020e270a6dbabeeee5660e7824e9e8fbb6;hb=af2d42c04edc254f8b83010a8feadc31d0ac3860;hp=2c5fa2e1533f0c1a2d720efa84b553c5ac3bc514;hpb=12bbb33986a29dc27dd3e2b9d082a87f50124ec1;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi-t/01-columns.t b/t/cdbi-t/01-columns.t
index 2c5fa2e..658c500 100644
--- a/t/cdbi-t/01-columns.t
+++ b/t/cdbi-t/01-columns.t
@@ -1,13 +1,19 @@
 use strict;
 
-use Test::More tests => 25;
+use Test::More;
+
+BEGIN {
+  eval "use DBIx::Class::CDBICompat;";
+  plan $@ ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required') : (tests=> 24);
+}
+
 
 #-----------------------------------------------------------------------
 # Make sure that we can set up columns properly
 #-----------------------------------------------------------------------
 package State;
 
-use base 'DBIx::Class';
+use base 'DBIx::Class::Test::SQLite';
 
 State->table('State');
 State->columns(Essential => qw/Abbreviation Name/);
@@ -33,16 +39,24 @@ sub Snowfall { 1 }
 
 package City;
 
-use base 'DBIx::Class';
+use base 'DBIx::Class::Test::SQLite';
 
 City->table('City');
 City->columns(All => qw/Name State Population/);
-City->has_a(State => 'State');
 
+{
+  # Disable the `no such table' warning
+  local $SIG{__WARN__} = sub {
+    my $warning = shift;
+    warn $warning unless ($warning =~ /\Qno such table: City(1)\E/);
+  };
+
+  City->has_a(State => 'State');
+}
 
 #-------------------------------------------------------------------------
 package CD;
-use base 'DBIx::Class';
+use base 'DBIx::Class::Test::SQLite';
 
 CD->table('CD');
 CD->columns('All' => qw/artist title length/);
@@ -95,16 +109,21 @@ ok(!State->find_column('HGLAGAGlAG'), '!find_column HGLAGAGlAG');
 
 	my @grps = sort State->__grouper->groups_for(State->_find_columns(qw/rain capital/));
 	is @grps, 2, "Rain and Capital = 2 groups";
-        @grps = sort @grps; # Because DBIx::Class is hash-based
+        @grps = sort @grps; # Because the underlying API is hash-based
 	is $grps[0], 'Other',   " - Other";
 	is $grps[1], 'Weather', " - Weather";
 }
 
-SKIP: {
-	local $SIG{__WARN__} = sub { };
-	eval { DBIx::Class->retrieve(1) };
-	like $@, qr/Can't retrieve unless primary columns are defined/, "Need primary key for retrieve";
-}
+#{
+#        
+#        package DieTest;
+#        @DieTest::ISA = qw(DBIx::Class);
+#        DieTest->load_components(qw/CDBICompat::Retrieve Core/);
+#        package main;
+#	local $SIG{__WARN__} = sub { };
+#	eval { DieTest->retrieve(1) };
+#	like $@, qr/unless primary columns are defined/, "Need primary key for retrieve";
+#}
 
 #-----------------------------------------------------------------------
 # Make sure that columns inherit properly
@@ -113,14 +132,18 @@ package State;
 
 package A;
 @A::ISA = qw(DBIx::Class);
+__PACKAGE__->load_components(qw/CDBICompat Core/);
+__PACKAGE__->table('dummy');
 __PACKAGE__->columns(Primary => 'id');
 
 package A::B;
 @A::B::ISA = 'A';
+__PACKAGE__->table('dummy2');
 __PACKAGE__->columns(All => qw(id b1));
 
 package A::C;
 @A::C::ISA = 'A';
+__PACKAGE__->table('dummy3');
 __PACKAGE__->columns(All => qw(id c1 c2 c3));
 
 package main;