Improve test coverage

diff --git a/tests/defeat.chk b/tests/defeat.chk
index 19700afb83c9598c354f18bf69d58c1bf7c0abd1..e6200a4f669081c8eb945817515e7eba40d22680 100644 (file)
--- a/tests/defeat.chk
+++ b/tests/defeat.chk
@@ -60,15 +60,15 @@ There is a small wicker cage discarded nearby.
 
 OK
 
-> w
+> go west
 
 You're in debris room.
 
-> w
+> go west
 
 You are in an awkward sloping east/west canyon.
 
-> w
+> go west
 
 You are in a splendid chamber thirty feet high.  The walls are frozen
 rivers of orange stone.  An awkward canyon and a good passage exit
@@ -88,7 +88,7 @@ OK
 
 OK
 
-> w
+> go west
 
 At your feet is a small pit breathing traces of white mist.  An east
 passage ends here except for a small crack leading on.
@@ -159,7 +159,7 @@ OK
 
 OK
 
-> w
+> go west
 
 You are in the west side chamber of the Hall of the Mountain King.
 A passage continues west and up here.
@@ -309,7 +309,7 @@ There is a little axe here.
 
 OK
 
-> w
+> go west
 
 You are in a secret canyon which exits to the north and east.
 
@@ -438,7 +438,7 @@ You're in front of building.
 You are in a valley in the forest beside a stream tumbling along a
 rocky bed.
 
-> w
+> go west
 
 You are wandering aimlessly through the forest.
 
@@ -574,7 +574,7 @@ You're in Hall of Mists.
 
 Rough stone steps lead up the dome.
 
-> w
+> go west
 
 You are on the east bank of a fissure slicing clear across the hall.
 The mist is quite thick here, and the fissure is too wide to jump.
@@ -599,7 +599,9 @@ A crystal bridge now spans the fissure.
 
 OK
 
-> w
+> go west
+
+If you prefer, simply type w rather than west.
 
 There is a threatening little dwarf in the room with you!
 
@@ -611,7 +613,10 @@ You are at the west end of the Hall of Mists.  A low wide crawl
 continues west and another goes north.  To the south is a little
 passage 6 feet off the floor.
 
-> w
+> go west
+
+You don't have to say "go" every time; just specify a direction or, if
+it's nearby, name the place to which you wish to move.
 
 There is a threatening little dwarf in the room with you!
 
@@ -619,7 +624,7 @@ You are at the east end of a very long hall apparently without side
 chambers.  To the east a low wide crawl slants up.  To the north a
 round two foot hole slants down.
 
-> w
+> go west
 
 There is a threatening little dwarf in the room with you!
 
@@ -697,7 +702,7 @@ OK
 
 You are in a large chamber with passages to the west and north.
 
-> w
+> west
 
 You are in a long, rough-hewn, north/south corridor.
 
@@ -930,7 +935,7 @@ You're at west end of Twopit Room.
 
 The top of a 12-foot-tall beanstalk is poking out of the west pit.
 
-> w
+> west
 
 You're in Slab Room.
 
@@ -1117,7 +1122,7 @@ You're at east end of Twopit Room.
 
 There is a huge beanstalk growing out of the west pit up to the hole.
 
-> w
+> west
 
 You're at west end of Twopit Room.
 
@@ -1139,7 +1144,7 @@ You are in a long, narrow corridor stretching out of sight to the
 west.  At the eastern end is a hole through which you can see a
 profusion of leaves.
 
-> w
+> west
 
 You are in the Giant Room.  The ceiling here is too high up for your
 lamp to show it.  Cavernous passages lead east, north, and south.  On
@@ -1174,7 +1179,7 @@ There is a jewel-encrusted trident here!
 
 OK
 
-> w
+> west
 
 You are at the top of a steep incline above a large room.  You could
 climb down here, but you would not be able to climb up.  There is a
@@ -1199,7 +1204,7 @@ Far below, through a heavy white mist, strange splashing noises can be
 heard.  The mist rises up through a fissure in the ceiling.  The path
 exits to the south and west.
 
