X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=bin%2Ftest;h=e9b28dc26963983d8a4401ab8aa89936d1acd53f;hp=35b2a993acbfa9c4966ff376dc54bc49899d006d;hb=bf9481233ff1d7b97005bfbfe08b9a20e2766cbf;hpb=74542e2249c308c6c40aef50eaf227b46fd1bc9d

diff --git a/bin/test b/bin/test
index 35b2a99..e9b28dc 100755
--- a/bin/test
+++ b/bin/test
@@ -8,8 +8,7 @@
 import sys
 import telnetlib
 
-dialogue = (
-    # Create account 0
+test_account0_setup = (
     (0, "Identify yourself:", "luser0"),
     (0, "Enter your choice:", "n"),
     (0, "Enter a new password for \"luser0\":", "Test123"),
@@ -19,8 +18,9 @@ dialogue = (
     (0, "Choose a name for her:", "1"),
     (0, "What would you like to do?", "a"),
     (0, "Whom would you like to awaken?", ""),
+)
 
-    # Create account 1
+test_account1_setup = (
     (1, "Identify yourself:", "luser1"),
     (1, "Enter your choice:", "n"),
     (1, "Enter a new password for \"luser1\":", "Test456"),
@@ -30,11 +30,13 @@ dialogue = (
     (1, "Choose a name for him:", "1"),
     (1, "What would you like to do?", "a"),
     (1, "Whom would you like to awaken?", ""),
+)
 
-    # Actor appears from nowhere
+test_actor_appears = (
     (0, "You suddenly realize that .* is here\.", ""),
+)
 
-    # Explicit punctuation
+test_explicit_punctuation = (
     (0, "> ", "say Hello there!"),
     (0, 'You exclaim, "Hello there\!"', ""),
     (1, 'exclaims, "Hello there\!"', "say And you are?"),
@@ -52,22 +54,53 @@ dialogue = (
     (1, 'begins, "Don\'t interrupt:"', "say I wasn't interrupting;"),
     (1, 'You begin, "I wasn\'t interrupting;"', ""),
     (0, 'begins, "I wasn\'t interrupting;"', ""),
+)
+
+test_implicit_punctuation = (
+    (0, '> ', "say Whatever"),
+    (0, 'You say, "Whatever."', ""),
+    (1, 'says, "Whatever."', ""),
+)
+
+test_typo_replacement = (
+    (1, '> ', "say That's what i think."),
+    (1, 'You say, "That\'s what I think."', ""),
+    (0, 'says, "That\'s what I think."', "say You know what i'd like."),
+    (0, 'You say, "You know what I\'d like."', ""),
+    (1, 'says, "You know what I\'d like."', "say Then i'll tell you."),
+    (1, 'You say, "Then I\'ll tell you."', ""),
+    (0, 'says, "Then I\'ll tell you."', "say Now i'm ready."),
+    (0, 'You say, "Now I\'m ready."', ""),
+    (1, 'says, "Now I\'m ready."', "say That's teh idea."),
+    (1, 'You say, "That\'s the idea."', ""),
+    (0, 'says, "That\'s the idea."', "say It's what theyre saying."),
+    (0, 'You say, "It\'s what they\'re saying."', ""),
+    (1, 'says, "It\'s what they\'re saying."', "say Well, youre right."),
+    (1, 'You say, "Well, you\'re right."', ""),
+    (0, 'says, "Well, you\'re right."', ""),
+)
 
-    # Actor disappears
+test_sentence_capitalization = (
+    (0, "> ", "say this sentence should start with a capital T."),
+    (0, 'You say, "This sentence', ""),
+    (1, 'says, "This sentence', ""),
+)
+
+test_actor_disappears = (
     (1, "> ", "quit"),
     (0, "You suddenly wonder where .* went\.", ""),
+)
 
-    # Quit
+test_account0_teardown = (
     (0, "> ", "quit"),
-
-    # Delete account 0
     (0, "What would you like to do?", "d"),
     (0, "Whom would you like to delete?", ""),
     (0, "What would you like to do?", "p"),
     (0, "permanently delete your account?", "y"),
     (0, "Disconnecting...", ""),
+)
 
-    # Delete account 1
+test_account1_teardown = (
     (1, "What would you like to do?", "d"),
     (1, "Whom would you like to delete?", ""),
     (1, "What would you like to do?", "p"),
@@ -75,24 +108,44 @@ dialogue = (
     (1, "Disconnecting...", ""),
 )
 
+dialogue = (
+    (test_account0_setup, "first account setup"),
+    (test_account1_setup, "second account setup"),
+    (test_actor_appears, "actor spontaneous appearance"),
+    (test_explicit_punctuation, " explicit punctuation"),
+    (test_implicit_punctuation, "implicit punctuation"),
+    (test_typo_replacement, "typo replacement"),
+    (test_sentence_capitalization, "sentence capitalization"),
+    (test_actor_disappears, "actor spontaneous disappearance"),
+    (test_account0_teardown, "first account teardown"),
+    (test_account1_teardown, "second account teardown"),
+)
+
 captures = ["", ""]
 lusers = [telnetlib.Telnet(), telnetlib.Telnet()]
 success = True
 for luser in lusers:
     luser.open("::1", 6669)
-for conversant, question, answer in dialogue:
-    print("luser%s waiting for: %s" % (conversant, question))
-    index, match, received = lusers[conversant].expect(
-        [question.encode("utf-8")], 5)
-    captures[conversant] += received.decode("utf-8")
-    if index is not 0:
-        print("ERROR: luser%s did not receive expected string:\n\n%s"
-              % (conversant, question))
-        success = False
-        break
-    print("luser%s sending: %s" % (conversant, answer))
-    lusers[conversant].write(("%s\r\n" % answer).encode("utf-8"))
-    captures[conversant] += "%s\r\n" % answer
+for test, description in dialogue:
+    print("\nTesting %s..." % description)
+    for conversant, question, answer in test:
+        print("luser%s waiting for: %s" % (conversant, question))
+        index, match, received = lusers[conversant].expect(
+            [question.encode("utf-8")], 5)
+        captures[conversant] += received.decode("utf-8")
+        try:
+            captures[conversant] += lusers[
+                conversant].read_very_eager().decode("utf-8")
+        except:
+            pass
+        if index is not 0:
+            print("ERROR: luser%s did not receive expected string:\n\n%s"
+                  % (conversant, question))
+            success = False
+            break
+        print("luser%s sending: %s" % (conversant, answer))
+        lusers[conversant].write(("%s\r\n" % answer).encode("utf-8"))
+        captures[conversant] += "%s\r\n" % answer
 for conversant in range(len(captures)):
     try:
         captures[conversant] += lusers[