Deduplicate (and stabilize) the result of _collapse_cond

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

diff --git a/t/53lean_startup.t b/t/53lean_startup.t
index e106da2..2943507 100644 (file)
--- a/t/53lean_startup.t
+++ b/t/53lean_startup.t
@@ -50,7 +50,7 @@ BEGIN {
       CORE::require('Test/More.pm');
       Test::More::fail ("Unexpected require of '$req' by $caller[0] ($caller[1] line $caller[2])");
 
-      if ($ENV{TEST_VERBOSE}) {
+      if ( $ENV{TEST_VERBOSE} or ! DBICTest::RunMode->is_plain ) {
         CORE::require('DBICTest/Util.pm');
         Test::More::diag( 'Require invoked' .  DBICTest::Util::stacktrace() );
       }
@@ -99,13 +99,18 @@ BEGIN {
     namespace::clean
     Try::Tiny
     Sub::Name
+    strictures
+    Sub::Quote
 
     Scalar::Util
     List::Util
-    Data::Compare
 
     Class::Accessor::Grouped
     Class::C3::Componentised
+    SQL::Abstract
+
+    Module::Runtime
+    File::Spec
   ));
 
   require DBICTest::Schema;
@@ -116,8 +121,8 @@ BEGIN {
 {
   register_lazy_loadable_requires(qw(
     Moo
-    Sub::Quote
     Context::Preserve
+    Data::Compare
   ));
 
   my $s = DBICTest::Schema->connect('dbi:SQLite::memory:');
@@ -129,7 +134,6 @@ BEGIN {
 {
   register_lazy_loadable_requires(qw(
     DBI
-    SQL::Abstract
     Hash::Merge
   ));
 
@@ -151,9 +155,15 @@ BEGIN {
 
 # and do full populate() as well, just in case - shouldn't add new stuff
 {
-  require DBICTest;
+  local $ENV{DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER};
+  {
+    # 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')->next->name, 'Caterwauler McCrae');
+  is ($s->resultset('Artist')->find(1)->name, 'Caterwauler McCrae');
   assert_no_missing_expected_requires();
 }