-> w
+> west
 
 You are in an alcove.  A small nw path seems to widen after a short
 distance.  An extremely tight tunnel leads east.  It looks like a very
@@ -1231,7 +1236,7 @@ There is an emerald here the size of a plover's egg!
 
 OK
 
-> w
+> west
 
 You're in alcove.
 
@@ -1304,7 +1309,7 @@ A small velvet pillow lies on the floor.
 
 OK
 
-> w
+> west
 
 You're in Swiss Cheese Room.
 
@@ -1444,7 +1449,7 @@ You're in n/s passage above e/w passage.
 
 You're in dirty passage.
 
-> w
+> west
 
 You're in dusty rock room.
 
@@ -1486,23 +1491,23 @@ There is an enormous oyster here with its shell tightly closed.
 
 You're at complex junction.
 
-> w
+> west
 
 You're in Bedquilt.
 
-> w
+> west
 
 You're in Swiss Cheese Room.
 
 There is a little axe here.
 
-> w
+> west
 
 You're at east end of Twopit Room.
 
 There is a huge beanstalk growing out of the west pit up to the hole.
 
-> w
+> west
 
 You are at the west end of the Twopit Room.  There is a large hole in
 the wall above the pit at this end of the room.
@@ -1524,7 +1529,7 @@ You clamber up the plant and scurry through the hole at the top.
 
 You're in narrow corridor.
 
-> w
+> west
 
 You're in Giant Room.
 
@@ -1550,7 +1555,7 @@ OK
 
 You're in cavern with waterfall.
 
-> w
+> west
 
 You're at steep incline above large room.
 
@@ -1667,13 +1672,13 @@ You are being followed by a very large, tame bear.
 
 You're at fork in path.
 
-> w
+> west
 
 You are being followed by a very large, tame bear.
 
 You're in corridor.
 
-> w
+> west
 
 You are being followed by a very large, tame bear.
 
@@ -1739,7 +1744,7 @@ You're in Swiss Cheese Room.
 
 There is a little axe here.
 
-> w
+> west
 
 You're at east end of Twopit Room.
 
@@ -1771,7 +1776,7 @@ There is a little axe here.
 
 OK
 
-> w
+> west
 
 You are at the east end of the Twopit Room.  The floor here is
 littered with thin rock slabs, which make it easy to descend the pits.
@@ -1781,7 +1786,7 @@ wall directly over the west pit where you can't get to it.
 
 There is a huge beanstalk growing out of the west pit up to the hole.
 
-> w
+> west
 
 You're at west end of Twopit Room.
 
@@ -1801,7 +1806,7 @@ You clamber up the plant and scurry through the hole at the top.
 
 You're in narrow corridor.
 
-> w
+> west
 
 You're in Giant Room.
 
@@ -1843,7 +1848,7 @@ Your keen eye spots a severed leporine appendage lying on the ground.
 
 There is a huge beanstalk growing out of the west pit up to the hole.
 
-> w
+> west
 
 You're in Slab Room.
 
@@ -1947,7 +1952,7 @@ OK
 
 You're in front of building.
 
-> w
+> west
 
 You have walked up a hill, still in the forest.  The road slopes back
 down the other side of the hill.  There is a building in the distance.
@@ -2205,7 +2210,7 @@ You're in Hall of Mists.
 
 Rough stone steps lead up the dome.
 
-> w
+> west
 
 Out from the shadows behind you pounces a bearded pirate!  "Har, har,"
 he chortles, "I'll just take all this booty and hide it away with me
@@ -2218,13 +2223,13 @@ A three foot black rod with a rusty star on an end lies nearby.
 
 A crystal bridge now spans the fissure.
 
-> w
+> west
 
 You're on west bank of fissure.
 
 A crystal bridge now spans the fissure.
 
-> w
+> west
 
 You're at west end of Hall of Mists.
 
@@ -2396,7 +2401,7 @@ You're in n/s passage above e/w passage.
 
 You're in dirty passage.
 
-> w
+> west
 
 You're in dusty rock room.
 

