gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing a few tests

Browse Source
This commit is contained in:
Michael Lazar
2017-09-20 23:26:51 -04:00
parent fc2cd296e4
commit db07149e4a
3 changed files with 92 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtv/theme.py
View File

@@ -503,8 +503,8 @@ class Theme(object):
r = round(int(color[1:3], 16) / 51.0) # Normalize between 0-5 r = round(int(color[1:3], 16) / 51.0) # Normalize between 0-5
g = round(int(color[3:5], 16) / 51.0) g = round(int(color[3:5], 16) / 51.0)
b = round(int(color[5:7], 16) / 51.0) b = round(int(color[5:7], 16) / 51.0)
n = 36 * r + 6 * g + b + 16 n = int(36 * r + 6 * g + b + 16)
return 'ansi_{0}'.format(n) return 'ansi_{0:d}'.format(n)
except ValueError: except ValueError:
return None return None

2
tests/test_page.py
View File

@@ -141,7 +141,7 @@ def test_page_cycle_theme(reddit, terminal, config, oauth):
# Previous - will loop to one of the 256 color themes # Previous - will loop to one of the 256 color themes
page.controller.trigger(curses.KEY_F2) page.controller.trigger(curses.KEY_F2)
assert page.term.theme.source == 'installed' assert page.term.theme.source in ('preset', 'installed')
# Reset # Reset
page.term.set_theme() page.term.set_theme()

157
tests/test_theme.py
View File

