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

Move {- and %c color markup to contrib, make easily extendable, as per #1229

Browse source
This commit is contained in:
Griatch 2017-07-19 21:09:11 +02:00
parent 03f4ecb3a4
commit 536bb28470
2 changed files with 66 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

129
evennia/contrib/tests.py
View file

@ -992,66 +992,69 @@ from evennia.contrib import color_markups
from evennia.utils import ansi from evennia.utils import ansi
class TestColorMarkup(EvenniaTest): #class TestColorMarkup(EvenniaTest):
#
def test_default_markup(self): # def test_default_markup(self):
reload(ansi) # reload(ansi)
self.assertEqual(ansi.parse_ansi("A |rred test"), 'A \x1b[1m\x1b[31mred test') # self.assertEqual(ansi.parse_ansi("A |rred test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A {rred test"), 'A {rred test') # self.assertEqual(ansi.parse_ansi("A {rred test"), 'A {rred test')
self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test") # self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test")
#
@override_settings( # def tearDown(self):
COLOR_ANSI_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_EXTRA_MAP, # reload(ansi)
COLOR_XTERM256_EXTRA_FG=color_markups.CURLY_COLOR_XTERM256_EXTRA_FG, #
COLOR_XTERM256_EXTRA_BG=color_markups.CURLY_COLOR_XTERM256_EXTRA_BG, # @override_settings(
COLOR_XTERM256_EXTRA_GFG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GFG, # COLOR_ANSI_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_EXTRA_MAP,
COLOR_XTERM256_EXTRA_GBG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GBG, # COLOR_XTERM256_EXTRA_FG=color_markups.CURLY_COLOR_XTERM256_EXTRA_FG,
COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP) # COLOR_XTERM256_EXTRA_BG=color_markups.CURLY_COLOR_XTERM256_EXTRA_BG,
def test_curly_markup(self): # COLOR_XTERM256_EXTRA_GFG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GFG,
reload(ansi) # this is important since the module is initialized # COLOR_XTERM256_EXTRA_GBG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GBG,
self.assertEqual(ansi.parse_ansi("A |rred test"), 'A \x1b[1m\x1b[31mred test') # COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP)
self.assertEqual(ansi.parse_ansi("A {rred test"), 'A \x1b[1m\x1b[31mred test') # def test_curly_markup(self):
self.assertEqual(ansi.parse_ansi("A {[Rred test"), 'A \x1b[41mred test') # reload(ansi) # this is important since the module is initialized
self.assertEqual(ansi.parse_ansi("A |500red test"), 'A \x1b[1m\x1b[31mred test') # self.assertEqual(ansi.parse_ansi("A |rred test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A {500red test"), 'A \x1b[1m\x1b[31mred test') # self.assertEqual(ansi.parse_ansi("A {rred test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A {[500red test"), 'A \x1b[41mred test') # self.assertEqual(ansi.parse_ansi("A {[Rred test"), 'A \x1b[41mred test')
self.assertEqual(ansi.parse_ansi("A {=hgray test"), 'A \x1b[1m\x1b[30mgray test') # self.assertEqual(ansi.parse_ansi("A |500red test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A {[=hgray test"), 'A \x1b[40mgray test') # self.assertEqual(ansi.parse_ansi("A {500red test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test") # self.assertEqual(ansi.parse_ansi("A {[500red test"), 'A \x1b[41mred test')
# fake ansi bright background # self.assertEqual(ansi.parse_ansi("A {=hgray test"), 'A \x1b[1m\x1b[30mgray test')
self.assertEqual(ansi.parse_ansi("A {[rred test"), 'A \x1b[41mred test') # self.assertEqual(ansi.parse_ansi("A {[=hgray test"), 'A \x1b[40mgray test')
# self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test")
@override_settings( # # fake ansi bright background
COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP, # self.assertEqual(ansi.parse_ansi("A {[rred test"), 'A \x1b[41mred test')
COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG, #
COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG, # @override_settings(
COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG, # COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP,
COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG, # COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG,
COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP) # COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG,
def test_mux_markup(self): # COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG,
reload(ansi) # COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG,
self.assertEqual(ansi.parse_ansi("A |rred test"), 'A \x1b[1m\x1b[31mred test') # COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP)
self.assertEqual(ansi.parse_ansi("A %ch%crred test"), 'A \x1b[1m\x1b[31mred test') # def test_mux_markup(self):
self.assertEqual(ansi.parse_ansi("A %ch%crred test"), 'A \x1b[1m\x1b[31mred test') # reload(ansi)
self.assertEqual(ansi.parse_ansi("A |500red test"), 'A \x1b[1m\x1b[31mred test') # self.assertEqual(ansi.parse_ansi("A |rred test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A %c500red test"), 'A \x1b[1m\x1b[31mred test') # self.assertEqual(ansi.parse_ansi("A %ch%crred test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A %c[500red test"), 'A \x1b[41mred test') # self.assertEqual(ansi.parse_ansi("A %ch%crred test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A %c=hgray test"), 'A \x1b[1m\x1b[30mgray test') # self.assertEqual(ansi.parse_ansi("A |500red test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A %c[=hgray test"), 'A \x1b[40mgray test') # self.assertEqual(ansi.parse_ansi("A %c500red test"), 'A \x1b[1m\x1b[31mred test')
self.assertEqual(ansi.parse_ansi("A {rred test"), "A {rred test") # self.assertEqual(ansi.parse_ansi("A %c[500red test"), 'A \x1b[41mred test')
# fake ansi bright background # self.assertEqual(ansi.parse_ansi("A %c=hgray test"), 'A \x1b[1m\x1b[30mgray test')
self.assertEqual(ansi.parse_ansi("A %ch%cRred test"), 'A \x1b[41mred test') # self.assertEqual(ansi.parse_ansi("A %c[=hgray test"), 'A \x1b[40mgray test')
# self.assertEqual(ansi.parse_ansi("A {rred test"), "A {rred test")
@override_settings( # # fake ansi bright background
COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP, # self.assertEqual(ansi.parse_ansi("A %ch%cRred test"), 'A \x1b[41mred test')
COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG, #
COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG, # @override_settings(
COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG, # COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP,
COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG, # COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG,
COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP, # COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG,
COLOR_NO_DEFAULT=True) # COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG,
def test_override(self): # COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG,
reload(ansi) # COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP,
self.assertEqual(ansi.parse_ansi("A |rred test"), "A |rred test") # COLOR_NO_DEFAULT=True)
self.assertEqual(ansi.parse_ansi("A {rred test"), "A {rred test") # def test_override(self):
self.assertEqual(ansi.parse_ansi("A %ch%crred test"), 'A \x1b[1m\x1b[31mred test') # reload(ansi)
# self.assertEqual(ansi.parse_ansi("A |rred test"), "A |rred test")
# self.assertEqual(ansi.parse_ansi("A {rred test"), "A {rred test")
# self.assertEqual(ansi.parse_ansi("A %ch%crred test"), 'A \x1b[1m\x1b[31mred test')

1
evennia/utils/tests.py
View file

@ -230,7 +230,6 @@ class TestMLen(TestCase):
self.assertEqual(utils.m_len(ANSIString('|lcl|gook|ltat|le|n')), 2) self.assertEqual(utils.m_len(ANSIString('|lcl|gook|ltat|le|n')), 2)
def test_non_mxp_ansi_string(self): def test_non_mxp_ansi_string(self):
self.assertEqual(utils.m_len(ANSIString('{gHello{n')), 5) # TODO - cause this to fail by default.
self.assertEqual(utils.m_len(ANSIString('|gHello|n')), 5) self.assertEqual(utils.m_len(ANSIString('|gHello|n')), 5)
def test_list(self): def test_list(self):