raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,433 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

485 Commits

Author SHA1 Message Date
Samuel Mehrbrodt 6c40962afb Allow editing of author types and fix bug in servicemanager 
bzr-revno: 2403
 2014-07-14 17:25:59 +01:00
Samuel Mehrbrodt 79c5d61d94 Negative test 2014-07-12 22:00:58 +02:00
Samuel Mehrbrodt 7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt 79009a1a7f Add test 2014-07-09 14:41:55 +02:00
Samuel Mehrbrodt b211ddd99c Merge trunk 2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt 2296be7418 Merge trunk 2014-07-07 18:16:32 +02:00
Samuel Mehrbrodt b7a141f75c Add Presentation Manager import 
Fixes: https://launchpad.net/bugs/957017
 2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt 8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt 686f8d2437 More renaming 2014-07-04 11:31:06 +02:00
Samuel Mehrbrodt 87eb8804de Fixes 2014-07-04 00:06:18 +02:00
Samuel Mehrbrodt 9f34552364 PowerPraise importer 
Fixes: https://launchpad.net/bugs/1336929
 2014-07-03 23:30:41 +02:00
Samuel Mehrbrodt c9b47e8e6f PEP8 2014-07-03 19:57:46 +02:00
Samuel Mehrbrodt 3b7d5f53ba PEP8 2014-07-03 19:57:13 +02:00
Samuel Mehrbrodt d59be6ca82 Move song import plugins to subfolder 2014-07-03 18:54:51 +02:00
Samuel Mehrbrodt 66827a7676 Parse verse order 2014-06-26 09:58:59 +02:00
Samuel Mehrbrodt 93c3a57ea9 Add missing files 2014-06-25 17:04:28 +02:00
Samuel Mehrbrodt c3e9d0c5b3 Add test 2014-06-25 17:03:00 +02:00
Samuel Mehrbrodt d61111ab89 Add proper error messages to EasyWorship import. 
Also make sure that Songs.db (lowercase ending) is also being recognized.

bzr-revno: 2394
Fixes: https://launchpad.net/bugs/1326664
 2014-06-12 20:53:53 +02:00
Samuel Mehrbrodt 543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt b2e4c6f99f Add test for missing songs.mb 2014-06-09 09:55:48 +02:00
Stewart Becker ed295d38dd Fixed a typo: load_Last_file -> load_last_file 
Added tests for OpenSongImport and fixed some PEP8 issues.

bzr-revno: 2387
 2014-06-04 05:54:44 +01:00
Samuel Mehrbrodt 9f5895dd82 Song duplicates added when using different author types for the same author 
bzr-revno: 2386
 2014-06-03 17:20:46 +01:00
Samuel Mehrbrodt 50c2c9bc0e Fix bug 1316979 by changing the 'authors' relation to readonly. 
bzr-revno: 2384
 2014-05-31 07:17:52 +01:00
Samuel Mehrbrodt dd9d535f81 Split test in two methods 2014-05-21 21:55:16 +02:00
Samuel Mehrbrodt d6afa49055 Test fixes 2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt a75790d699 Indentation 2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt 1804b690bd Merge trunk 2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt 35e23456fe merge trunk 2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt 97b603a2d6 Add test for author matching 2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt b7b0176dec Cleanups 2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt a1e2e92132 PEP8 2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt 6eb2d4f49d Write test for adding and removing authors 2014-05-13 11:08:46 +02:00
Samuel Mehrbrodt 9dd9f21135 Add an option to display the songbook in the footer 
bzr-revno: 2381
 2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt 8592551d81 Fix SongShowPlus Import when CCLI number contains text 
bzr-revno: 2380
 2014-05-09 17:10:07 +01:00
Tomas Groth 45344f900d Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting 
bzr-revno: 2379
 2014-05-09 16:51:55 +01:00
Samuel Mehrbrodt 9467b06e14 Merge trunk 2014-05-07 22:31:28 +02:00
Stefan Strasser fb2381f11a fixed bug #1312629 Error on entering invalid character in verse-order 
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
 2014-05-07 22:29:53 +02:00
