update the tests for the wordlist object

1 files changed, 6 insertions, 8 deletions

diff --git a/t/020-random-word.t b/t/020-random-word.t
index d5218f5..3b070b9 100644
--- a/t/020-random-word.t
+++ b/t/020-random-word.t
@@ -3,22 +3,20 @@ use strict;
 use warnings;
 use Test::More tests => 3;
 use Test::Exception;
-use Games::Word qw/set_word_list random_word/;
+use Games::Word::Wordlist;
 
 my $word_file = '';
-$word_file = '/usr/dict/words' if (-f '/usr/dict/words');
-$word_file = '/usr/share/dict/words' if (-f '/usr/share/dict/words');
-
-throws_ok(sub { random_word }, qr/No words in word list/,
-          "testing calling a function before setting a word list");
+$word_file = '/usr/dict/words' if -r '/usr/dict/words';
+$word_file = '/usr/share/dict/words' if -r '/usr/share/dict/words';
 
 SKIP: {
     skip "Can't find a system word list", 2 if $word_file eq '';
 
-    set_word_list $word_file;
+    my $wl = Games::Word::Wordlist->new($word_file);
     my $word;
-    lives_ok(sub { $word = random_word },
+    lives_ok(sub { $word = $wl->random_word },
              "testing calling random_word with a good word list");
+    ok(defined($word), "random_word actually returned a word");
 
     open my $fh, '<', $word_file;
     my $passed = 0;