rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a nicer Color() class for tests.

Browse Source
This commit is contained in:
Florian Bruhin 2014-07-15 11:06:56 +02:00
parent b042b5cbc4
commit ca74fa28ac
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
qutebrowser/test/utils/test_misc.py
View File

@ -34,6 +34,22 @@ import qutebrowser.utils.misc as utils
from qutebrowser.test.helpers import environ_set_temp, fake_keyevent from qutebrowser.test.helpers import environ_set_temp, fake_keyevent
class Color(QColor):
"""A QColor with a nicer repr()."""
def __repr__(self):
return 'Color({}, {}, {}, {})'.format(
self.red(), self.green(), self.blue(), self.alpha())
def __eq__(self, other):
"""The default operator= of QColor seems to be rather strict."""
return (self.red() == other.red() and
self.green() == other.green() and
self.blue() == other.blue() and
self.alpha() == other.alpha())
class ElidingTests(unittest.TestCase): class ElidingTests(unittest.TestCase):
"""Test elide.""" """Test elide."""
@ -330,23 +346,23 @@ class InterpolateColorTests(unittest.TestCase):
"""Tests for interpolate_color. """Tests for interpolate_color.
Attributes: Attributes:
white: The QColor white as a valid QColor for tests. white: The Color white as a valid Color for tests.
white: The QColor black as a valid QColor for tests. white: The Color black as a valid Color for tests.
""" """
def setUp(self): def setUp(self):
self.white = QColor('white') self.white = Color('white')
self.black = QColor('black') self.black = Color('black')
def test_invalid_start(self): def test_invalid_start(self):
"""Test an invalid start color.""" """Test an invalid start color."""
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
utils.interpolate_color(QColor(), self.white, 0) utils.interpolate_color(Color(), self.white, 0)
def test_invalid_end(self): def test_invalid_end(self):
"""Test an invalid end color.""" """Test an invalid end color."""
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
utils.interpolate_color(self.white, QColor(), 0) utils.interpolate_color(self.white, Color(), 0)
def test_invalid_percentage(self): def test_invalid_percentage(self):
"""Test an invalid percentage.""" """Test an invalid percentage."""
@ -365,52 +381,52 @@ class InterpolateColorTests(unittest.TestCase):
white = utils.interpolate_color(self.white, self.black, 0, QColor.Rgb) white = utils.interpolate_color(self.white, self.black, 0, QColor.Rgb)
black = utils.interpolate_color(self.white, self.black, 100, black = utils.interpolate_color(self.white, self.black, 100,
QColor.Rgb) QColor.Rgb)
self.assertEqual(white, self.white) self.assertEqual(Color(white), self.white)
self.assertEqual(black, self.black) self.assertEqual(Color(black), self.black)
def test_valid_percentages_hsv(self): def test_valid_percentages_hsv(self):
"""Test 0% and 100% in the HSV colorspace.""" """Test 0% and 100% in the HSV colorspace."""
white = utils.interpolate_color(self.white, self.black, 0, QColor.Hsv) white = utils.interpolate_color(self.white, self.black, 0, QColor.Hsv)
black = utils.interpolate_color(self.white, self.black, 100, black = utils.interpolate_color(self.white, self.black, 100,
QColor.Hsv) QColor.Hsv)
self.assertEqual(white, self.white) self.assertEqual(Color(white), self.white)
self.assertEqual(black, self.black) self.assertEqual(Color(black), self.black)
def test_valid_percentages_hsl(self): def test_valid_percentages_hsl(self):
"""Test 0% and 100% in the HSL colorspace.""" """Test 0% and 100% in the HSL colorspace."""
white = utils.interpolate_color(self.white, self.black, 0, QColor.Hsl) white = utils.interpolate_color(self.white, self.black, 0, QColor.Hsl)
black = utils.interpolate_color(self.white, self.black, 100, black = utils.interpolate_color(self.white, self.black, 100,
QColor.Hsl) QColor.Hsl)
self.assertEqual(white, self.white) self.assertEqual(Color(white), self.white)
self.assertEqual(black, self.black) self.assertEqual(Color(black), self.black)
def test_interpolation_rgb(self): def test_interpolation_rgb(self):
"""Test an interpolation in the RGB colorspace.""" """Test an interpolation in the RGB colorspace."""
color = utils.interpolate_color(QColor(0, 40, 100), QColor(0, 20, 200), color = utils.interpolate_color(Color(0, 40, 100), Color(0, 20, 200),
50, QColor.Rgb) 50, QColor.Rgb)
self.assertEqual(color, QColor(0, 30, 150)) self.assertEqual(Color(color), Color(0, 30, 150))
def test_interpolation_hsv(self): def test_interpolation_hsv(self):
"""Test an interpolation in the HSV colorspace.""" """Test an interpolation in the HSV colorspace."""
start = QColor() start = Color()
stop = QColor() stop = Color()
start.setHsv(0, 40, 100) start.setHsv(0, 40, 100)
stop.setHsv(0, 20, 200) stop.setHsv(0, 20, 200)
color = utils.interpolate_color(start, stop, 50, QColor.Hsv) color = utils.interpolate_color(start, stop, 50, QColor.Hsv)
expected = QColor() expected = Color()
expected.setHsv(0, 30, 150) expected.setHsv(0, 30, 150)
self.assertEqual(color, expected) self.assertEqual(Color(color), expected)
def test_interpolation_hsl(self): def test_interpolation_hsl(self):
"""Test an interpolation in the HSL colorspace.""" """Test an interpolation in the HSL colorspace."""
start = QColor() start = Color()
stop = QColor() stop = Color()
start.setHsl(0, 40, 100) start.setHsl(0, 40, 100)
stop.setHsl(0, 20, 200) stop.setHsl(0, 20, 200)
color = utils.interpolate_color(start, stop, 50, QColor.Hsl) color = utils.interpolate_color(start, stop, 50, QColor.Hsl)
expected = QColor() expected = Color()
expected.setHsl(0, 30, 150) expected.setHsl(0, 30, 150)
self.assertEqual(color, expected) self.assertEqual(Color(color), expected)
class FormatSecondsTests(unittest.TestCase): class FormatSecondsTests(unittest.TestCase):