Samuel Mehrbrodt ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Tomas Groth c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Samuel Mehrbrodt 922bbc3b57 Typo, remove annotations 2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt a98ea19306 Add test for songbook display 2014-05-03 12:42:18 +02:00
Tomas Groth 689700dd01 fixes for tests 2014-05-02 23:48:59 +02:00
Tomas Groth 5d63820b17 Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata. 
Fixes: https://launchpad.net/bugs/1299837
 2014-05-02 23:07:56 +02:00
Samuel Mehrbrodt bdf3109aaa Fix SongShowPlus Import for certain cases 
Fixes: https://launchpad.net/bugs/1310623
 2014-05-01 10:46:45 +02:00
Stewart Becker a56f00ddc0 Merge from parent 2014-04-30 21:40:33 +01:00
Stewart Becker 4022cff5e5 Fix some issues I ran into when importing our OpenSong 'database' 2014-04-30 21:39:40 +01:00
Tomas Groth cc0f0e1eb0 Support for importing ews files (EasyWorship Service files) 
bzr-revno: 2372
 2014-04-29 17:54:14 +01:00
Tomas Groth 48fe8c5e37 Restructured the tests a bit. 2014-04-26 21:47:11 +02:00
Stefan Strasser c2d1589dcb fixed a pep-issue in songs-lib and corrected a comment in a test 2014-04-26 07:07:08 +02:00
Stefan Strasser 1cd7d73d10 fixed bug #1312629 Error on entering invalid character in verse-order 
Fixes: https://launchpad.net/bugs/1312629
 2014-04-25 22:04:43 +02:00
Stewart Becker 04d5a40542 Fix PEP8 issues 2014-04-22 22:48:48 +01:00
Stewart Becker 6d63a008f0 Merged in from trunk 2014-04-22 22:46:21 +01:00
Stewart Becker 57abcf9b40 Remebered to add the tests this time 2014-04-21 18:23:00 +01:00
Samuel Mehrbrodt cc0af8845e PEP8 2014-04-21 12:06:17 +02:00
Samuel Mehrbrodt 031868ae31 trunk 2014-04-21 11:49:17 +02:00
Samuel Mehrbrodt cec163085c Fix bug 1247493: OpenSong Importer fails 
bzr-revno: 2367
Fixes: https://launchpad.net/bugs/1247493
 2014-04-20 21:15:21 +01:00
Tomas Groth 4560d39ad9 head 2014-04-20 20:33:55 +02:00
Samuel Mehrbrodt 4253cd4f52 Fix Songbook search 
bzr-revno: 2366
Fixes: https://launchpad.net/bugs/1306958
 2014-04-20 16:32:28 +02:00
Samuel Mehrbrodt d3443d12c2 Remove one test for now 2014-04-17 16:32:56 +02:00
Samuel Mehrbrodt 5f86811f82 Fix tests 2014-04-16 23:01:57 +02:00
Samuel Mehrbrodt 9010e05430 add new openlyrics file 2014-04-16 22:42:44 +02:00
Samuel Mehrbrodt 2c6da0603b Fix tests 2014-04-16 22:33:06 +02:00
Samuel Mehrbrodt bb1af7ed00 PEP8 2014-04-16 21:56:54 +02:00
Samuel Mehrbrodt aa5a86fba9 Trunk 2014-04-16 21:41:59 +02:00
Samuel Mehrbrodt d65d1c016c Attempt to fix bug #1154467 by waiting 10ms and retrying the commit 
bzr-revno: 2365
 2014-04-16 21:13:40 +02:00
Samuel Mehrbrodt 5929b02586 Test: Songbeamer Authors import 2014-04-16 10:25:17 +02:00
Samuel Mehrbrodt be4a654298 More tests 2014-04-16 00:23:29 +02:00
Stefan Strasser db955cbf96 Some enhancements for songbeamer-import 
bzr-revno: 2358
 2014-04-15 22:52:14 +02:00