@@ -1,11 +1,12 @@
import os import os
import shutil
import curses import curses
from collections import OrderedDict from collections import OrderedDict
from tempfile import NamedTemporaryFile from contextlib import contextmanager
from tempfile import mkdtemp, NamedTemporaryFile
import pytest import pytest
from rtv.theme import Theme from rtv.theme import Theme
from rtv.config import DEFAULT_THEMES from rtv.config import DEFAULT_THEMES
from rtv.exceptions import ConfigError from rtv.exceptions import ConfigError
@@ -28,6 +29,21 @@ INVALID_ELEMENTS = OrderedDict([
]) ])
@contextmanager
def _ephemeral_directory():
# All of the temporary files for the theme tests must
# be initialized in separate directories, so the tests
# can run in parallel without accidentally loading theme
# files from each other
dirname = None
try:
dirname = mkdtemp()
yield dirname
finally:
if dirname:
shutil.rmtree(dirname, ignore_errors=True)
def test_theme_invalid_source(): def test_theme_invalid_source():
with pytest.raises(ValueError): with pytest.raises(ValueError):
@@ -115,64 +131,67 @@ args, ids = INVALID_ELEMENTS.values(), list(INVALID_ELEMENTS)
@pytest.mark.parametrize('line', args, ids=ids) @pytest.mark.parametrize('line', args, ids=ids)
def test_theme_from_file_invalid(line): def test_theme_from_file_invalid(line):
with NamedTemporaryFile(mode='w+') as fp: with _ephemeral_directory() as dirname:
fp.write('[theme]\n') with NamedTemporaryFile(mode='w+', dir=dirname) as fp:
fp.write(line) fp.write('[theme]\n')
fp.flush() fp.write(line)
with pytest.raises(ConfigError): fp.flush()
Theme.from_file(fp.name, 'installed') with pytest.raises(ConfigError):
Theme.from_file(fp.name, 'installed')
def test_theme_from_file(): def test_theme_from_file():
with NamedTemporaryFile(mode='w+') as fp: with _ephemeral_directory() as dirname:
with NamedTemporaryFile(mode='w+', dir=dirname) as fp:
with pytest.raises(ConfigError): with pytest.raises(ConfigError):
Theme.from_file(fp.name, 'installed') Theme.from_file(fp.name, 'installed')
fp.write('[theme]\n') fp.write('[theme]\n')
fp.write('Unknown = - -\n') fp.write('Unknown = - -\n')
fp.write('Upvote = - red\n') fp.write('Upvote = - red\n')
fp.write('Downvote = ansi_255 default bold\n') fp.write('Downvote = ansi_255 default bold\n')
fp.write('NeutralVote = #000000 #ffffff bold+reverse\n') fp.write('NeutralVote = #000000 #ffffff bold+reverse\n')
fp.flush() fp.flush()
theme = Theme.from_file(fp.name, 'installed') theme = Theme.from_file(fp.name, 'installed')
assert theme.source == 'installed' assert theme.source == 'installed'
assert 'Unknown' not in theme.elements assert 'Unknown' not in theme.elements
assert theme.elements['Upvote'] == ( assert theme.elements['Upvote'] == (
-1, curses.COLOR_RED, curses.A_NORMAL) -1, curses.COLOR_RED, curses.A_NORMAL)
assert theme.elements['Downvote'] == ( assert theme.elements['Downvote'] == (
255, -1, curses.A_BOLD) 255, -1, curses.A_BOLD)
assert theme.elements['NeutralVote'] == ( assert theme.elements['NeutralVote'] == (
16, 231, curses.A_BOLD | curses.A_REVERSE) 16, 231, curses.A_BOLD | curses.A_REVERSE)
def test_theme_from_name(): def test_theme_from_name():
with NamedTemporaryFile(mode='w+', suffix='.cfg') as fp: with _ephemeral_directory() as dirname:
path, filename = os.path.split(fp.name) with NamedTemporaryFile(mode='w+', suffix='.cfg', dir=dirname) as fp:
theme_name = filename[:-4] path, filename = os.path.split(fp.name)
theme_name = filename[:-4]
fp.write('[theme]\n') fp.write('[theme]\n')
fp.write('Upvote = default default\n') fp.write('Upvote = default default\n')
fp.flush() fp.flush()
# Full file path # Full file path
theme = Theme.from_name(fp.name, path=path) theme = Theme.from_name(fp.name, path=path)
assert theme.name == theme_name assert theme.name == theme_name
assert theme.source == 'custom' assert theme.source == 'custom'
assert theme.elements['Upvote'] == (-1, -1, curses.A_NORMAL) assert theme.elements['Upvote'] == (-1, -1, curses.A_NORMAL)
# Relative to the directory # Relative to the directory
theme = Theme.from_name(theme_name, path=path) theme = Theme.from_name(theme_name, path=path)
assert theme.name == theme_name assert theme.name == theme_name
assert theme.source == 'installed' assert theme.source == 'installed'
assert theme.elements['Upvote'] == (-1, -1, curses.A_NORMAL) assert theme.elements['Upvote'] == (-1, -1, curses.A_NORMAL)
# Invalid theme name # Invalid theme name
with pytest.raises(ConfigError, path=path): with pytest.raises(ConfigError, path=path):
theme.from_name('invalid_theme_name') theme.from_name('invalid_theme_name')
def test_theme_initialize_attributes(stdscr): def test_theme_initialize_attributes(stdscr):
@@ -203,37 +222,39 @@ def test_theme_initialize_attributes_monochrome(stdscr):
def test_theme_list_themes(): def test_theme_list_themes():
with NamedTemporaryFile(mode='w+', suffix='.cfg') as fp: with _ephemeral_directory() as dirname:
path, filename = os.path.split(fp.name) with NamedTemporaryFile(mode='w+', suffix='.cfg', dir=dirname) as fp:
theme_name = filename[:-4] path, filename = os.path.split(fp.name)
theme_name = filename[:-4]
fp.write('[theme]\n') fp.write('[theme]\n')
fp.flush() fp.flush()
Theme.print_themes(path) Theme.print_themes(path)
themes, errors = Theme.list_themes(path) themes, errors = Theme.list_themes(path)
assert not errors assert not errors
theme_strings = [t.display_string for t in themes] theme_strings = [t.display_string for t in themes]
assert theme_name + ' (installed)' in theme_strings assert theme_name + ' (installed)' in theme_strings
assert 'default (built-in)' in theme_strings assert 'default (built-in)' in theme_strings
assert 'monochrome (built-in)' in theme_strings assert 'monochrome (built-in)' in theme_strings
assert 'molokai (preset)' in theme_strings assert 'molokai (preset)' in theme_strings
def test_theme_list_themes_invalid(): def test_theme_list_themes_invalid():
with NamedTemporaryFile(mode='w+', suffix='.cfg') as fp: with _ephemeral_directory() as dirname:
path, filename = os.path.split(fp.name) with NamedTemporaryFile(mode='w+', suffix='.cfg', dir=dirname) as fp:
theme_name = filename[:-4] path, filename = os.path.split(fp.name)
theme_name = filename[:-4]
fp.write('[theme]\n') fp.write('[theme]\n')
fp.write('Upvote = invalid value\n') fp.write('Upvote = invalid value\n')
fp.flush() fp.flush()
Theme.print_themes(path) Theme.print_themes(path)
themes, errors = Theme.list_themes(path) themes, errors = Theme.list_themes(path)
assert ('installed', theme_name) in errors assert ('installed', theme_name) in errors
def test_theme_presets_define_all_elements(): def test_theme_presets_define_all_elements():
@@ -248,4 +269,4 @@ def test_theme_presets_define_all_elements():
super(MockTheme, self).__init__(name, source, elements, use_color) super(MockTheme, self).__init__(name, source, elements, use_color)
themes, errors = MockTheme.list_themes() themes, errors = MockTheme.list_themes()
assert sum(theme.source == 'preset' for theme in themes) >= 4 assert sum([theme.source == 'preset' for theme in themes]) >= 4