stop using use_ok

7 files changed, 21 insertions, 19 deletions

diff --git a/t/also.t b/t/also.t
index 285a5aa..b671114 100644
--- a/t/also.t
+++ b/t/also.t
@@ -6,7 +6,7 @@ use Test::Fatal;
 use lib 't/lib/also';
 
 {
-    use_ok('Bar::Conflicts');
+    require Bar::Conflicts;
     is_deeply(
         { Bar::Conflicts->conflicts },
         {
@@ -19,7 +19,7 @@ use lib 't/lib/also';
 }
 
 {
-    use_ok('Bar::Conflicts2');
+    require Bar::Conflicts2;
     is_deeply(
         { Bar::Conflicts2->conflicts },
         {
diff --git a/t/basic.t b/t/basic.t
index c1bf2aa..94b8dbd 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib 't/lib/basic';
 
 {
-    use_ok('Foo::Conflicts');
+    require Foo::Conflicts;
     is_deeply(
         { Foo::Conflicts->conflicts },
         {
@@ -17,7 +17,7 @@ use lib 't/lib/basic';
 }
 
 {
-    use_ok('Bar::Conflicts');
+    require Bar::Conflicts;
     is_deeply(
         { Bar::Conflicts->conflicts },
         {
diff --git a/t/conflicts.t b/t/conflicts.t
index 7c5dfb2..f6f830c 100644
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -7,7 +7,7 @@ use Test::Fatal;
 use lib 't/lib/conflicts';
 
 {
-    use_ok('Foo::Conflicts::Good');
+    require Foo::Conflicts::Good;
     is_deeply(
         [ Foo::Conflicts::Good->calculate_conflicts ],
         [],
@@ -21,7 +21,7 @@ use lib 't/lib/conflicts';
 }
 
 {
-    use_ok('Foo::Conflicts::Bad');
+    require Foo::Conflicts::Bad;
 
     is_deeply(
         [ Foo::Conflicts::Bad->calculate_conflicts ],
@@ -39,7 +39,7 @@ use lib 't/lib/conflicts';
 }
 
 {
-    use_ok('Bar::Conflicts::Good');
+    require Bar::Conflicts::Good;
     is_deeply(
         [ Bar::Conflicts::Good->calculate_conflicts ],
         [],
@@ -53,7 +53,7 @@ use lib 't/lib/conflicts';
 }
 
 {
-    use_ok('Bar::Conflicts::Bad');
+    require Bar::Conflicts::Bad;
 
     is_deeply(
         [ Bar::Conflicts::Bad->calculate_conflicts ],
@@ -73,7 +73,7 @@ use lib 't/lib/conflicts';
 {
     # conflicting module is utterly broken
 
-    use_ok('Foo::Conflicts::Broken');
+    require Foo::Conflicts::Broken;
 
     my @conflicts;
     my $warning = '';
diff --git a/t/dist.t b/t/dist.t
index c3a7823..493de44 100644
--- a/t/dist.t
+++ b/t/dist.t
@@ -6,7 +6,7 @@ use Test::Fatal;
 use lib 't/lib/dist';
 
 {
-    use_ok('Foo::Conflicts::Good');
+    require Foo::Conflicts::Good;
     is_deeply(
         [ Foo::Conflicts::Good->calculate_conflicts ],
         [],
@@ -21,7 +21,7 @@ use lib 't/lib/dist';
 }
 
 {
-    use_ok('Foo::Conflicts::Bad');
+    require Foo::Conflicts::Bad;
 
     is_deeply(
         [ Foo::Conflicts::Bad->calculate_conflicts ],
@@ -40,7 +40,7 @@ use lib 't/lib/dist';
 }
 
 {
-    use_ok('Bar::Conflicts::Good');
+    require Bar::Conflicts::Good;
     is_deeply(
         [ Bar::Conflicts::Good->calculate_conflicts ],
         [],
@@ -55,7 +55,7 @@ use lib 't/lib/dist';
 }
 
 {
-    use_ok('Bar::Conflicts::Bad');
+    require Bar::Conflicts::Bad;
 
     is_deeply(
         [ Bar::Conflicts::Bad->calculate_conflicts ],
diff --git a/t/merge.t b/t/merge.t
index 465fa50..074efaf 100644
--- a/t/merge.t
+++ b/t/merge.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib 't/lib/merge';
 
 {
-    use_ok('Foo::Conflicts');
+    require Foo::Conflicts;
     is_deeply(
         { Foo::Conflicts->conflicts },
         {
diff --git a/t/runtime.t b/t/runtime.t
index c1caae2..5125e91 100644
--- a/t/runtime.t
+++ b/t/runtime.t
@@ -4,7 +4,9 @@ use warnings;
 use Test::More;
 use lib 't/lib/runtime';
 
-sub use_ok_warnings {
+use Module::Runtime 'require_module';
+
+sub warnings_ok {
     my ($class, @conflicts) = @_;
     local $Test::Builder::Level = $Test::Builder::Level + 1;
     @conflicts = sort map { "Conflict detected for $_->[0]:\n  $_->[1] is version $_->[2], but must be greater than version $_->[3]\n" } @conflicts;
@@ -12,19 +14,19 @@ sub use_ok_warnings {
     my @warnings;
     {
         local $SIG{__WARN__} = sub { push @warnings, $_[0] };
-        use_ok($class);
+        require_module($class);
     }
     @warnings = sort @warnings;
 
     is_deeply(\@warnings, \@conflicts, "correct runtime warnings for $class");
 }
 
-use_ok_warnings(
+warnings_ok(
     'Foo',
     ['Foo::Conflicts', 'Foo::Foo', '0.01', '0.01'],
     ['Foo::Conflicts', 'Foo::Bar', '0.01', '0.01'],
 );
-use_ok_warnings(
+warnings_ok(
     'Bar',
     ['Bar::Conflicts', 'Bar::Baz::Bad',  '0.01', '0.01'],
     ['Bar::Conflicts', 'Bar::Foo::Bad',  '0.01', '0.01'],
diff --git a/t/warn.t b/t/warn.t
index 1058eb9..3f3ce33 100644
--- a/t/warn.t
+++ b/t/warn.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib 't/lib/warn';
 
 {
-    use_ok("Foo::Conflicts");
+    require Foo::Conflicts;
 
     my $warning = '';
     local $SIG{__WARN__} = sub { $warning .= $_[0] };