Stefan Strasser 5e1a7ce767 replaced all occurrences of the deprecated alias assertEquals() with assertEqual() 2014-04-15 07:28:51 +02:00
Andreas Preikschat 0c2112091d fixed spelling 2014-04-14 21:36:07 +02:00
Stefan Strasser 4a4f8c060b Songbeamer-import-test: replaced usage of assert with the testcase-functions assertTrue, assertEqual, assertIsNone; replaced all occurrences of assertEquals() with assertEqual() (deprecated alias) 2014-04-14 20:33:34 +02:00
Stefan Strasser 0293815135 Songbeamer-import: added check_verse_marks_test to test the correct detection of different lines that may occur 2014-04-13 19:08:38 +02:00
Andreas Preikschat 2c93a5840b head 2014-04-12 18:05:27 +02:00
Samuel Mehrbrodt 93cd8269f8 Test case 2014-04-10 21:50:30 +02:00
Samuel Mehrbrodt 9da5d290cb Typo 2014-04-10 18:18:25 +02:00
Samuel Mehrbrodt 32f6005c98 Test for OpenLyrics Importer 2014-04-10 09:50:30 +02:00
Samuel Mehrbrodt e0c6381762 Fix test 2014-04-08 21:02:13 +02:00
Samuel Mehrbrodt b0d3b54f53 Trunk 2014-04-08 11:17:55 +02:00
Tomas Groth 7dc1b8b759 PEP8 fixes 2014-04-05 09:22:24 +02:00
Tomas Groth 648e0b2290 head 2014-04-05 09:06:30 +02:00
Tomas Groth 232ff2b73f Some cleanup and comments 2014-04-04 22:28:55 +02:00
Tomas Groth 7be9613bf0 Head 2014-04-04 19:57:28 +02:00
Tomas Groth 5c405050f1 Added test for ews import. 2014-04-04 19:57:03 +02:00
Tim Bentley 151f1017c5 finished 2014-04-02 20:35:09 +01:00
Tim Bentley c38c576f94 test fixes 2014-04-02 19:51:21 +01:00
Andreas Preikschat 4da90f0c6a comments: updated comments 2014-03-31 17:36:11 +02:00
Samuel Mehrbrodt c98970d0e4 Fix mediaitem tests 2014-03-30 20:01:03 +02:00
Raoul Snyman e4c3f08a2a Fix some of the tests which were failing in Python 3.4 2014-03-29 15:31:28 +02:00
Andreas Preikschat 11fe2045e5 fixed tests 2014-03-22 10:24:52 +01:00
Tim Bentley 22e9d6d1a9 Head 2014-03-17 07:14:51 +00:00
Tim Bentley 85111766d5 Migrate tests and add copyright 2014-03-14 22:08:44 +00:00
Tim Bentley d2efa83e89 Head 2014-03-14 17:34:36 +00:00
Tomas Groth ed03ec2195 Fixes for tests on wine/windows 2014-03-13 21:59:10 +01:00
Jonathan Springer 6f05711414 Fixes settings initialization in tests to actually use temporary ini file. 2014-03-12 01:31:19 -04:00
Tim Bentley e78dac1edf Head 2014-03-11 20:17:18 +00:00
Raoul Snyman 6747dec2b5 Tests! Tests! Tests! 2014-03-06 23:28:13 +02:00
Tim Bentley 3ae188c287 FoilPresenter 2014-03-06 20:56:31 +00:00
Tim Bentley ef97095399 Importer cleanups 2014-03-06 20:40:08 +00:00
Tim Bentley 75281b5cf1 Song import cleanups 2014-03-05 18:58:22 +00:00
Raoul Snyman b094d48678 Add some error handling around the getting a song. 
Add some more tests.
 2014-03-04 23:28:15 +02:00
Raoul Snyman d2a5e8a4c4 Refactor SongSelect search into a separate class, and start writing some tests for that class. 2014-02-27 23:36:33 +02:00
Tim Bentley e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Philip Ridout 875fa00b03 Adds song test helper and fixes up SongShowPlus 
bzr-revno: 2312
 2013-11-16 19:58:44 +00:00
Samuel Mehrbrodt dd1d08749e Fix SongBeamer Import and add Testcase 
bzr-revno: 2311
 2013-11-14 21:12:52 +02:00
