mirror of
https://github.com/evennia/evennia.git
synced 2026-04-03 06:27:17 +02:00
Move {- and %c color markup to contrib, make easily extendable, as per #1229
This commit is contained in:
Griatch
parent
03f4ecb3a4
commit
536bb28470
2 changed files with 66 additions and 64 deletions
|
|
@ -992,66 +992,69 @@ from evennia.contrib import color_markups
|
|||
from evennia.utils import ansi
|
||||
|
||||
|
||||
class TestColorMarkup(EvenniaTest):
|
||||
|
||||
def test_default_markup(self):
|
||||
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 {rred test')
|
||||
self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test")
|
||||
|
||||
@override_settings(
|
||||
COLOR_ANSI_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_EXTRA_MAP,
|
||||
COLOR_XTERM256_EXTRA_FG=color_markups.CURLY_COLOR_XTERM256_EXTRA_FG,
|
||||
COLOR_XTERM256_EXTRA_BG=color_markups.CURLY_COLOR_XTERM256_EXTRA_BG,
|
||||
COLOR_XTERM256_EXTRA_GFG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GFG,
|
||||
COLOR_XTERM256_EXTRA_GBG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GBG,
|
||||
COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP)
|
||||
def test_curly_markup(self):
|
||||
reload(ansi) # this is important since the module is initialized
|
||||
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 \x1b[41mred test')
|
||||
self.assertEqual(ansi.parse_ansi("A |500red 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 {[500red 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 {[=hgray test"), 'A \x1b[40mgray test')
|
||||
self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test")
|
||||
# fake ansi bright background
|
||||
self.assertEqual(ansi.parse_ansi("A {[rred test"), 'A \x1b[41mred test')
|
||||
|
||||
@override_settings(
|
||||
COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP,
|
||||
COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG,
|
||||
COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG,
|
||||
COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG,
|
||||
COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG,
|
||||
COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP)
|
||||
def test_mux_markup(self):
|
||||
reload(ansi)
|
||||
self.assertEqual(ansi.parse_ansi("A |rred 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 %ch%crred 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 %c500red 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 %c=hgray test"), 'A \x1b[1m\x1b[30mgray 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")
|
||||
# fake ansi bright background
|
||||
self.assertEqual(ansi.parse_ansi("A %ch%cRred test"), 'A \x1b[41mred test')
|
||||
|
||||
@override_settings(
|
||||
COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP,
|
||||
COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG,
|
||||
COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG,
|
||||
COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG,
|
||||
COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG,
|
||||
COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP,
|
||||
COLOR_NO_DEFAULT=True)
|
||||
def test_override(self):
|
||||
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')
|
||||
#class TestColorMarkup(EvenniaTest):
|
||||
#
|
||||
# def test_default_markup(self):
|
||||
# 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 {rred test')
|
||||
# self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test")
|
||||
#
|
||||
# def tearDown(self):
|
||||
# reload(ansi)
|
||||
#
|
||||
# @override_settings(
|
||||
# COLOR_ANSI_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_EXTRA_MAP,
|
||||
# COLOR_XTERM256_EXTRA_FG=color_markups.CURLY_COLOR_XTERM256_EXTRA_FG,
|
||||
# COLOR_XTERM256_EXTRA_BG=color_markups.CURLY_COLOR_XTERM256_EXTRA_BG,
|
||||
# COLOR_XTERM256_EXTRA_GFG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GFG,
|
||||
# COLOR_XTERM256_EXTRA_GBG=color_markups.CURLY_COLOR_XTERM256_EXTRA_GBG,
|
||||
# COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.CURLY_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP)
|
||||
# def test_curly_markup(self):
|
||||
# reload(ansi) # this is important since the module is initialized
|
||||
# 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 \x1b[41mred test')
|
||||
# self.assertEqual(ansi.parse_ansi("A |500red 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 {[500red 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 {[=hgray test"), 'A \x1b[40mgray test')
|
||||
# self.assertEqual(ansi.parse_ansi("A %crred test"), "A %crred test")
|
||||
# # fake ansi bright background
|
||||
# self.assertEqual(ansi.parse_ansi("A {[rred test"), 'A \x1b[41mred test')
|
||||
#
|
||||
# @override_settings(
|
||||
# COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP,
|
||||
# COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG,
|
||||
# COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG,
|
||||
# COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG,
|
||||
# COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG,
|
||||
# COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP)
|
||||
# def test_mux_markup(self):
|
||||
# reload(ansi)
|
||||
# self.assertEqual(ansi.parse_ansi("A |rred 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 %ch%crred 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 %c500red 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 %c=hgray test"), 'A \x1b[1m\x1b[30mgray 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")
|
||||
# # fake ansi bright background
|
||||
# self.assertEqual(ansi.parse_ansi("A %ch%cRred test"), 'A \x1b[41mred test')
|
||||
#
|
||||
# @override_settings(
|
||||
# COLOR_ANSI_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_EXTRA_MAP,
|
||||
# COLOR_XTERM256_EXTRA_FG=color_markups.MUX_COLOR_XTERM256_EXTRA_FG,
|
||||
# COLOR_XTERM256_EXTRA_BG=color_markups.MUX_COLOR_XTERM256_EXTRA_BG,
|
||||
# COLOR_XTERM256_EXTRA_GFG=color_markups.MUX_COLOR_XTERM256_EXTRA_GFG,
|
||||
# COLOR_XTERM256_EXTRA_GBG=color_markups.MUX_COLOR_XTERM256_EXTRA_GBG,
|
||||
# COLOR_ANSI_BRIGHT_BG_EXTRA_MAP=color_markups.MUX_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP,
|
||||
# COLOR_NO_DEFAULT=True)
|
||||
# def test_override(self):
|
||||
# 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')
|
||||
|
|
|
|||
|
|
@ -230,7 +230,6 @@ class TestMLen(TestCase):
|
|||
self.assertEqual(utils.m_len(ANSIString('|lcl|gook|ltat|le|n')), 2)
|
||||
|
||||
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)
|
||||
|
||||
def test_list(self):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue