openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/media into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)
Related bugs:
  Bug #885150 in OpenLP: "Need non self contained service files"
  https://bugs.launchpad.net/openlp/+bug/885150
  Bug #899714 in OpenLP: "Play/Pause button should be merged"
  https://bugs.launchpad.net/openlp/+bug/899714
  Bug #927829 in OpenLP: "media backends should provide some information about themselves in the settings"
  https://bugs.launchpad.net/openlp/+bug/927829
  Bug #952821 in OpenLP: "Unable to play videos from web"
  https://bugs.launchpad.net/openlp/+bug/952821
  Bug #958198 in OpenLP: "Replacing live background with a video shows theme behind"
  https://bugs.launchpad.net/openlp/+bug/958198
  Bug #999618 in OpenLP: "Video position slider jumps to part way through video"
  https://bugs.launchpad.net/openlp/+bug/999618
  Bug #1022053 in OpenLP: "Previewing media item interferes with live media item"
  https://bugs.launchpad.net/openlp/+bug/1022053
  Bug #1063211 in OpenLP: "Media and Presentation Plugins do not update the service suffix lists if players are added or removed without a restart"
  https://bugs.launchpad.net/openlp/+bug/1063211

For more details, see:
https://code.launchpad.net/~trb143/openlp/media/+merge/144000

Fix the tests but fixing the absolute paths
-- 
https://code.launchpad.net/~trb143/openlp/media/+merge/144000
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'tests/functional/openlp_core_lib/test_serviceitem.py'
--- tests/functional/openlp_core_lib/test_serviceitem.py	2013-01-19 18:31:22 +0000
+++ tests/functional/openlp_core_lib/test_serviceitem.py	2013-01-19 21:36:23 +0000
@@ -1,6 +1,8 @@
 """
     Package to test the openlp.core.lib package.
 """
+import os
+
 from unittest import TestCase
 from mock import MagicMock
 from openlp.core.lib import ServiceItem
@@ -14,6 +16,8 @@
         'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
 FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
 
+TESTPATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'resources'))
+
 class TestServiceItem(TestCase):
 
     def serviceitem_basic_test(self):
@@ -68,7 +72,8 @@
         service_item.renderer = mocked_renderer
 
         # WHEN: adding image to a service item
-        service_item.add_from_image(u'resources/church.jpg', u'Image Title')
+        test_image = os.path.join(TESTPATH, u'church.jpg')
+        service_item.add_from_image(test_image, u'Image Title')
 
         # THEN: We should get back a valid service item
         assert service_item.is_valid is True, u'The new service item should be valid'
@@ -76,14 +81,14 @@
 
         # THEN: We should have a page of output.
         assert len(service_item._raw_frames) == 1, u'A valid rendered Service Item has display frames'
-        assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
+        assert service_item.get_rendered_frame(0) == test_image
 
         # WHEN: adding a second image to a service item
-        service_item.add_from_image(u'resources/church.jpg', u'Image1 Title')
+        service_item.add_from_image(test_image, u'Image1 Title')
 
         # THEN: We should have an increased page of output.
         assert len(service_item._raw_frames) == 2, u'A valid rendered Service Item has display frames'
-        assert service_item.get_rendered_frame(0) == u'resources/church.jpg'
+        assert service_item.get_rendered_frame(0) == test_image
         assert service_item.get_rendered_frame(0) == service_item.get_rendered_frame(1)
 
         # WHEN requesting a saved service item
@@ -93,7 +98,7 @@
         assert len(service) == 2, u'A saved service has two parts'
         assert service[u'header'][u'name']  == u'test' , u'A test plugin was returned'
         assert service[u'data'][0][u'title'] == u'Image Title' , u'The first title name matches the request'
-        assert service[u'data'][0][u'path'] == u'resources/church.jpg' , u'The first image name matches'
+        assert service[u'data'][0][u'path'] == test_image , u'The first image name matches'
         assert service[u'data'][0][u'title'] != service[u'data'][1][u'title'], \
             u'The individual titles should not match'
         assert service[u'data'][0][u'path'] == service[u'data'][1][u'path'], u'The file paths should match'
@@ -124,7 +129,8 @@
         service_item.renderer = mocked_renderer
 
         # WHEN: adding image to a service item
-        service_item.add_from_command(u'resources', u'church.jpg', u'resources/church.jpg')
+        test_file = os.path.join(TESTPATH, u'church.jpg')
+        service_item.add_from_command(TESTPATH, u'church.jpg', test_file)
 
         # THEN: We should get back a valid service item
         assert service_item.is_valid is True, u'The new service item should be valid'
@@ -132,7 +138,7 @@
 
         # THEN: We should have a page of output.
         assert len(service_item._raw_frames) == 1, u'A valid rendered Service Item has one raw frame'
-        assert service_item.get_rendered_frame(0) == u'resources/church.jpg', u'The image matches the input'
+        assert service_item.get_rendered_frame(0) == test_file, u'The image matches the input'
 
         # WHEN requesting a saved service item
         service = service_item.get_service_repr(True)
@@ -141,8 +147,8 @@
         assert len(service) == 2, u'A saved service has two parts'
         assert service[u'header'][u'name']  == u'test' , u'A test plugin'
         assert service[u'data'][0][u'title'] == u'church.jpg' , u'The first title name '
-        assert service[u'data'][0][u'path'] == u'resources' , u'The first image name'
-        assert service[u'data'][0][u'image'] == u'resources/church.jpg' , u'The first image name'
+        assert service[u'data'][0][u'path'] == TESTPATH , u'The first image name'
+        assert service[u'data'][0][u'image'] == test_file , u'The first image name'
 
         # WHEN validating a service item
         service_item.validate_item([u'jpg'])