raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

use self.assert and friends

Browse Source
This commit is contained in:
Andreas Preikschat 2014-04-15 22:27:32 +02:00
parent 9950a06b1f
commit 5090a014ae
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/functional/openlp_core_lib/test_image_manager.py
View File

@ -112,8 +112,10 @@ class TestImageManager(TestCase, TestMixin):
# is being processed (see mocked methods/functions). # is being processed (see mocked methods/functions).
# Note: Priority.Normal means, that the resize_image() was not completed yet (because afterwards the # # Note: Priority.Normal means, that the resize_image() was not completed yet (because afterwards the #
# priority is adjusted to Priority.Lowest). # priority is adjusted to Priority.Lowest).
assert self.get_image_priority(image1) == Priority.Normal, "image1's priority should be 'Priority.Normal'" self.assertEqual(self.get_image_priority(image1), Priority.Normal,
assert self.get_image_priority(image2) == Priority.Normal, "image2's priority should be 'Priority.Normal'" "image1's priority should be 'Priority.Normal'")
self.assertEqual(self.get_image_priority(image2), Priority.Normal,
"image2's priority should be 'Priority.Normal'")
# WHEN: Add more images. # WHEN: Add more images.
self.image_manager.add_image(TEST_PATH, image3, None) self.image_manager.add_image(TEST_PATH, image3, None)
@ -131,14 +133,16 @@ class TestImageManager(TestCase, TestMixin):
# Because empty() is not reliable, wait a litte; just to make sure. # Because empty() is not reliable, wait a litte; just to make sure.
time.sleep(0.1) time.sleep(0.1)
# THEN: The images' priority reflect how they were processed. # THEN: The images' priority reflect how they were processed.
assert self.image_manager._conversion_queue.qsize() == 0, "The queue should be empty." assert self.image_manager._conversion_queue.qsize() == 0,
assert self.get_image_priority(image1) == Priority.Lowest, \ self.assertEqual(self.image_manager._conversion_queue.qsize(), 0, "The queue should be empty.")
"The image should have not been requested (=Lowest)" self.assertEqual(self.get_image_priority(image1), Priority.Lowest,
assert self.get_image_priority(image2) == Priority.Lowest, \ "The image should have not been requested (=Lowest)")
"The image should have not been requested (=Lowest)" self.assertEqual(self.get_image_priority(image2), Priority.Lowest,
assert self.get_image_priority(image3) == Priority.Low, "Only the QImage should have been requested (=Low)." "The image should have not been requested (=Lowest)")
assert self.get_image_priority(image4) == Priority.Urgent, \ self.assertEqual(self.get_image_priority(image3), Priority.Low,
"The image bytes should have been requested (=Urgent)." "Only the QImage should have been requested (=Low).")
self.assertEqual(self.get_image_priority(image4), Priority.Urgent,
"The image bytes should have been requested (=Urgent).")
def get_image_priority(self, image): def get_image_priority(self, image):
""" """