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=1cd69a2cacf42d6ff19bfaaacbc1332d99e25278;hp=77bd5dc758164c021ca51bb180267f2a66615aad;hb=f85a85b0ba6ea4eca7346b4bb0d7b3ce960b8e92;hpb=1b2a3182b4d150a6da7190b9d4ffa7318a9ad910

diff --git a/t/load_core.t b/t/load_core.t
old mode 100755
new mode 100644
index 77bd5dc..1cd69a2
--- a/t/load_core.t
+++ b/t/load_core.t
@@ -1,83 +1,77 @@
 use strict;
 use warnings;
-use Test::More 'no_plan';
 
-use_ok('Devel::REPL');
-use_ok('Devel::REPL::Script');
-use_ok('Devel::REPL::Plugin::Colors');
-use_ok('Devel::REPL::Plugin::Commands');
+use Test::More;
+use if $ENV{AUTHOR_TESTING}, 'Test::Warnings';
+use Module::Runtime 'use_module';
+use Test::Fatal;
 
-eval 'use PPI';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::Completion');
-}
+_use_ok('Devel::REPL');
+_use_ok('Devel::REPL::Script');
+_use_ok('Devel::REPL::Plugin::Colors');
+_use_ok('Devel::REPL::Plugin::Commands');
 
-eval 'use File::Next';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::CompletionDriver::INC');
-}
+SKIP: {
+    eval 'use PPI; 1' or skip 'PPI not installed: skipping completion plugins', 6;
 
-eval 'use B::Keywords';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::CompletionDriver::Keywords');
-}
+    _use_ok('Devel::REPL::Plugin::Completion');
+    _use_ok('Devel::REPL::Plugin::CompletionDriver::Globals');
+    _use_ok('Devel::REPL::Plugin::CompletionDriver::Methods');
+    _use_ok('Devel::REPL::Plugin::CompletionDriver::Turtles');
 
-eval 'use Lexical::Persistence';
-unless ($@) {
-   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');
+};
 
-use_ok('Devel::REPL::Plugin::CompletionDriver::Globals');
-use_ok('Devel::REPL::Plugin::CompletionDriver::Methods');
+test_plugin('Lexical::Persistence', 'LexEnv');
 
-eval 'use Data::Dump::Concise';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::DDC');
-}
+test_plugin('Data::Dumper::Concise', 'DDC');
 
-eval 'use Data::Dump::Streamer';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::DDS');
-}
+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');
+_use_ok('Devel::REPL::Plugin::DumpHistory');
+_use_ok('Devel::REPL::Plugin::FancyPrompt');
+_use_ok('Devel::REPL::Plugin::FindVariable');
+_use_ok('Devel::REPL::Plugin::History');
 
-eval 'use Sys::SigAction';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::Interrupt');
-}
+test_plugin('Sys::SigAction', 'Interrupt');
 
-# use_ok('Devel::REPL::Plugin::Interrupt') unless $^O eq 'MSWin32';
-use_ok('Devel::REPL::Plugin::LexEnv');
+# _use_ok('Devel::REPL::Plugin::Interrupt') unless $^O eq 'MSWin32';
 
-eval 'use PPI';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::MultiLine::PPI');
-}
+test_plugin('PPI', 'MultiLine::PPI');
 
-eval 'use App::Nopaste';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::Nopaste');
-}
+test_plugin('App::Nopaste', 'Nopaste');
+
+_use_ok('Devel::REPL::Plugin::OutputCache');
+_use_ok('Devel::REPL::Plugin::Packages');
+_use_ok('Devel::REPL::Plugin::Peek');
+
+test_plugin('PPI' ,'PPI');
+
+_use_ok('Devel::REPL::Plugin::ReadLineHistory');
 
-use_ok('Devel::REPL::Plugin::OutputCache');
-use_ok('Devel::REPL::Plugin::Packages');
-use_ok('Devel::REPL::Plugin::Peek');
-eval 'use PPI';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::PPI');
+test_plugin('Module::Refresh', 'Refresh');
+
+_use_ok('Devel::REPL::Plugin::ShowClass');
+_use_ok('Devel::REPL::Plugin::Timing');
+_use_ok('Devel::REPL::Plugin::Turtles');
+
+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) = @_;
+
+    SKIP: {
+        eval "use $prereq; 1"
+            or skip "$prereq not installed: skipping $plugin", 1;
 
-eval 'use Module::Refresh';
-unless ($@) {
-   use_ok('Devel::REPL::Plugin::Refresh');
+        _use_ok("Devel::REPL::Plugin::$plugin");
+    }
 }
 
-use_ok('Devel::REPL::Plugin::ShowClass');
-use_ok('Devel::REPL::Plugin::Timing');
-use_ok('Devel::REPL::Plugin::Turtles');
+done_testing;