Samuel Mehrbrodt f74697a987 Try to fix encoding... 2013-10-26 19:31:35 +02:00
Samuel Mehrbrodt 636dead5c3 Fix vim header (textwidth=120) 2013-10-26 19:25:07 +02:00
Samuel Mehrbrodt 24dba52640 Fix Import, use system-independent path 2013-10-22 17:09:10 +02:00
s.mehrbrodt@gmail.com02 c5ded493cf Merge from trunk 2013-10-22 10:42:56 +02:00
Tim Bentley 63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Philip Ridout b5831c2f38 Moved song file import helper 2013-10-10 20:58:52 +01:00
s.mehrbrodt@gmail.com02 c471fc79ba Add Songbeamer Import test 2013-10-07 00:07:49 +02:00
Philip Ridout beeea8ab9a changed line spacing arround imports 2013-10-05 10:16:04 +01:00
Philip Ridout b5a2ecfa3f Fixed up imports and added Copyright/License header. 2013-10-05 08:56:08 +01:00
Philip Ridout 3b9df96b42 HEAD 2013-10-05 08:54:14 +01:00
Raoul Snyman 1347ad61d1 Changed the way we create and initialise MediaManagerItems so that we can test things better. 2013-10-02 23:07:20 +02:00
Raoul Snyman 148da97245 Update the tests to use a conditionally imported mock and cleaned things up a little. 2013-09-19 23:02:28 +02:00
Philip Ridout 91bb04f03a Changed to using super() 2013-09-17 21:31:19 +01:00
Philip Ridout ca3e32c294 Fix for py3 2013-09-14 22:43:46 +01:00
Philip Ridout 78e5ad4af7 HEAD 2013-09-14 00:33:21 +01:00
Jeffrey Smith 2511332a9e Fix strip_rtf to handle CJK encodings 
bzr-revno: 2297
 2013-09-13 17:13:12 +02:00
Jeffrey S. Smith 53ac150337 Fix strip_rtf to handle CJK encodings 2013-09-07 22:50:51 -05:00
Jeffrey S. Smith e0592a76e4 Remove worthless print statement in EasyWorhip song import test 2013-09-07 13:36:33 -05:00
Jeffrey S. Smith a23022d84f Fix EasyWorship importer and its tests for py3 2013-09-07 12:33:36 -05:00
Philip Ridout bc30365e0e Missed a py2 file 2013-09-07 17:02:28 +00:00
Philip Ridout dc9d3cd74e changed test_songshowplusimport.py to py3 2013-09-07 16:55:09 +00:00
Philip Ridout 3f4bb93500 HEAD 2013-09-07 16:43:40 +00:00
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Philip Ridout bd6c2bea42 Added a helper class for song importers and modified the shongshowplus test to use it 2013-08-29 21:04:23 +00:00
Raoul Snyman c83dbe7f63 Fix bug #1212801 where the song edit form did not clear a previously set theme. 
Fixes: https://launchpad.net/bugs/1212801
 2013-08-15 21:49:51 +02:00
Philip Ridout 47ffa7c9e3 actually add test file 2013-07-23 19:23:45 +01:00
Andreas Preikschat 53d5cda91a - fixed presentation file mask 
bzr-revno: 2279
 2013-07-18 08:09:00 +02:00
Andreas Preikschat 4fee73fc37 added test 2013-07-17 15:59:35 +02:00
phill-ridout 9190019ce9 head 2013-07-08 06:39:32 +01:00
Philip Ridout 60d3a43c52 Adds a song importer for WorshipCenter Pro. 
Also adds associated tests.

bzr-revno: 2274
 2013-07-07 06:22:32 +01:00
Andreas Preikschat 0b93f752b8 fixed songs test 2013-07-06 22:17:24 +02:00
phill-ridout d1b2cd67c9 Fixed if statment logic. 
Fixed test
 2013-07-06 15:40:49 +01:00
phill-ridout d73664e54a Changed TestRecord ot inhearit from object 2013-07-06 15:22:30 +01:00
phill-ridout b344d6b52b changed test path to be "more" compatable with other os's 2013-07-02 22:10:28 +01:00
phill-ridout e9c56b6cc5 Corrected if statment and added enumeration class. 2013-06-28 22:16:44 +01:00
phill-ridout 95f75fa869 HEAD Resolved confilct 2013-06-27 19:59:52 +01:00
phill-ridout 6fabfef7d8 Made changes as suggested in previous merger comments 2013-06-27 09:36:00 +01:00
phill-ridout 0c8a13a087 HEAD 2013-06-27 09:30:34 +01:00
phill-ridout 63b0f54b25 HEAD 2013-06-23 07:14:03 +01:00
Patrick Zimmermann 4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Tim Bentley 945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
phill-ridout 9550405778 Fixed mock raising errors 2013-04-24 20:30:39 +01:00
phill-ridout 5512435c0c Changed then Givens, Whens and Thens arround 2013-04-24 18:37:15 +01:00
Tim Bentley 0ef65fb8d2 minor fixes 2013-04-23 20:17:25 +01:00
Tim Bentley fba86c5552 Add tests 2013-04-23 20:08:07 +01:00
phill-ridout 774cf24bfd renamed type attribute 2013-04-21 20:15:49 +01:00
phill-ridout 09955c0ca2 Moved constants. 2013-04-17 22:10:19 +01:00
phill-ridout cc1d3b3c5b finished tests 2013-04-16 18:06:42 +01:00
Patrick Zimmermann 0840480ef2 Merge trunk. 2013-04-15 23:56:56 +02:00
phill-ridout 042a3e33f5 some more tests 2013-04-15 21:30:32 +01:00
phill-ridout 6e688961d0 Removed logError from file import test as it was not needed. 
Added check to see that addVerse has been called the correct ammount of times
 2013-04-15 17:35:36 +01:00
