From da7ff60697b4d496db4831ea792774582f091bde Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Sat, 6 Dec 2014 21:05:45 +0000
Subject: [PATCH] Moved test service files into appropriate folder.

---
 tests/functional/openlp_core_lib/test_serviceitem.py   | 4 ++--
 tests/resources/{ => service}/migrate_video_20_22.osd  | 0
 tests/resources/{ => service}/serviceitem-dvd.osj      | 0
 tests/resources/{ => service}/serviceitem_custom_1.osj | 0
 tests/resources/{ => service}/serviceitem_image_1.osj  | 0
 tests/resources/{ => service}/serviceitem_image_2.osj  | 0
 tests/resources/{ => service}/serviceitem_image_3.osj  | 0
 tests/utils/osdinteraction.py                          | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/resources/{ => service}/migrate_video_20_22.osd (100%)
 rename tests/resources/{ => service}/serviceitem-dvd.osj (100%)
 rename tests/resources/{ => service}/serviceitem_custom_1.osj (100%)
 rename tests/resources/{ => service}/serviceitem_image_1.osj (100%)
 rename tests/resources/{ => service}/serviceitem_image_2.osj (100%)
 rename tests/resources/{ => service}/serviceitem_image_3.osj (100%)

diff --git a/tests/functional/openlp_core_lib/test_serviceitem.py b/tests/functional/openlp_core_lib/test_serviceitem.py
index f7c2d9e56..8b7075d7c 100644
--- a/tests/functional/openlp_core_lib/test_serviceitem.py
+++ b/tests/functional/openlp_core_lib/test_serviceitem.py
@@ -46,7 +46,7 @@ VERSE = 'The Lord said to {r}Noah{/r}: \n'\
         '{r}C{/r}{b}h{/b}{bl}i{/bl}{y}l{/y}{g}d{/g}{pk}'\
         'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
 FOOTER = ['Arky Arky (Unknown)', 'Public Domain', 'CCLI 123456']
-TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'resources'))
+TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'resources', 'service'))
 
 
 class TestServiceItem(TestCase):
@@ -281,7 +281,7 @@ class TestServiceItem(TestCase):
         service_item.add_icon = MagicMock()
 
         # WHEN: We add a custom from a saved service
-        line = convert_file_service_item(TEST_PATH, 'service/serviceitem-song-linked-audio.osj')
+        line = convert_file_service_item(TEST_PATH, 'serviceitem-song-linked-audio.osj')
         service_item.set_from_service(line, '/test/')
 
         # THEN: We should get back a valid service item
diff --git a/tests/resources/migrate_video_20_22.osd b/tests/resources/service/migrate_video_20_22.osd
similarity index 100%
rename from tests/resources/migrate_video_20_22.osd
rename to tests/resources/service/migrate_video_20_22.osd
diff --git a/tests/resources/serviceitem-dvd.osj b/tests/resources/service/serviceitem-dvd.osj
similarity index 100%
rename from tests/resources/serviceitem-dvd.osj
rename to tests/resources/service/serviceitem-dvd.osj
diff --git a/tests/resources/serviceitem_custom_1.osj b/tests/resources/service/serviceitem_custom_1.osj
similarity index 100%
rename from tests/resources/serviceitem_custom_1.osj
rename to tests/resources/service/serviceitem_custom_1.osj
diff --git a/tests/resources/serviceitem_image_1.osj b/tests/resources/service/serviceitem_image_1.osj
similarity index 100%
rename from tests/resources/serviceitem_image_1.osj
rename to tests/resources/service/serviceitem_image_1.osj
diff --git a/tests/resources/serviceitem_image_2.osj b/tests/resources/service/serviceitem_image_2.osj
similarity index 100%
rename from tests/resources/serviceitem_image_2.osj
rename to tests/resources/service/serviceitem_image_2.osj
diff --git a/tests/resources/serviceitem_image_3.osj b/tests/resources/service/serviceitem_image_3.osj
similarity index 100%
rename from tests/resources/serviceitem_image_3.osj
rename to tests/resources/service/serviceitem_image_3.osj
diff --git a/tests/utils/osdinteraction.py b/tests/utils/osdinteraction.py
index 8d12943e8..4b016d1ae 100644
--- a/tests/utils/osdinteraction.py
+++ b/tests/utils/osdinteraction.py
@@ -42,7 +42,7 @@ def read_service_from_file(file_name):
     @param file_name: File name of an OSD file residing in the tests/resources folder.
     @return: The service contained in the file.
     """
-    service_file = os.path.join(TEST_RESOURCES_PATH, file_name)
+    service_file = os.path.join(TEST_RESOURCES_PATH, 'service', file_name)
     with open(service_file, 'r') as open_file:
         service = json.load(open_file)
     return service