From 22e57db4a7f58f2576a47878bf2853505cd8fc2a Mon Sep 17 00:00:00 2001 From: Griatch Date: Fri, 17 Feb 2017 09:32:15 +0100 Subject: [PATCH] Fix errors in testing. --- evennia/commands/default/building.py | 4 ++-- evennia/commands/default/cmdset_character.py | 4 ++-- evennia/commands/default/general.py | 6 +++--- evennia/commands/default/tests.py | 6 ++++-- evennia/contrib/tests.py | 10 +++++----- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py index b098aebd5f..28ee1a033a 100644 --- a/evennia/commands/default/building.py +++ b/evennia/commands/default/building.py @@ -20,7 +20,7 @@ COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS) # limit symbol import for API __all__ = ("ObjManipCommand", "CmdSetObjAlias", "CmdCopy", "CmdCpAttr", "CmdMvAttr", "CmdCreate", - "CmdSetDesc", "CmdDestroy", "CmdDig", "CmdTunnel", "CmdLink", + "CmdDesc", "CmdDestroy", "CmdDig", "CmdTunnel", "CmdLink", "CmdUnLink", "CmdSetHome", "CmdListCmdSets", "CmdName", "CmdOpen", "CmdSetAttribute", "CmdTypeclass", "CmdWipe", "CmdLock", "CmdExamine", "CmdFind", "CmdTeleport", @@ -533,7 +533,7 @@ def _desc_quit(caller): caller.attributes.remove("evmenu_target") caller.msg("Exited editor.") -class CmdSetDesc(COMMAND_DEFAULT_CLASS): +class CmdDesc(COMMAND_DEFAULT_CLASS): """ describe an object or the current room. diff --git a/evennia/commands/default/cmdset_character.py b/evennia/commands/default/cmdset_character.py index f695cc6762..85fb163e50 100644 --- a/evennia/commands/default/cmdset_character.py +++ b/evennia/commands/default/cmdset_character.py @@ -25,7 +25,7 @@ class CharacterCmdSet(CmdSet): self.add(general.CmdInventory()) self.add(general.CmdPose()) self.add(general.CmdNick()) - self.add(general.CmdDesc()) + self.add(general.CmdSetDesc()) self.add(general.CmdGet()) self.add(general.CmdDrop()) self.add(general.CmdGive()) @@ -63,7 +63,7 @@ class CharacterCmdSet(CmdSet): self.add(building.CmdWipe()) self.add(building.CmdSetAttribute()) self.add(building.CmdName()) - self.add(building.CmdSetDesc()) + self.add(building.CmdDesc()) self.add(building.CmdCpAttr()) self.add(building.CmdMvAttr()) self.add(building.CmdCopy()) diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py index a4afbf961e..8b78e97a0f 100644 --- a/evennia/commands/default/general.py +++ b/evennia/commands/default/general.py @@ -9,7 +9,7 @@ COMMAND_DEFAULT_CLASS = utils.class_from_module(settings.COMMAND_DEFAULT_CLASS) # limit symbol import for API __all__ = ("CmdHome", "CmdLook", "CmdNick", - "CmdInventory", "CmdGet", "CmdDrop", "CmdGive", + "CmdInventory", "CmdSetDesc", "CmdGet", "CmdDrop", "CmdGive", "CmdSay", "CmdPose", "CmdAccess") @@ -356,7 +356,7 @@ class CmdGive(COMMAND_DEFAULT_CLASS): target.msg("%s gives you %s." % (caller.key, to_give.key)) -class CmdDesc(COMMAND_DEFAULT_CLASS): +class CmdSetDesc(COMMAND_DEFAULT_CLASS): """ describe yourself @@ -367,7 +367,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS): will be visible to people when they look at you. """ - key = "desc" + key = "setdesc" locks = "cmd:all()" arg_regex = r"\s|$" diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py index ee0409e06d..4ade106ffe 100644 --- a/evennia/commands/default/tests.py +++ b/evennia/commands/default/tests.py @@ -52,7 +52,9 @@ class CommandTest(EvenniaTest): caller = caller if caller else self.char1 receiver = receiver if receiver else caller cmdobj.caller = caller - cmdobj.cmdstring = cmdstring if cmdstring else cmdobj.key + cmdobj.cmdname = cmdstring if cmdstring else cmdobj.key + cmdobj.raw_cmdname = cmdobj.cmdname + cmdobj.cmdstring = cmdobj.cmdname # deprecated cmdobj.args = args cmdobj.cmdset = cmdset cmdobj.session = SESSIONS.session_from_sessid(1) @@ -229,7 +231,7 @@ class TestBuilding(CommandTest): self.call(building.CmdName(), "Obj2=Obj3", "Object's name changed to 'Obj3'.") def test_desc(self): - self.call(building.CmdSetDesc(), "Obj2=TestDesc", "The description was set on Obj2(#5).") + self.call(building.CmdDesc(), "Obj2=TestDesc", "The description was set on Obj2(#5).") def test_wipe(self): self.call(building.CmdDestroy(), "Obj", "Obj was destroyed.") diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py index 1627ad407f..bf5ff1af0d 100644 --- a/evennia/contrib/tests.py +++ b/evennia/contrib/tests.py @@ -200,12 +200,12 @@ class TestExtendedRoom(CommandTest): self.call(extended_room.CmdExtendedLook(), "nonexistent", "Could not find 'nonexistent'.") def test_cmdextendeddesc(self): - self.call(extended_room.CmdExtendedDesc(), "", "Details on Room", cmdstring="@detail") + self.call(extended_room.CmdExtendedDesc(), "", "Details on Room", cmdstring="detail") self.call(extended_room.CmdExtendedDesc(), "thingie = newdetail with spaces", - "Set Detail thingie to 'newdetail with spaces'.", cmdstring="@detail") - self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' on Room:\n", cmdstring="@detail") - self.call(extended_room.CmdExtendedDesc(), "/del thingie", "Detail thingie deleted, if it existed.", cmdstring="@detail") - self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' not found.", cmdstring="@detail") + "Set Detail thingie to 'newdetail with spaces'.", cmdstring="detail") + self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' on Room:\n", cmdstring="detail") + self.call(extended_room.CmdExtendedDesc(), "/del thingie", "Detail thingie deleted, if it existed.", cmdstring="detail") + self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' not found.", cmdstring="detail") self.call(extended_room.CmdExtendedDesc(), "", "Descriptions on Room:") def test_cmdgametime(self):