Changes/author for a1e1a51

[dbsrgits/DBIx-Class.git] / xt / optional_deps.t

diff --git a/xt/optional_deps.t b/xt/optional_deps.t
index 9a59ac4..11ef4d1 100644 (file)
--- a/xt/optional_deps.t
+++ b/xt/optional_deps.t
@@ -5,9 +5,26 @@ no warnings qw/once/;
 use Test::More;
 use lib qw(t/lib);
 use Scalar::Util; # load before we break require()
+use Carp ();   # Carp is not used in the test, but we want to have it loaded for proper %INC comparison
+
+# a dummy test which lazy-loads more modules (so we can compare INC below)
+ok (1);
+
+# record contents of %INC - makes sure there are no extra deps slipping into
+# Opt::Dep.
+my $inc_before = [ keys %INC ];
+ok ( (! grep { $_ =~ m|DBIx/Class| } @$inc_before ), 'Nothing DBIC related is yet loaded');
 
 use_ok 'DBIx::Class::Optional::Dependencies';
 
+my $inc_after = [ keys %INC ];
+
+is_deeply (
+  [ sort @$inc_after],
+  [ sort (@$inc_before, 'DBIx/Class/Optional/Dependencies.pm') ],
+  'Nothing loaded other than DBIx::Class::OptDeps',
+);
+
 my $sqlt_dep = DBIx::Class::Optional::Dependencies->req_list_for ('deploy');
 is_deeply (
   [ keys %$sqlt_dep ],
@@ -16,25 +33,26 @@ is_deeply (
 );
 
 # make module loading impossible, regardless of actual libpath contents
-@INC = (sub { die('Optional Dep Test') } );
-
-ok (
-  ! DBIx::Class::Optional::Dependencies->req_ok_for ('deploy'),
-  'deploy() deps missing',
-);
-
-like (
-  DBIx::Class::Optional::Dependencies->req_missing_for ('deploy'),
-  qr/^SQL::Translator \>\= \d/,
-  'expected missing string contents',
-);
-
-like (
-  DBIx::Class::Optional::Dependencies->req_errorlist_for ('deploy')->{'SQL::Translator'},
-  qr/Optional Dep Test/,
-  'custom exception found in errorlist',
-);
-
+{
+  local @INC = (sub { die('Optional Dep Test') } );
+
+  ok (
+    ! DBIx::Class::Optional::Dependencies->req_ok_for ('deploy'),
+    'deploy() deps missing',
+  );
+
+  like (
+    DBIx::Class::Optional::Dependencies->req_missing_for ('deploy'),
+    qr/^SQL::Translator \>\= \d/,
+    'expected missing string contents',
+  );
+
+  like (
+    DBIx::Class::Optional::Dependencies->req_errorlist_for ('deploy')->{'SQL::Translator'},
+    qr/Optional Dep Test/,
+    'custom exception found in errorlist',
+  );
+}
 
 #make it so module appears loaded
 $INC{'SQL/Translator.pm'} = 1;
@@ -66,5 +84,4 @@ is_deeply (
   'expected empty errorlist',
 );
 
-
 done_testing;