X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=t%2Fload_core.t;h=3e3b0832e4915c55960d5e71290bc3643348dca6;hp=7c7add3b9f75d07b273cc1a591bacebbb21b4b62;hb=6762d292565aa94ee95c51166945155f71f461d7;hpb=bf19d175b9465f0e63ed973c02be8d5a280f2c0f

diff --git a/t/load_core.t b/t/load_core.t
index 7c7add3..3e3b083 100755
--- a/t/load_core.t
+++ b/t/load_core.t
@@ -3,66 +3,74 @@ use warnings;
 
 use Test::More;
 use if $ENV{AUTHOR_TESTING}, 'Test::Warnings';
+use Module::Runtime 'use_module';
+use Test::Fatal;
 
-use_ok('Devel::REPL');
-use_ok('Devel::REPL::Script');
-use_ok('Devel::REPL::Plugin::Colors');
-use_ok('Devel::REPL::Plugin::Commands');
+_use_ok('Devel::REPL');
+_use_ok('Devel::REPL::Script');
+_use_ok('Devel::REPL::Plugin::Colors');
+_use_ok('Devel::REPL::Plugin::Commands');
 
-eval 'use PPI; 1' and do {
-    use_ok('Devel::REPL::Plugin::Completion');
-    use_ok('Devel::REPL::Plugin::CompletionDriver::Globals');
-    use_ok('Devel::REPL::Plugin::CompletionDriver::Methods');
+SKIP: {
+    eval 'use PPI; 1' or skip 'PPI not installed: skipping completion plugins', 6;
 
-    eval 'use File::Next; 1'
-        and use_ok('Devel::REPL::Plugin::CompletionDriver::INC');
+    _use_ok('Devel::REPL::Plugin::Completion');
+    _use_ok('Devel::REPL::Plugin::CompletionDriver::Globals');
+    _use_ok('Devel::REPL::Plugin::CompletionDriver::Methods');
 
-    eval 'use B::Keywords; 1'
-        and use_ok('Devel::REPL::Plugin::CompletionDriver::Keywords');
-
-    eval 'use Lexical::Persistence; 1'
-        and use_ok('Devel::REPL::Plugin::CompletionDriver::LexEnv')
+    test_plugin('File::Next', 'CompletionDriver::INC');
+    test_plugin('B::Keywords', 'CompletionDriver::Keywords');
+    test_plugin('Lexical::Persistence', 'CompletionDriver::LexEnv');
 };
 
-eval 'use Lexical::Persistence; 1'
-    and use_ok('Devel::REPL::Plugin::LexEnv');
+test_plugin('Lexical::Persistence', 'LexEnv');
+
+test_plugin('Data::Dumper::Concise', 'DDC');
+
+test_plugin('Data::Dump::Streamer', 'DDS');
+
+_use_ok('Devel::REPL::Plugin::DumpHistory');
+_use_ok('Devel::REPL::Plugin::FancyPrompt');
+_use_ok('Devel::REPL::Plugin::FindVariable');
+_use_ok('Devel::REPL::Plugin::History');
+
+test_plugin('Sys::SigAction', 'Interrupt');
 
-eval 'use Data::Dump::Concise; 1'
-    and use_ok('Devel::REPL::Plugin::DDC');
+# _use_ok('Devel::REPL::Plugin::Interrupt') unless $^O eq 'MSWin32';
 
-eval 'use Data::Dump::Streamer; 1'
-    and use_ok('Devel::REPL::Plugin::DDS');
+test_plugin('PPI', 'MultiLine::PPI');
 
-use_ok('Devel::REPL::Plugin::DumpHistory');
-use_ok('Devel::REPL::Plugin::FancyPrompt');
-use_ok('Devel::REPL::Plugin::FindVariable');
-use_ok('Devel::REPL::Plugin::History');
+test_plugin('App::Nopaste', 'Nopaste');
 
-eval 'use Sys::SigAction; 1'
-    and use_ok('Devel::REPL::Plugin::Interrupt');
+_use_ok('Devel::REPL::Plugin::OutputCache');
+_use_ok('Devel::REPL::Plugin::Packages');
+_use_ok('Devel::REPL::Plugin::Peek');
 
-# use_ok('Devel::REPL::Plugin::Interrupt') unless $^O eq 'MSWin32';
+test_plugin('PPI' ,'PPI');
 
-eval 'use PPI; 1'
-    and use_ok('Devel::REPL::Plugin::MultiLine::PPI');
+_use_ok('Devel::REPL::Plugin::ReadLineHistory');
 
-eval 'use App::Nopaste; 1'
-    and use_ok('Devel::REPL::Plugin::Nopaste');
+test_plugin('Module::Refresh', 'Refresh');
 
-use_ok('Devel::REPL::Plugin::OutputCache');
-use_ok('Devel::REPL::Plugin::Packages');
-use_ok('Devel::REPL::Plugin::Peek');
+_use_ok('Devel::REPL::Plugin::ShowClass');
+_use_ok('Devel::REPL::Plugin::Timing');
+_use_ok('Devel::REPL::Plugin::Turtles');
 
-eval 'use PPI; 1'
-    and use_ok('Devel::REPL::Plugin::PPI');
+sub _use_ok {
+    my $module = shift;
+    is(exception { use_module $module }, undef, $module . ' ok');
+}
 
-use_ok('Devel::REPL::Plugin::ReadLineHistory');
+sub test_plugin
+{
+    my ($prereq, $plugin) = @_;
 
-eval 'use Module::Refresh; 1'
-    and use_ok('Devel::REPL::Plugin::Refresh');
+    SKIP: {
+        eval "use $prereq; 1"
+            or skip "$prereq not installed: skipping $plugin", 1;
 
-use_ok('Devel::REPL::Plugin::ShowClass');
-use_ok('Devel::REPL::Plugin::Timing');
-use_ok('Devel::REPL::Plugin::Turtles');
+        _use_ok("Devel::REPL::Plugin::$plugin");
+    }
+}
 
 done_testing;