From f6267ff3eb635c3494b8a67e967bb2882a0f9875 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 28 Jun 2017 13:03:45 -0400 Subject: [PATCH] Test consolidation. --- tests/breakvase.chk | 9 ++++++++- tests/breakvase.log | 2 ++ tests/defeat.chk | 30 +++++++++++++++--------------- tests/defeat.log | 5 +++-- tests/quit.chk | 22 ---------------------- tests/quit.log | 4 ---- 6 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 tests/quit.chk delete mode 100644 tests/quit.log diff --git a/tests/breakvase.chk b/tests/breakvase.chk index 012d7f3..df38a1c 100644 --- a/tests/breakvase.chk +++ b/tests/breakvase.chk @@ -1298,8 +1298,15 @@ OK You have taken the vase and hurled it delicately to the ground. +> quit -You scored 139 out of a possible 430, using 210 turns. +Do you really want to quit now? + +> yes + +OK + +You scored 139 out of a possible 430, using 211 turns. You have achieved the rating: "Experienced Adventurer". diff --git a/tests/breakvase.log b/tests/breakvase.log index 85e0fd8..1db9957 100644 --- a/tests/breakvase.log +++ b/tests/breakvase.log @@ -216,3 +216,5 @@ s # Previous was just setup - this is the real test take vase break vase +quit +yes diff --git a/tests/defeat.chk b/tests/defeat.chk index 7e51c2d..a9de41e 100644 --- a/tests/defeat.chk +++ b/tests/defeat.chk @@ -1397,13 +1397,13 @@ There are some keys on the ground here. There is food here. -> drop pillow +> drop vase -OK +The ming vase drops with a delicate crash. -> drop vase +> drop pillow -The vase is now resting, delicately, on a velvet pillow. +OK > drop trident @@ -1898,10 +1898,10 @@ There is an emerald here the size of a plover's egg! There is a jewel-encrusted trident here! -There is a delicate, precious, ming vase here! - A small velvet pillow lies on the floor. +The floor is littered with worthless shards of pottery. + There is a platinum pyramid here, 8 inches on a side! There are diamonds here! @@ -2099,10 +2099,10 @@ There is a richly-carved ebony statuette here! There is a jewel-encrusted trident here! -There is a delicate, precious, ming vase here! - A small velvet pillow lies on the floor. +The floor is littered with worthless shards of pottery. + There is a platinum pyramid here, 8 inches on a side! There are diamonds here! @@ -2163,10 +2163,10 @@ There is a richly-carved ebony statuette here! There is a jewel-encrusted trident here! -There is a delicate, precious, ming vase here! - A small velvet pillow lies on the floor. +The floor is littered with worthless shards of pottery. + There is a platinum pyramid here, 8 inches on a side! There are diamonds here! @@ -2353,10 +2353,10 @@ There is a richly-carved ebony statuette here! There is a jewel-encrusted trident here! -There is a delicate, precious, ming vase here! - A small velvet pillow lies on the floor. +The floor is littered with worthless shards of pottery. + There is a platinum pyramid here, 8 inches on a side! There are diamonds here! @@ -2944,8 +2944,8 @@ There is a loud explosion, and a twenty-foot hole appears in the far wall, burying the snakes in the rubble. A river of molten lava pours in through the hole, destroying everything in its path, including you! -You scored 413 out of a possible 430, using 468 turns. +You scored 399 out of a possible 430, using 468 turns. -Your score puts you in Master Adventurer Class A. +Your score puts you in Master Adventurer Class B. -To achieve the next higher rating, you need 14 more points. +To achieve the next higher rating, you need 12 more points. diff --git a/tests/defeat.log b/tests/defeat.log index ab2c267..d0497e7 100644 --- a/tests/defeat.log +++ b/tests/defeat.log @@ -1,4 +1,4 @@ -## Last-minute defeat, with lava +## Last-minute defeat, with lava. Also tests vase drop before pillow. # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56 n seed 1838473132 @@ -232,8 +232,9 @@ u n off plugh -drop pillow +# Invert these so we test the vase-drop code drop vase +drop pillow drop trident drop emerald drop ebony diff --git a/tests/quit.chk b/tests/quit.chk deleted file mode 100644 index 76d2215..0000000 --- a/tests/quit.chk +++ /dev/null @@ -1,22 +0,0 @@ - -Welcome to Adventure!! Would you like instructions? - -> n - -You are standing at the end of a road before a small brick building. -Around you is a forest. A small stream flows out of the building and -down a gully. - -> quit - -Do you really want to quit now? - -> yes - -OK - -You scored 32 out of a possible 430, using 1 turn. - -You are obviously a rank amateur. Better luck next time. - -To achieve the next higher rating, you need 14 more points. diff --git a/tests/quit.log b/tests/quit.log deleted file mode 100644 index f0cad3a..0000000 --- a/tests/quit.log +++ /dev/null @@ -1,4 +0,0 @@ -## Simple quit -n -quit -yes -- 2.31.1