X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi-t%2F01-columns.t;h=7d3f0bf9e25fe918d7fa39766acc1403e8875b41;hb=289ba852733fc488dc43cd474f47780f7fa1771e;hp=2782b31e391ba9d5b16343cb53c236f1f293dc92;hpb=ec77fadc80e2ce78abf208f2126b74e5445bec22;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi-t/01-columns.t b/t/cdbi-t/01-columns.t
index 2782b31..7d3f0bf 100644
--- a/t/cdbi-t/01-columns.t
+++ b/t/cdbi-t/01-columns.t
@@ -1,14 +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';
-State->load_components(qw/CDBICompat Core/);
+use base 'DBIx::Class::Test::SQLite';
 
 State->table('State');
 State->columns(Essential => qw/Abbreviation Name/);
@@ -34,8 +39,7 @@ sub Snowfall { 1 }
 
 package City;
 
-use base 'DBIx::Class';
-City->load_components(qw/CDBICompat Core/);
+use base 'DBIx::Class::Test::SQLite';
 
 City->table('City');
 City->columns(All => qw/Name State Population/);
@@ -44,8 +48,7 @@ City->has_a(State => 'State');
 
 #-------------------------------------------------------------------------
 package CD;
-use base 'DBIx::Class';
-CD->load_components(qw/CDBICompat Core/);
+use base 'DBIx::Class::Test::SQLite';
 
 CD->table('CD');
 CD->columns('All' => qw/artist title length/);
@@ -103,15 +106,16 @@ ok(!State->find_column('HGLAGAGlAG'), '!find_column HGLAGAGlAG');
 	is $grps[1], 'Weather', " - Weather";
 }
 
-{
-        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";
-}
+#{
+#        
+#        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