From aba217a3b9d1dcd0ae25e23adb8639672bc3aeba Mon Sep 17 00:00:00 2001
From: jluehrs2 <jluehrs2@uiuc.edu>
Date: Sat, 2 Feb 2008 19:25:19 -0500
Subject: make tests pass again

---
 t/020-random-word.t         | 23 +++++++++++------------
 t/022-random-word-nocache.t | 16 ++++++++--------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/t/020-random-word.t b/t/020-random-word.t
index de4b47f..ad2c830 100644
--- a/t/020-random-word.t
+++ b/t/020-random-word.t
@@ -1,23 +1,22 @@
 #!perl -T
 use strict;
 use warnings;
-use Test::More tests => 3;
-use Test::Exception;
+use Test::More tests => 5;
 use Games::Word::Wordlist;
 
 my $wl = Games::Word::Wordlist->new(['foo', 'bar', 'baz', 'quux']);
-my $word;
-lives_ok(sub { $word = $wl->random_word },
-            "testing calling random_word with a good word list");
+
+my $word = $wl->random_word;
 ok(defined($word), "random_word actually returned a word");
+like($word, qr/^(foo|bar|baz|quux)$/,
+     "testing that the word is actually in the word list");
 
-like($word, qr/^(foo|bar|baz)$/,
-     "testing that the word is actually in the word list")
-lives_ok(sub { $word = $wl->random_word(4) },
-         "random_word doesn't die when given a length");
+$word = $wl->random_word(4);
 is($word, 'quux', "testing random_word with a given length");
-$word = $wl->random_word(3)
+
+$word = $wl->random_word(3);
 like($word, qr/^(foo|bar|baz)$/,
      "testing that the word was correct");
-throws_ok(sub { $wl->random_word(5) }, qr/No words of length 5 in word list/,
-          "random_word dies if no words are found");
+
+is($wl->random_word(5), undef,
+   "random_word returns undef if no words are found");
diff --git a/t/022-random-word-nocache.t b/t/022-random-word-nocache.t
index 3054955..cabff08 100644
--- a/t/022-random-word-nocache.t
+++ b/t/022-random-word-nocache.t
@@ -1,7 +1,7 @@
 #!perl -T
 use strict;
 use warnings;
-use Test::More tests => 6;
+use Test::More tests => 5;
 use Test::Exception;
 use Games::Word::Wordlist;
 
@@ -10,12 +10,10 @@ $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", 6 if $word_file eq '';
+    skip "Can't find a system word list", 5 if $word_file eq '';
 
     my $wl = Games::Word::Wordlist->new($word_file, cache => 0);
-    my $word;
-    lives_ok(sub { $word = $wl->random_word },
-             "testing calling random_word with a good word list");
+    my $word = $wl->random_word;
     ok(defined($word), "random_word actually returned a word");
 
     open my $fh, '<', $word_file;
@@ -25,10 +23,12 @@ SKIP: {
         $passed = 1 if $word eq $_;
     }
     ok($passed, "testing that the word is actually in the word list");
+
     lives_ok(sub { $word = $wl->random_word(4) },
              "random_word doesn't die when given a length");
+
     is(length $word, 4, "testing random_word with a given length");
-    throws_ok(sub { $wl->random_word(35) },
-              qr/No words of length 35 in word list/,
-              "random_word dies if no words are found");
+
+    is($wl->random_word(35), undef,
+       "random_word returns undef if no words are found");
 }
-- 
cgit v1.2.3