Skip to content

Replace use of Hypothesis with subTest #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corranwebster merged 1 commit into from
Mar 15, 2022
Merged

Replace use of Hypothesis with subTest #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/edmtool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
"coverage",
"Cython",
"fonttools",
"hypothesis",
"kiwisolver",
"numpy",
"pillow",
Expand Down
1 change: 0 additions & 1 deletion enable/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"svg": ["pyparsing"],
# Dependencies purely for running tests.
"test": [
"hypothesis",
"PyPDF2", # for pdf drawing tests in kiva.
"setuptools",
],
Expand Down
124 changes: 63 additions & 61 deletions kiva/tests/test_graphics_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
# Thanks for using Enthought open source!
import unittest

from hypothesis import given
from hypothesis.strategies import sampled_from
from numpy import (
alltrue, array, asarray, concatenate, dtype, newaxis, ones, ravel, zeros
)
Expand All @@ -32,70 +30,74 @@ def setUp(self):
self.size = (1, 1)
self.color = 0.0

@given(sampled_from([1.0, 0.0, 0.5]))
def test_simple(self, color):
gc = GraphicsContext(self.size, pix_format="bgra32")
desired = self.solid_bgra32(self.size, color)
img = GraphicsContext(desired, pix_format="bgra32")
gc.draw_image(img)
actual = gc.bmp_array
# for alpha == 1, image should be exactly equal.
self.assert_images_equal(desired, actual)

@given(sampled_from([1.0, 0.0, 0.5]))
def test_image_alpha(self, color):
def test_simple(self):
for color in [1.0, 0.0, 0.5]:
with self.subTest(color=color):
desired = self.solid_bgra32(self.size, color)
gc = GraphicsContext(self.size, pix_format="bgra32")
img = GraphicsContext(desired, pix_format="bgra32")
gc.draw_image(img)
actual = gc.bmp_array
# for alpha == 1, image should be exactly equal.
self.assert_images_equal(desired, actual)

def test_image_alpha(self):
alpha = 0.5
gc = GraphicsContext(self.size, pix_format="bgra32")
orig = self.solid_bgra32(self.size, color, alpha)
img = GraphicsContext(orig, pix_format="bgra32")
gc.draw_image(img)
actual = gc.bmp_array
gc_background = self.solid_bgra32(self.size, 1.0)
orig = self.solid_bgra32(self.size, color, alpha)
desired = self.alpha_blend(gc_background, orig)

# also, the alpha channel of the image is not copied into the
# desination graphics context, so we have to ignore alphas
self.assert_images_close(
desired[:, :, :-1], actual[:, :, :-1], diff_allowed=slop_allowed
)

@given(sampled_from([1.0, 0.0, 0.5]))
def test_ambient_alpha(self, color):
orig = self.solid_bgra32(self.size, color)
img = GraphicsContext(orig, pix_format="bgra32")
gc = GraphicsContext(self.size, pix_format="bgra32")
amb_alpha = 0.5
gc.set_alpha(amb_alpha)
gc.draw_image(img)
actual = gc.bmp_array
for color in [1.0, 0.0, 0.5]:
with self.subTest(color=color):
gc = GraphicsContext(self.size, pix_format="bgra32")
orig = self.solid_bgra32(self.size, color, alpha)
img = GraphicsContext(orig, pix_format="bgra32")
gc.draw_image(img)
actual = gc.bmp_array
gc_background = self.solid_bgra32(self.size, 1.0)
orig = self.solid_bgra32(self.size, color, alpha)
desired = self.alpha_blend(gc_background, orig)

# also, the alpha channel of the image is not copied into the
# desination graphics context, so we have to ignore alphas
self.assert_images_close(
desired[:, :, :-1], actual[:, :, :-1], diff_allowed=slop_allowed
)

gc_background = self.solid_bgra32(self.size, 1.0)
orig = self.solid_bgra32(self.size, color)
desired = self.alpha_blend(
gc_background, orig, ambient_alpha=amb_alpha
)
# alpha blending is approximate, allow channel differences of to 2.
self.assert_images_close(desired, actual, diff_allowed=slop_allowed)
def test_ambient_alpha(self):
for color in [1.0, 0.0, 0.5]:
with self.subTest(color=color):
orig = self.solid_bgra32(self.size, color)
img = GraphicsContext(orig, pix_format="bgra32")
gc = GraphicsContext(self.size, pix_format="bgra32")
amb_alpha = 0.5
gc.set_alpha(amb_alpha)
gc.draw_image(img)
actual = gc.bmp_array

gc_background = self.solid_bgra32(self.size, 1.0)
orig = self.solid_bgra32(self.size, color)
desired = self.alpha_blend(
gc_background, orig, ambient_alpha=amb_alpha
)
# alpha blending is approximate, allow channel differences of to 2.
self.assert_images_close(desired, actual, diff_allowed=slop_allowed)

@given(sampled_from([1.0, 0.0, 0.5]))
def test_ambient_plus_image_alpha(self, color):
def test_ambient_plus_image_alpha(self):
amb_alpha = 0.5
img_alpha = 0.5
gc = GraphicsContext(self.size, pix_format="bgra32")
orig = self.solid_bgra32(self.size, color, img_alpha)
img = GraphicsContext(orig, pix_format="bgra32")
gc.set_alpha(amb_alpha)
gc.draw_image(img)
actual = gc.bmp_array

gc_background = self.solid_bgra32(self.size, 1.0)
orig = self.solid_bgra32(self.size, color, img_alpha)
desired = self.alpha_blend(
gc_background, orig, ambient_alpha=amb_alpha
)
# alpha blending is approximate, allow channel differences of to 2.
self.assert_images_close(desired, actual, diff_allowed=slop_allowed)
for color in [1.0, 0.0, 0.5]:
with self.subTest(color=color):
gc = GraphicsContext(self.size, pix_format="bgra32")
orig = self.solid_bgra32(self.size, color, img_alpha)
img = GraphicsContext(orig, pix_format="bgra32")
gc.set_alpha(amb_alpha)
gc.draw_image(img)
actual = gc.bmp_array

gc_background = self.solid_bgra32(self.size, 1.0)
orig = self.solid_bgra32(self.size, color, img_alpha)
desired = self.alpha_blend(
gc_background, orig, ambient_alpha=amb_alpha
)
# alpha blending is approximate, allow channel differences of to 2.
self.assert_images_close(desired, actual, diff_allowed=slop_allowed)

def test_rect_scale(self):
color = 0.0
Expand Down