Smarter todoification (this doesn't sound like a bad idea for CPAN in general)

[dbsrgits/DBIx-Class.git] / t / 53lean_startup.t

diff --git a/t/53lean_startup.t b/t/53lean_startup.t
index f2635c5..4cc046b 100644 (file)
--- a/t/53lean_startup.t
+++ b/t/53lean_startup.t
@@ -64,8 +64,6 @@ use strict;
 use warnings;
 use Test::More;
 
-use lib 't/dqlib';
-
 BEGIN {
   plan skip_all => 'A defined PERL5OPT may inject extra deps crashing this test'
     if $ENV{PERL5OPT};
@@ -104,14 +102,18 @@ BEGIN {
 
     Scalar::Util
     List::Util
-    Data::Compare
 
     Class::Accessor::Grouped
     Class::C3::Componentised
 
+    Data::Dumper::Concise
+
+    File::Spec
+
     Module::Runtime
     Data::Query::Constants
     Data::Query::ExprHelpers
+    Data::Query::ExprDeclare
   ));
 
   require DBICTest::Schema;
@@ -124,6 +126,7 @@ BEGIN {
     Moo
     Sub::Quote
     Context::Preserve
+    Data::Compare
   ));
 
   my $s = DBICTest::Schema->connect('dbi:SQLite::memory:');
@@ -158,7 +161,12 @@ BEGIN {
 # and do full populate() as well, just in case - shouldn't add new stuff
 {
   local $ENV{DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER};
-  require DBICTest;
+  {
+    # in general we do not want DBICTest to load before sqla, but it is
+    # ok to cheat here
+    local $INC{'SQL/Abstract.pm'};
+    require DBICTest;
+  }
   my $s = DBICTest->init_schema;
   is ($s->resultset('Artist')->find(1)->name, 'Caterwauler McCrae');
   assert_no_missing_expected_requires();