phill-ridout 4d20ced421 Added logger class with help from mohij. 2013-04-14 21:10:08 +01:00
phill-ridout f5213d315d Commented out failing test 2013-04-14 20:16:31 +01:00
phill-ridout 5aee3198ae Added WorshipCenter Pro song importer. 
Also added associated tests.
 2013-04-13 23:01:36 +01:00
phill-ridout a307824d85 Moved some directories about. 
Added test files
 2013-04-10 17:24:53 +01:00
Patrick Zimmermann 974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
phill-ridout 8a88cec855 Removed the use of the mock's call helper object 2013-04-05 19:26:39 +01:00
phill-ridout 8864e1e51b Missed a few GIVEN, WHEN, THENS 2013-03-31 11:55:58 +01:00
phill-ridout 7bae770458 Some test had more than one GIVEN, WHEN, THEN. Fixed that 2013-03-31 11:47:31 +01:00
phill-ridout 86f294e870 Changed path in test file 2013-03-28 21:17:07 +00:00
phill-ridout bc032eb7e2 fixed indentation 2013-03-28 19:56:50 +00:00
phill-ridout 4d0f9f3f91 Tided up the test somewhat 2013-03-28 19:50:06 +00:00
phill-ridout 401da98d7c increased line lengths to 120 
renamed SongShowPlusImport vairables and methods to standards
 2013-03-24 14:56:22 +00:00
phill-ridout c3492d6aed Added an extra test song, and cleaned up the test some what 2013-03-24 13:25:31 +00:00
phill-ridout 86fb343759 Added test for SongShowPlus 2013-03-24 11:32:03 +00:00
Patrick Zimmermann 1de79a0ec2 Fix thinko: Three tests always evaluated to true by comparing a list with itself. 2013-02-28 23:46:55 +01:00
Patrick Zimmermann 8de486f869 Simplify (and slightly speed up) song comparison logic by inlining two functions. 2013-02-28 23:20:48 +01:00
Patrick Zimmermann ab565ae3e9 Cosmetic comment fixes in testing functions. 2013-02-28 22:46:36 +01:00
Raoul Snyman 59a694b24c Add another few tests 2013-02-21 10:54:16 +02:00
Patrick Zimmermann 2cf15f3b69 Add a lot more test functions. 2013-02-21 00:29:54 +01:00
Raoul Snyman 9f70bf8e30 Write some more tests, and fix some potential bugs. 2013-02-19 16:07:34 +02:00
Raoul Snyman dc849f3ff2 Add a test. 2013-02-19 14:49:21 +02:00
Patrick Zimmermann 904620998f Remove non-needed test __init__ file. Split up testfunctions. 2013-02-18 22:42:04 +01:00
Patrick Zimmermann 8c8cd3b867 Replace DuplicateSongFinder class with a set of functions. 2013-02-18 21:27:11 +01:00
Patrick Zimmermann 10d9b506a6 Even more variables adapted to PEP8. Sentencify lots of comments. 2013-02-18 19:46:50 +01:00
Patrick Zimmermann 2a16a6ebcb Rename lots of variables and methods. Shorten some too long lines. 2013-02-14 21:57:13 +01:00
Patrick Zimmermann bbd491baa8 Make songsProbablyEqual test more standard like. 2013-02-14 00:15:21 +01:00
Patrick Zimmermann e807c9cb93 Add basic test logic & tune duplicate identification logic a bit. 2013-02-12 21:38:43 +01:00