diff --git a/tests/defeat.log b/tests/defeat.log
index 54b699bde8d9a3b87dd12d91db501cff05a25894..0cfa62fad3cf78d4a51bb787a3a3e7432cef9674 100644 (file)
--- a/tests/defeat.log
+++ b/tests/defeat.log
@@ -9,13 +9,13 @@ on
 take rod
 e
 take cage
-w
-w
-w
+go west
+go west
+go west
 drop rod
 take bird
 take rod
-w
+go west
 free bird
 wave rod
 take necklace
@@ -29,7 +29,7 @@ drop rod
 drop cage
 take cage
 take bird
-w
+go west
 take coins
 e
 s
@@ -55,7 +55,7 @@ take silver
 s
 sw
 take axe
-w
+go west
 kill dragon
 yes
 drink blood
@@ -73,7 +73,7 @@ drop rug
 drop silver
 out
 s
-w
+go west
 n
 take appendage
 free bird
@@ -95,14 +95,14 @@ s
 s
 take rod
 up
-w
+go west
 wave rod
 drop rod
 west
 take diamonds
-w
-w
-w
+go west
+go west
+go west
 s
 sw
 se
@@ -114,7 +114,7 @@ kill ogre
 n
 take ruby
 s
-w
+west
 n
 n
 n
@@ -151,7 +151,7 @@ s
 d
 water plant
 u
-w
+west
 u
 reservoir
 H'CFL
@@ -186,27 +186,27 @@ d
 get oil
 
 u
-w
+west
 d
 climb
-w
+west
 n
 oil door
 drop bottle
 n
 take trident
-w
+west
 d
 se
 n
-w
+west
 drop trident
 drop ebony
 drop axe
 drop lantern
 e
 take emerald
-w
+west
 take lamp
 take axe
 take ebony
@@ -219,7 +219,7 @@ throw axe
 take axe
 e
 take pillow
-w
+west
 drop axe
 ne
 e
@@ -243,7 +243,7 @@ plugh
 on
 s
 d
-w
+west
 d
 n
 d
@@ -252,18 +252,18 @@ take pearl
 u
 u
 s
-w
-w
-w
-w
+west
+west
+west
+west
 d
 climb
-w
+west
 get eggs
 n
 take bottle
 n
-w
+west
 d
 sw
 u
@@ -282,8 +282,8 @@ e
 take spices
 drop keys
 fork
-w
-w
+west
+west
 sw
 free bear
 inven
@@ -292,17 +292,17 @@ sw
 d
 se
 se
-w
+west
 d
 get oil
 up
 e
 take axe
-w
-w
+west
+west
 d
 climb
-w
+west
 fee
 fie
 foe
@@ -311,7 +311,7 @@ take eggs
 s
 d
 u
-w
+west
 u
 s
 e
@@ -328,7 +328,7 @@ take rug
 take ruby
 take emerald
 out
-w
+west
 n
 n
 n
@@ -362,9 +362,9 @@ on
 s
 s
 u
-w
-w
-w
+west
+west
+west
 s
 e
 s
@@ -391,7 +391,7 @@ plugh
 on
 s
 d
-w
+west
 d
 e
 take magazine

diff --git a/tests/weirdbird.chk b/tests/weirdbird.chk
index 5a5af923c38435cb5ba549b6161787acc8fc211f..a5161128232475532a386bf593c33b20b8618f1e 100644 (file)
--- a/tests/weirdbird.chk
+++ b/tests/weirdbird.chk
@@ -144,7 +144,7 @@ I think I just lost my appetite.
 It's not hungry (it's merely pinin' for the fjords).  Besides, you
 have no bird seed.
 
-> take bird
+> cage bird
 
 The bird seemed unafraid at first, but as you approach it becomes
 disturbed and you cannot catch it.

diff --git a/tests/weirdbird.log b/tests/weirdbird.log
index 5919f5afa3adc360e591c4457e444737747b2fb8..dfae78a16239690e4a7f5c0b648c3a79b1492f25 100644 (file)
--- a/tests/weirdbird.log
+++ b/tests/weirdbird.log
@@ -26,7 +26,7 @@ w
 listen bird
 eat bird
 feed bird
-take bird
+cage bird
 y
 y
 drop rod