Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-02 05:57:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Specify seconday sorting to stabilize test case

Browse source
This commit is contained in:
Griatch 2018-10-14 00:50:07 +02:00
parent 7c019583f0
commit 1bfce6b44c
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/rpsystem.py
View file

@ -238,7 +238,7 @@ def ordered_permutation_regex(sentence):
solution.append(_PREFIX + r"[0-9]*%s*%s(?=\W|$)+" % (_NUM_SEP, re_escape(" ".join(comb)).rstrip("\\")))
# combine into a match regex, first matching the longest down to the shortest components
regex = r"|".join(sorted(set(solution), key=len, reverse=True))
regex = r"|".join(sorted(set(solution), key=lambda item: (-len(item), item)))
return regex

32
evennia/contrib/tests.py
View file

@ -107,12 +107,22 @@ class TestRPSystem(EvenniaTest):
def test_ordered_permutation_regex(self):
self.assertEqual(
rpsystem.ordered_permutation_regex(sdesc0),
'/[0-9]*-*A\\ nice\\ sender\\ of\\ emotes(?=\\W|$)+|/[0-9]*-*nice\\ sender\\ '
'of\\ emotes(?=\\W|$)+|/[0-9]*-*A\\ nice\\ sender\\ of(?=\\W|$)+|/[0-9]*-*sender\\ '
'of\\ emotes(?=\\W|$)+|/[0-9]*-*nice\\ sender\\ of(?=\\W|$)+|/[0-9]*-*A\\ nice\\ '
'sender(?=\\W|$)+|/[0-9]*-*nice\\ sender(?=\\W|$)+|/[0-9]*-*of\\ emotes(?=\\W|$)+'
'|/[0-9]*-*sender\\ of(?=\\W|$)+|/[0-9]*-*A\\ nice(?=\\W|$)+|/[0-9]*-*sender(?=\\W|$)+'
'|/[0-9]*-*emotes(?=\\W|$)+|/[0-9]*-*nice(?=\\W|$)+|/[0-9]*-*of(?=\\W|$)+|/[0-9]*-*A(?=\\W|$)+')
'/[0-9]*-*A\\ nice\\ sender\\ of\\ emotes(?=\\W|$)+|'
'/[0-9]*-*nice\\ sender\\ of\\ emotes(?=\\W|$)+|'
'/[0-9]*-*A\\ nice\\ sender\\ of(?=\\W|$)+|'
'/[0-9]*-*sender\\ of\\ emotes(?=\\W|$)+|'
'/[0-9]*-*nice\\ sender\\ of(?=\\W|$)+|'
'/[0-9]*-*A\\ nice\\ sender(?=\\W|$)+|'
'/[0-9]*-*nice\\ sender(?=\\W|$)+|'
'/[0-9]*-*of\\ emotes(?=\\W|$)+|'
'/[0-9]*-*sender\\ of(?=\\W|$)+|'
'/[0-9]*-*A\\ nice(?=\\W|$)+|'
'/[0-9]*-*emotes(?=\\W|$)+|'
'/[0-9]*-*sender(?=\\W|$)+|'
'/[0-9]*-*nice(?=\\W|$)+|'
'/[0-9]*-*of(?=\\W|$)+|'
'/[0-9]*-*A(?=\\W|$)+'
)
def test_sdesc_handler(self):
self.speaker.sdesc.add(sdesc0)
@ -122,9 +132,13 @@ class TestRPSystem(EvenniaTest):
self.speaker.sdesc.add("Testing three words")
self.assertEqual(
self.speaker.sdesc.get_regex_tuple()[0].pattern,
'/[0-9]*-*Testing\\ three\\ words(?=\\W|$)+|/[0-9]*-*Testing\\ '
'three(?=\\W|$)+|/[0-9]*-*three\\ words(?=\\W|$)+|/[0-9]*-*Testing'
'(?=\\W|$)+|/[0-9]*-*three(?=\\W|$)+|/[0-9]*-*words(?=\\W|$)+')
'/[0-9]*-*Testing\ three\ words(?=\W|$)+|'
'/[0-9]*-*Testing\ three(?=\W|$)+|'
'/[0-9]*-*three\ words(?=\W|$)+|'
'/[0-9]*-*Testing(?=\W|$)+|'
'/[0-9]*-*three(?=\W|$)+|'
'/[0-9]*-*words(?=\W|$)+'
)
def test_recog_handler(self):
self.speaker.sdesc.add(sdesc0)