From a0b1a0cac1c5c72149203676b3768f6f79b4c905 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 19 Feb 2017 21:06:03 +0100 Subject: [PATCH] Add unittests for simpledoor and slow_exit contribs, as per #1105. --- evennia/contrib/slow_exit.py | 3 ++- evennia/contrib/tests.py | 28 ++++++++++++++++++++++++++++ evennia/objects/objects.py | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/evennia/contrib/slow_exit.py b/evennia/contrib/slow_exit.py index 06eccf2eb..0a1097ed4 100644 --- a/evennia/contrib/slow_exit.py +++ b/evennia/contrib/slow_exit.py @@ -138,6 +138,7 @@ class CmdStop(Command): if currently_moving: currently_moving.cancel() self.caller.msg("You stop moving.") - self.caller.location.msg_contents("%s stops." % self.get_display_name()) + for observer in self.caller.location.contents_get(self.caller): + observer.msg("%s stops." % self.caller.get_display_name(observer)) else: self.caller.msg("You are not moving.") diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py index e99a7a5e1..3748c9455 100644 --- a/evennia/contrib/tests.py +++ b/evennia/contrib/tests.py @@ -591,3 +591,31 @@ class TestMultidescer(CommandTest): self.call(multidescer.CmdMultiDesc(),"/set test1 + test2 + + test3", "test1 Desc 2 Desc 3\n\n" "The above was set as the current description.") self.assertEqual(self.char1.db.desc, "test1 Desc 2 Desc 3") + +# test simpledoor contrib + +from evennia.contrib import simpledoor + +class TestSimpleDoor(CommandTest): + def test_cmdopen(self): + self.call(simpledoor.CmdOpen(), "newdoor;door:contrib.simpledoor.SimpleDoor,backdoor;door = Room2", + "Created new Exit 'newdoor' from Room to Room2 (aliases: door).|Note: A doortype exit was " + "created ignored eventual custom returnexit type.|Created new Exit 'newdoor' from Room2 to Room (aliases: door).") + self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "You close newdoor.", cmdstring="close") + self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "newdoor is already closed.", cmdstring="close") + self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "You open newdoor.", cmdstring="open") + self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "newdoor is already open.", cmdstring="open") + +# test slow_exit contrib + +from evennia.contrib import slow_exit +slow_exit.MOVE_DELAY = {"stroll":0, "walk": 0, "run": 0, "sprint": 0} + +class TestSlowExit(CommandTest): + def test_exit(self): + exi = create_object(slow_exit.SlowExit, key="slowexit", location=self.room1, destination=self.room2) + exi.at_traverse(self.char1, self.room2) + self.call(slow_exit.CmdSetSpeed(), "walk", "You are now walking.") + self.call(slow_exit.CmdStop(), "", "You stop moving.") + + diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 3dda68047..b22ce84d7 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -584,6 +584,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): "{attacker} {action} {defender}", mapping=dict(attacker=char, defender=npc, action=action), exclude=(char, npc)) + """ contents = self.contents if exclude: