update the tests for the wordlist object

4 files changed, 28 insertions, 23 deletions

diff --git a/t/000-load.t b/t/000-load.t
index 6cafcf3..6da1ee9 100644
--- a/t/000-load.t
+++ b/t/000-load.t
@@ -1,7 +1,8 @@
 #!perl -T
 use strict;
 use warnings;
-use Test::More tests => 1;
+use Test::More tests => 2;
 
 use_ok 'Games::Word';
+use_ok 'Games::Word::Wordlist';
 
diff --git a/t/001-basic.t b/t/001-basic.t
index 4043c35..cf5c216 100644
--- a/t/001-basic.t
+++ b/t/001-basic.t
@@ -1,8 +1,18 @@
 #!perl -T
 use strict;
 use warnings;
-use Test::More tests => 1;
-use Games::Word;
+use Test::More tests => 2;
+use Test::Exception;
+use Games::Word::Wordlist;
 
-ok(1);
+my $word_file = '';
+$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 wordlist", 2 unless $word_file;
+    my $wl;
+    lives_ok { $wl = Games::Word::Wordlist->new($word_file) }
+             "creating a wordlist succeeds";
+    isa_ok $wl, "Games::Word::Wordlist";
+}
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;
diff --git a/t/021-is-word.t b/t/021-is-word.t
index ab3a8cc..076a0e9 100644
--- a/t/021-is-word.t
+++ b/t/021-is-word.t
@@ -1,25 +1,21 @@
 #!perl -T
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More tests => 2;
 use Test::Exception;
-use Games::Word qw/set_word_list random_word is_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');
-
-lives_ok(sub { is_word "blah" },
-         "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 $result;
-    lives_ok(sub { $result = is_word random_word },
-             "testing calling random_word with a good word list");
+    lives_ok(sub { $result = $wl->is_word($wl->random_word) },
+             "testing calling is_word");
     ok($result,
        "testing checking to see if a random word from the word list is a word");
 }