X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Ftests%2Fselftest.py;h=512ead10991518e3a6e5027989c476240b7d4b87;hp=497d9701771b21f93a27085e7e2ae627a1e1e511;hb=bf6ed46991ffdc587d4e70362a4bd20d6f84fcee;hpb=2f395c0d81aa9ca60a86940dcb4c49c9f7e5815d

diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py
index 497d970..512ead1 100644
--- a/mudpy/tests/selftest.py
+++ b/mudpy/tests/selftest.py
@@ -165,13 +165,14 @@ test_admin_setup = (
 
 test_preferences = (
     (0, "> ", "preferences"),
-    (0, r"prompt \x1b\[32m.*> ", "preferences prompt $(foo)"),
+    (0, r"\[32mprompt\x1b\[0m - <not set>.*> ", "preferences prompt $(foo)"),
     (0, r"\$\(foo\) ", "preferences prompt"),
     (0, r"\$\(foo\).*\$\(foo\) ", "preferences prompt $(time)>"),
-    (0, "[0-9]> ", "preferences prompt >"),
+    (0, "[0-9]> ", "preferences loglevel 0"),
+    (0, "does not exist.*> ", "preferences prompt >"),
     (2, "> ", "preferences loglevel 0"),
     (2, "> ", "preferences"),
-    (2, r"loglevel \x1b\[32m0\x1b\[0m.*> ", "preferences loglevel zero"),
+    (2, r"\[31mloglevel\x1b\[0m - 0.*> ", "preferences loglevel zero"),
     (2, r'''cannot be set to type "<class 'str'>"\..*> ''', ""),
 )
 
@@ -215,10 +216,17 @@ test_admin_help = (
     (2, "This will save all active accounts", ""),
 )
 
+test_help = (
+    (0, "> ", "help say"),
+    (0, r"See also: .*chat.*> ", ""),
+)
+
 test_abbrev = (
-    (0, "> ", "help mov"),
-    (0, r"Move in a specific direction\.", "mov north"),
-    (0, r"You exit to the north\.", ""),
+    (0, "> ", "h"),
+    (0, r"h\[elp\].*m\[ove\].*> ", "he mo"),
+    (0, r"Move in a specific direction\..*> ", "mov nor"),
+    (0, r"You exit to the north\..*> ", "m s"),
+    (0, r"You exit to the south\..*> ", ""),
 )
 
 test_reload = (
@@ -284,6 +292,12 @@ test_show_element = (
         r'  \x1b\[32mgender: \x1b\[31mfemale.*> ', ""),
 )
 
+test_show_result = (
+    (2, "> ", "show result 12345*67890"),
+    (2, r"\r\n838102050\r\n.*> ", "show result 1/0"),
+    (2, r"Your expression raised an exception.*division by zero.*> ", ""),
+)
+
 test_show_log = (
     (2, "> ", "show log"),
     (2, r"There are [0-9]+ log lines in memory and [0-9]+ at or above level "
@@ -345,6 +359,7 @@ dialogue = (
     (test_telnet_unknown_option, "log unknown telnet option"),
     (test_admin_restriction, "restricted admin commands"),
     (test_admin_help, "admin help"),
+    (test_help, "help command"),
     (test_abbrev, "command abbreviation"),
     (test_reload, "reload"),
     (test_set_facet, "set facet"),
@@ -356,6 +371,7 @@ dialogue = (
     (test_show_groups, "show groups"),
     (test_show_group, "show group"),
     (test_show_element, "show element"),
+    (test_show_result, "show result of a python expression"),
     (test_show_log, "show log"),
     (test_custom_loglevel, "custom loglevel"),
     (test_invalid_loglevel, "invalid loglevel"),