Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some unittest updates.

Browse source
This commit is contained in:
Griatch 2015-09-26 09:39:30 +02:00
parent e9148bc0f6
commit bd39f1548e
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/contrib/rpsystem.py
View file

@ -899,7 +899,7 @@ class RecogHandler(object):
# RP typeclasses # RP typeclasses
#------------------------------------------------------------ #------------------------------------------------------------
class RPObject(DefaultObject): class ContribRPObject(DefaultObject):
""" """
This class is meant as a mix-in or parent for objects in an This class is meant as a mix-in or parent for objects in an
rp-heavy game. It implements the base functionality for poses. rp-heavy game. It implements the base functionality for poses.
@ -909,7 +909,7 @@ class RPObject(DefaultObject):
""" """
Called at initial creation. Called at initial creation.
""" """
super(RPObject, self).at_object_creation super(ContribRPObject, self).at_object_creation
# emoting/recog data # emoting/recog data
self.db.pose = "" self.db.pose = ""
@ -964,7 +964,7 @@ class RPObject(DefaultObject):
self.msg("There is nothing here called '%s'." % searchdata) self.msg("There is nothing here called '%s'." % searchdata)
return return
# fall back to normal search # fall back to normal search
return super(RPObject, self).search(searchdata, **kwargs) return super(ContribRPObject, self).search(searchdata, **kwargs)
def get_display_name(self, looker, **kwargs): def get_display_name(self, looker, **kwargs):
@ -998,7 +998,7 @@ class RPObject(DefaultObject):
return "%s%s%s" % (sdesc, idstr, pose) return "%s%s%s" % (sdesc, idstr, pose)
class RPRoom(DefaultRoom): class ContribRPRoom(DefaultRoom):
""" """
Rooms don't have sdescs nor poses of their own, so we just modify Rooms don't have sdescs nor poses of their own, so we just modify
`return_appearance` here to make sure it properly displays poses `return_appearance` here to make sure it properly displays poses
@ -1038,7 +1038,7 @@ class RPRoom(DefaultRoom):
return string return string
class RPCharacter(DefaultCharacter, RPObject): class ContribRPCharacter(DefaultCharacter, ContribRPObject):
""" """
This is a character class that has poses, sdesc and recog. This is a character class that has poses, sdesc and recog.
""" """
@ -1086,7 +1086,7 @@ class RPCharacter(DefaultCharacter, RPObject):
""" """
Called at initial creation. Called at initial creation.
""" """
super(RPCharacter, self).at_object_creation() super(ContribRPCharacter, self).at_object_creation()
self.db._sdesc = "" self.db._sdesc = ""
self.db._sdesc_regex = "" self.db._sdesc_regex = ""

22
evennia/contrib/tests.py
View file

@ -65,15 +65,15 @@ sdesc2 = "Another nice colliding sdesc-guy for tests"
recog01 = "Mr Receiver" recog01 = "Mr Receiver"
recog02 = "Mr Receiver2" recog02 = "Mr Receiver2"
recog10 = "Mr Sender" recog10 = "Mr Sender"
emote = "With a flair, /me looks at /first and /colliding. She says \"This is a test.\"" emote = "With a flair, /me looks at /first and /colliding sdesc-guy. She says \"This is a test.\""
class TestRPSystem(EvenniaTest): class TestRPSystem(EvenniaTest):
def setUp(self): def setUp(self):
super(TestRPSystem, self).setUp() super(TestRPSystem, self).setUp()
self.room = create_object(rpsystem.RPRoom, key="Location") self.room = create_object(rpsystem.ContribRPRoom, key="Location")
self.speaker = create_object(rpsystem.RPCharacter, key="Sender", location=self.room) self.speaker = create_object(rpsystem.ContribRPCharacter, key="Sender", location=self.room)
self.receiver1 = create_object(rpsystem.RPCharacter, key="Receiver1", location=self.room) self.receiver1 = create_object(rpsystem.ContribRPCharacter, key="Receiver1", location=self.room)
self.receiver2 = create_object(rpsystem.RPCharacter, key="Receiver2", location=self.room) self.receiver2 = create_object(rpsystem.ContribRPCharacter, key="Receiver2", location=self.room)
def test_ordered_permutation_regex(self): def test_ordered_permutation_regex(self):
self.assertEqual(rpsystem.ordered_permutation_regex(sdesc0), self.assertEqual(rpsystem.ordered_permutation_regex(sdesc0),
@ -106,7 +106,7 @@ class TestRPSystem(EvenniaTest):
def test_parse_language(self): def test_parse_language(self):
self.assertEqual(rpsystem.parse_language(self.speaker, emote), self.assertEqual(rpsystem.parse_language(self.speaker, emote),
('With a flair, /me looks at /first and /colliding. She says {##0}', ('With a flair, /me looks at /first and /colliding sdesc-guy. She says {##0}',
{'##0': (None, '"This is a test."')}) ) {'##0': (None, '"This is a test."')}) )
def parse_sdescs_and_recogs(self): def parse_sdescs_and_recogs(self):
@ -122,7 +122,7 @@ class TestRPSystem(EvenniaTest):
self.speaker.recog.add(self.receiver1, recog01) self.speaker.recog.add(self.receiver1, recog01)
self.assertEqual(rpsystem.parse_sdescs_and_recogs(speaker, candidates, emote), result) self.assertEqual(rpsystem.parse_sdescs_and_recogs(speaker, candidates, emote), result)
def send_emote(self): def test_send_emote(self):
speaker = self.speaker speaker = self.speaker
receiver1 = self.receiver1 receiver1 = self.receiver1
receiver2 = self.receiver2 receiver2 = self.receiver2
@ -141,4 +141,12 @@ class TestRPSystem(EvenniaTest):
self.assertEqual(self.out2, 'With a flair, {bA nice sender of emotes{n looks at {bThe first ' \ self.assertEqual(self.out2, 'With a flair, {bA nice sender of emotes{n looks at {bThe first ' \
'receiver of emotes.{n and {bReceiver2{n. She says {b{w"This is a test."{n{n') 'receiver of emotes.{n and {bReceiver2{n. She says {b{w"This is a test."{n{n')
def test_rpsearch(self):
self.speaker.sdesc.add(sdesc0)
self.receiver1.sdesc.add(sdesc1)
self.receiver2.sdesc.add(sdesc2)
self.speaker.msg = lambda text, **kwargs: setattr(self, "out0", text)
self.assertEqual(self.speaker.search("receiver of emotes"), self.receiver1)
self.assertEqual(self.speaker.search("colliding"), self.receiver2)