diff --git a/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py b/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py index 54a0ff02a..ce9fd71b7 100644 --- a/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py +++ b/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py @@ -44,7 +44,5 @@ class TestPresentationManagerFileImport(SongImportTestHelper): """ self.file_import([os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.sng')], self.load_external_result_data(os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.json'))) - self.file_import([os.path.join(TEST_PATH, 'Agnus Dei.sng')], - self.load_external_result_data(os.path.join(TEST_PATH, 'Agnus Dei.json'))) self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.sng')], self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json'))) diff --git a/tests/functional/openlp_plugins/songs/test_propresenterimport.py b/tests/functional/openlp_plugins/songs/test_propresenterimport.py index 1bdb56034..bb6cb2bf9 100644 --- a/tests/functional/openlp_plugins/songs/test_propresenterimport.py +++ b/tests/functional/openlp_plugins/songs/test_propresenterimport.py @@ -45,5 +45,3 @@ class TestProPresenterFileImport(SongImportTestHelper): """ self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.pro4')], self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json'))) - self.file_import([os.path.join(TEST_PATH, 'Vaste Grond.pro4')], - self.load_external_result_data(os.path.join(TEST_PATH, 'Vaste Grond.json'))) diff --git a/tests/functional/openlp_plugins/songs/test_sundayplusimport.py b/tests/functional/openlp_plugins/songs/test_sundayplusimport.py index 3b01e6ec1..2e03d2886 100644 --- a/tests/functional/openlp_plugins/songs/test_sundayplusimport.py +++ b/tests/functional/openlp_plugins/songs/test_sundayplusimport.py @@ -45,7 +45,5 @@ class TestSundayPlusFileImport(SongImportTestHelper): with patch('openlp.plugins.songs.lib.importers.sundayplus.retrieve_windows_encoding') as \ mocked_retrieve_windows_encoding: mocked_retrieve_windows_encoding.return_value = 'cp1252' - self.file_import([os.path.join(TEST_PATH, 'Abba Fader.ptf')], - self.load_external_result_data(os.path.join(TEST_PATH, 'abba-fader.json'))) self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.ptf')], self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json'))) diff --git a/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py b/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py index 6c96382f2..9d824c404 100644 --- a/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py +++ b/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py @@ -49,5 +49,3 @@ class TestWorshipAssistantFileImport(SongImportTestHelper): self.load_external_result_data(os.path.join(TEST_PATH, 'would_you_be_free.json'))) self.file_import(os.path.join(TEST_PATH, 'would_you_be_free2.csv'), self.load_external_result_data(os.path.join(TEST_PATH, 'would_you_be_free.json'))) - self.file_import(os.path.join(TEST_PATH, 'lift_up_your_heads.csv'), - self.load_external_result_data(os.path.join(TEST_PATH, 'lift_up_your_heads.json'))) diff --git a/tests/interfaces/openlp_core_ui/test_projectorsourceform.py b/tests/interfaces/openlp_core_ui/test_projectorsourceform.py index 93aeb4c0a..3405a2346 100644 --- a/tests/interfaces/openlp_core_ui/test_projectorsourceform.py +++ b/tests/interfaces/openlp_core_ui/test_projectorsourceform.py @@ -28,6 +28,7 @@ import logging log = logging.getLogger(__name__) log.debug('test_projectorsourceform loaded') import os +import time from unittest import TestCase from PyQt5.QtWidgets import QDialog diff --git a/tests/resources/presentationmanagersongs/Agnus Dei.json b/tests/resources/presentationmanagersongs/Agnus Dei.json deleted file mode 100644 index 71c916d38..000000000 --- a/tests/resources/presentationmanagersongs/Agnus Dei.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "title": "Agnus Dei", - "verse_order_list": ["v1", "v2"], - "verses": [ - [ - "Alleluia Alleluluia \nfor the Lord almighty reigns \nAlleluia Alleluluia \nHoly holy are you Lord God Almighty \nWorthy is the lamb \nWorthy is the lamb \nHoly holy are you Lord God Almighty", - "v1" - ], - [ - "Worthy is the lamb \nWorthy is the lamb \nYou are holy holy \nAre you lamb \nWorthy is the lamb \nYou are holy holy \nYou are holy holy", - "v2" - ] - ] -} diff --git a/tests/resources/presentationmanagersongs/Agnus Dei.sng b/tests/resources/presentationmanagersongs/Agnus Dei.sng deleted file mode 100644 index ce4385c55..000000000 --- a/tests/resources/presentationmanagersongs/Agnus Dei.sng +++ /dev/null @@ -1,34 +0,0 @@ - - - -Agnus Dei - - - - - - - -Alleluia Alleluluia -for the Lord almighty reigns -Alleluia Alleluluia -Holy holy are you Lord God Almighty -Worthy is the lamb -Worthy is the lamb -Holy holy are you Lord God Almighty - - - - -Worthy is the lamb -Worthy is the lamb -You are holy holy -Are you lamb -Worthy is the lamb -You are holy holy -You are holy holy - - - - - diff --git a/tests/resources/propresentersongs/Vaste Grond.json b/tests/resources/propresentersongs/Vaste Grond.json deleted file mode 100644 index 75ffac7a2..000000000 --- a/tests/resources/propresentersongs/Vaste Grond.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "title": "Vaste Grond", - "verse_order_list": [], - "verses": [ - [ - "God voor U is niets onmogelijk\nHoe ongelofelijk\nU heeft alles in de hand", - "v1" - ], - [ - "U bent God en trekt Uw eigen plan\nU bent voor niemand bang\nVoor niets en niemand bang", - "v2" - ], - [ - "U houd me vast en geeft me moed\nOm door te gaan als ik niet durf\nIk wil van U zijn", - "v3" - ], - [ - "U geeft me kracht, en bent de vaste grond\nwaarop ik stevig sta\nik wil van U zijn, voor altijd van U zijn\nO God.", - "v4" - ], - [ - "Grote God, U bent uitzonderlijk\nen ondoorgrondelijk\nU biedt Uw liefde aan", - "v5" - ], - [ - "Wie ben ik, dat U mij ziet staan\nen met mij om wilt gaan?\nIk kan U niet weerstaan", - "v6" - ], - [ - "Onweerstaanbaar,\nonweerstaanbare God", - "v7" - ] - ] -} diff --git a/tests/resources/propresentersongs/Vaste Grond.pro4 b/tests/resources/propresentersongs/Vaste Grond.pro4 deleted file mode 100644 index 7abfb593d..000000000 --- a/tests/resources/propresentersongs/Vaste Grond.pro4 +++ /dev/null @@ -1 +0,0 @@ -<_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"><_-D-_serializedShadow containerClass="NSMutableDictionary"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"><_-D-_serializedShadow containerClass="NSMutableDictionary"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"><_-D-_serializedShadow containerClass="NSMutableDictionary"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"><_-D-_serializedShadow containerClass="NSMutableDictionary"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"><_-D-_serializedShadow containerClass="NSMutableDictionary"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"><_-D-_serializedShadow containerClass="NSMutableDictionary"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"><_-D-_serializedShadow containerClass="NSMutableDictionary"> \ No newline at end of file diff --git a/tests/resources/sundayplussongs/Abba Fader.ptf b/tests/resources/sundayplussongs/Abba Fader.ptf deleted file mode 100644 index 28dc36cb3..000000000 --- a/tests/resources/sundayplussongs/Abba Fader.ptf +++ /dev/null @@ -1,8 +0,0 @@ -[#PTFVersion: 2, #GLOBAL_RECT: rect(47,2,1026,770), #opacity: 100, #SHADOW_ON: 0, #SHADOW_COLOR: rgb( 0, 0, 0), #SHADOW_OPACITY: 100, #SHADOW_POSITION: "RB", #SHADOW_OFFSET: [0, 0], #FILE_TYPE: "Song", #title: "Abba Fader", #Author: "Okänd", #Copyright: "ccc", #CELL1: [#MARKER_NAME: "Abba Fader", #Hotkey: "1", #rtf: "{\rtf1\ansi\ansicpg1252\deff0\deflang1053{\fonttbl{\f0\froman\fprq2\fcharset0 Verdana;}{\f1\froman\fcharset0 Verdana;}} -{\colortbl ;\red255\green255\blue0;\red224\green223\blue227;} -\viewkind4\uc1\pard\cf1\b\f0\fs86 Abba Fader\par -\par -Vi \^e4r h\^e4r f\^f6r att prisa Dig\line Vi \^e4r h\^e4r med f\^f6rv\^e4ntan\line Vi \^e4r h\^e4r som ett enat folk\line Vi kommer fram till Dig\line Med v\^e5r lovs\^e5ng\line\fs59\line\fs86 Vi ropar Abba Fader\line Du som har all makt\line Vi ropar Abba Fader\line Till Dig st\^e5r allt v\^e5rt hopp\line Vi ropar Abba Fader\line V\^e5r fr\^e4lsare, befriare \^e4r Du\b0\line\pard\tx720\f1\par -\cf2\par -} -", #Align: #Left]] \ No newline at end of file diff --git a/tests/resources/sundayplussongs/abba-fader.json b/tests/resources/sundayplussongs/abba-fader.json deleted file mode 100644 index 7172872e5..000000000 --- a/tests/resources/sundayplussongs/abba-fader.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "authors": [ - ["Okänd"] - ], - "title": "Abba Fader", - "verse_order_list": [], - "verses": [ - [ - "Abba Fader\n\nVi är här för att prisa Dig\nVi är här med förväntan\nVi är här som ett enat folk\nVi kommer fram till Dig\nMed vÃ¥r lovsÃ¥ng\n\nVi ropar Abba Fader\nDu som har all makt\nVi ropar Abba Fader\nTill Dig stÃ¥r allt vÃ¥rt hopp\nVi ropar Abba Fader\nVÃ¥r frälsare, befriare är Du", - "v1" - ] - ] -} diff --git a/tests/resources/worshipassistantsongs/lift_up_your_heads.csv b/tests/resources/worshipassistantsongs/lift_up_your_heads.csv deleted file mode 100644 index 18be3110b..000000000 --- a/tests/resources/worshipassistantsongs/lift_up_your_heads.csv +++ /dev/null @@ -1,40 +0,0 @@ -"SongID","SongNr","Title","Author","Copyright","FirstLine","PriKey","AltKey","Tempo","Focus","Theme","Scripture","Active","Songbook","TimeSig","Introduced","LastUsed","TimesUsed","CCLINr","User1","User2","User3","User4","User5","Roadmap","Overmap","FileLink1","FileLink2","Updated","Lyrics","Info","Lyrics2","Background" -"000013ab-0000-0000-0000-000000000000","0","Lift Up Your Heads"," Bryan Mierau","Public Domain","Lift up your heads and the doors","Em","NULL","NULL","NULL","NULL","NULL","1","1","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2004-04-07 06:36:18.952",".Em D C D - Lift up your heads and the doors of your heart -. Am B7 Em - And the King of glory will come in -(Repeat) - -.G Am D - Who is this King of Glory? -. B7 Em - The Lord strong and mighty! -.G Am D - Who is this King of Glory? -. B7 - The Lord, mighty in battle! - -.G Am D - Who is this King of Glory? -.B7 Em - Jesus our Messiah! -.G Am D - Who is this King of Glory? -.B7 Em - Jesus, Lord of Lords! - -","NULL","Lift up your heads and the doors of your heart -And the King of glory will come in -(Repeat) - -Who is this King of Glory? -The Lord strong and mighty! -Who is this King of Glory? -The Lord, mighty in battle! - -Who is this King of Glory? -Jesus our Messiah! -Who is this King of Glory? -Jesus, Lord of Lords! - -","NULL" diff --git a/tests/resources/worshipassistantsongs/lift_up_your_heads.json b/tests/resources/worshipassistantsongs/lift_up_your_heads.json deleted file mode 100644 index d3ef07f44..000000000 --- a/tests/resources/worshipassistantsongs/lift_up_your_heads.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "authors": [ - "Bryan Mierau" - ], - "title": "Lift Up Your Heads", - "verse_order_list": [], - "verses": [ - [ - "Lift up your heads and the doors of your heart\nAnd the King of glory will come in\n(Repeat)\n\nWho is this King of Glory?\nThe Lord strong and mighty!\nWho is this King of Glory?\nThe Lord, mighty in battle!\n\nWho is this King of Glory?\nJesus our Messiah!\nWho is this King of Glory?\nJesus, Lord of Lords!\n", - "v1" - ] - ] -}