Commit Graph

631 Commits

Author SHA1 Message Date
Raoul Snyman 316f33c058 Change the indentation back to 4 2013-10-02 23:37:00 +02: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 3503c54ce4 Some bugs and minor tweaks. 2013-09-29 23:28:53 +02:00
Raoul Snyman 16c5ded747 HEAD 2013-09-29 23:25:42 +02:00
Raoul Snyman c30eedda08 Some more updates to some of the tests. 2013-09-29 23:21:47 +02:00
Tim Bentley c240068a6e head 2013-09-28 21:55:42 +01:00
Tim Bentley 8f47af1732 Head 2013-09-26 22:06:57 +01:00
Philip Ridout e8302e9e95 Added test for bug 1184869 2013-09-24 21:40:51 +01:00
Raoul Snyman 1215494303 Updated more tests 2013-09-22 23:11:03 +02:00
Raoul Snyman 188f312669 Ooops. 2013-09-20 11:35:50 +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
Oliver Wieland f4ab0b23b8 Add a Checkbox at the Bibles settings tab to show or hide the verse numbers
bzr-revno: 2299
2013-09-17 23:06:27 +02:00
Philip Ridout 91bb04f03a Changed to using super() 2013-09-17 21:31:19 +01:00
Philip Ridout 52781b9628 more Py3 fixes 2013-09-15 20:42:29 +01:00
Philip Ridout a06469fea0 head 2013-09-15 19:36:58 +01:00
Philip Ridout ca3e32c294 Fix for py3 2013-09-14 22:43:46 +01:00
Tim Bentley 539ed55777 More cleanups 2013-09-14 22:00:58 +01:00
Tim Bentley b868ecc57d remove reminances of cherrypy 2013-09-14 20:16:14 +01:00
Philip Ridout 78e5ad4af7 HEAD 2013-09-14 00:33:21 +01:00
Jeffrey S. Smith 1ac75c85fd Handle tests with platform-dependent behavior carefully 2013-09-13 14:23:31 -05:00
Jeffrey Smith 2511332a9e Fix strip_rtf to handle CJK encodings
bzr-revno: 2297
2013-09-13 17:13:12 +02:00
Jeffrey Smith 1ef5d00d45 Fix various tests and broken code revealed by tests.
bzr-revno: 2296
2013-09-13 17:11:27 +02:00
Jeffrey S. Smith cb62bf5936 Need a different approach for platform-specific tests 2013-09-11 10:09:36 -05:00
Andreas Preikschat ffe0ccb625 clean up 2013-09-11 17:08:08 +02:00
Oliver Wieland 00cb7b8adf fixes wrong url on the remotes tab
separates determination of the local ip address for easier testing

bzr-revno: 2295
2013-09-11 16:41:59 +02:00
Andreas Preikschat f1009fbc18 blank 2013-09-11 16:23:32 +02:00
Andreas Preikschat 4999ecb6e6 last test 2013-09-11 16:22:28 +02:00
Andreas Preikschat 1ca117532f more tests 2013-09-11 16:02:17 +02:00
Andreas Preikschat f24f3a751f more tests 2013-09-11 15:51:49 +02:00
Andreas Preikschat bf023ee20d more tests 2013-09-11 15:30:23 +02:00
Andreas Preikschat 0677e389c1 doc 2013-09-11 15:00:34 +02:00
Oliver Wieland 1106bca319 added blank line 2013-09-10 20:18:53 +02:00
Jeffrey S. Smith 334cef478d Fix various tests and broken code revealed by tests 2013-09-09 16:10:40 -05:00
Oliver Wieland 7d47010304 cleaning tests 2013-09-08 18:24:21 +02:00
Oliver Wieland 2aeaa24871 remotetab.py: separate get ip address for metter testing
test_remotetab.py:tests for get_ip_address
2013-09-08 18:16:18 +02:00
Andreas Preikschat a5b517fbf0 started to write tests 2013-09-08 12:30:14 +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
Tim Bentley e98657d704 Fix up controller tests 2013-09-02 21:59:19 +01:00
Tim Bentley 8ab834c18e Fix up save and load# 2013-09-01 21:43:22 +01:00
Tim Bentley 6c2c5e8e80 to python 3 2013-09-01 07:31:09 +01:00
Tim Bentley d55ac01a1a Tests and fixed again 2013-09-01 07:22:06 +01:00
Tim Bentley 6282b4fcb6 Tests and fixed 2013-09-01 07:21:29 +01:00
Tim Bentley ede6adeb48 Tests added 2013-09-01 07:16:27 +01:00
Oliver Wieland 99a07ad91e added tests 2013-08-31 22:04:36 +02:00
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Tim Bentley e4ba5cb72a add test files and ui validation sort of works 2013-08-31 18:20:43 +01:00
Andreas Preikschat ccf5d6535b head 2013-08-31 17:23:46 +02:00
Tim Bentley aebe2d80df Remove last traces of pickle and clean up the tests
bzr-revno: 2289
2013-08-31 12:40:59 +01: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
Tim Bentley ba111776ed Remove pickle from the code now 2.0.2 is in 2013-08-25 19:31:15 +01:00
Philip Ridout 49c9663dcf renamed var, removed some uneeded ()'s 2013-08-22 20:20:02 +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 364fde73c5 Fix #120515 by reimplementing QFileDialog.getOpenFileNames 2013-08-13 19:02:04 +01:00
Andreas Preikschat 4cb4a8f261 head 2013-07-31 19:36:06 +02:00
Philip Ridout 47ffa7c9e3 actually add test file 2013-07-23 19:23:45 +01:00
Andreas Preikschat 5c13035172 fixed tests 2013-07-18 20:56:15 +02:00
Andreas Preikschat c4ead1185a head 2013-07-18 08:09:19 +02:00
Andreas Preikschat 53d5cda91a - fixed presentation file mask
bzr-revno: 2279
2013-07-18 08:09:00 +02:00
Raoul Snyman 19c81c4192 Fix up the build_file_mask_string test.
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
    - Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
2013-07-18 06:54:49 +02:00
Andreas Preikschat 11597d7252 missing empty line 2013-07-18 06:53:20 +02:00
Philip Ridout 22a5dfd3d9 Fixes Bug #1114457: Easy Worship importer progress bar is out
Adds a test for the EasyWorship Importer

bzr-revno: 2278
2013-07-17 22:11:05 +01:00
Raoul Snyman cec9689dce Fix up the build_file_mask_string test.
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
- Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
2013-07-17 23:07:52 +02:00
Andreas Preikschat 55fbe75695 'fixed' tests 2013-07-17 16:38:14 +02:00
Andreas Preikschat 161a1db12d fixed test 2013-07-17 16:32:29 +02:00
Andreas Preikschat b129010059 added assertion message 2013-07-17 16:28:22 +02:00
Andreas Preikschat 6e66cdefcf clean ups 2013-07-17 16:19:21 +02:00
Andreas Preikschat 4fee73fc37 added test 2013-07-17 15:59:35 +02:00
Andreas Preikschat 48d2956bdd head 2013-07-17 14:21:44 +02:00
Andreas Preikschat ad715fec29 try to use locale.strxfrm 2013-07-15 20:02:54 +02:00
Tim Bentley 3f1d2c1c21 Fix up tests 2013-07-14 06:56:11 +01:00
Tim Bentley 94e8b90c5d Added first test 2013-07-13 17:33:32 +01:00
Andreas Preikschat 3a021b6804 Head 2013-07-09 21:47:12 +02:00
phill-ridout 9190019ce9 head 2013-07-08 06:39:32 +01:00
Tomas Groth de0f5c912f Use json as services format instead of python pickle.
bzr-revno: 2275
2013-07-07 17:53:16 +02:00
Andreas Preikschat 1ce72c3674 head 2013-07-07 15:45:40 +02: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 dec7cc64b3 head 2013-07-07 00:20:17 +02: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 15153ace9c HEAD 2013-07-06 15:27:11 +01:00
phill-ridout b26793db1f HEAD 2013-07-06 15:23:30 +01:00
phill-ridout d73664e54a Changed TestRecord ot inhearit from object 2013-07-06 15:22:30 +01:00
Tomas Groth 4e1868983e Merged trunk into branch. 2013-07-06 12:27:08 +02:00
Andreas Preikschat f23aafae46 head 2013-07-05 20:47:32 +02:00
Tomas Groth 3218a2e5df Fixed the use of the patch context manager. 2013-07-05 18:21:16 +02:00
Raoul Snyman cee5132b86 Removed a remnant of Tim's test 2013-07-05 09:47:09 +02:00
Raoul Snyman 8ddca0be2b HEAD 2013-07-04 21:15:24 +02:00
Andreas Preikschat b314b59b52 r2266 2013-07-04 08:41:31 +02:00
Andreas Preikschat 15c1c6d907 head + conflicts 2013-07-03 22:20:12 +02:00
Tim Bentley bf61ee3f28 Fix broken tests
bzr-revno: 2266
2013-07-03 20:24:38 +01:00
Andreas Preikschat e75a87c5c9 head 2013-07-03 19:03:08 +02:00
Tim Bentley ab3fd38551 Fix broken test 2013-07-03 17:34:40 +01:00
Tim Bentley 538e885cfb Fix broken test 2013-07-03 17:34:02 +01:00
phill-ridout b344d6b52b changed test path to be "more" compatable with other os's 2013-07-02 22:10:28 +01:00
Raoul Snyman 2e4b400cbc Removed a test that seemed in the wrong place, testing the wrong things, and committed at the wrong time. 2013-07-02 22:39:39 +02:00
Raoul Snyman 88e1932097 HEAD 2013-07-02 22:28:06 +02:00
Raoul Snyman 8492ae6a4c Fix a bug in SQLAlchemy 0.8 2013-07-02 22:27:28 +02:00
Tim Bentley 988fca86a1 Fix up registry for Application exit. Remove FormattingTags pickle , Other minor cleanups
bzr-revno: 2264
2013-06-30 20:18:21 +01:00
Andreas Preikschat e99ba8a400 head 2013-06-30 19:57:21 +02:00
Andreas Preikschat f4b9ffc481 - fixes bug #1170435 (We should not warn when verse order is empty)
bzr-revno: 2260
Fixes: https://launchpad.net/bugs/1170435
2013-06-30 19:42:02 +02: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
Tomas Groth 3faec43220 Small fix in the osd2osj test, use just one context manager, and in a better way. Also added test for service item validation. 2013-06-26 22:15:30 +02:00
Tomas Groth be84d53478 Inserted GIVEN-WHEN-THEN comments 2013-06-24 22:38:40 +02:00
Tim Bentley 32c7663a45 Convert formatting tags to json 2013-06-24 17:21:46 +01:00
Raoul Snyman 9bf7284b94 HEAD 2013-06-23 17:29:16 +02:00
phill-ridout 63b0f54b25 HEAD 2013-06-23 07:14:03 +01:00
Andreas Preikschat 4f8d93638b fixes 2013-06-21 20:13:59 +02:00
Andreas Preikschat 6265ce93de fixed tests 2013-06-21 12:16:50 +02:00
Andreas Preikschat b53ed99eea head 2013-06-21 07:06:16 +02:00
Tomas Groth 25557784c8 Added test cases for new json format in service files. 2013-06-17 21:01:11 +02:00
Tim Bentley ded3671a1b Clean up slide controller and add bible download tests
bzr-revno: 2253
2013-06-16 20:34:19 +01:00
Andreas Preikschat 45313cb450 head 2013-06-16 19:20:51 +02:00
Andreas Preikschat f261a95a37 head 2013-06-16 18:48:37 +02:00
Andreas Preikschat 5cce4c9443 head 2013-06-16 18:40:47 +02:00
Patrick Zimmermann 1aeb9bef2f Duplicate Song finder merge - UI and Services.
bzr-revno: 2252
2013-06-16 15:53:40 +01:00
Tim Bentley bb36a67ac2 Move tests 2013-06-16 14:36:09 +01:00
Tim Bentley 7bf713a830 minor updates 2013-06-16 09:28:38 +01:00
Tim Bentley e8d5ad7736 Clean up slidecontroller 2013-06-16 08:54:16 +01:00
Tim Bentley d253ef5852 Fix bug and add new test or bibles 2013-06-15 21:51:11 +01:00
Patrick Zimmermann d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +02:00
Patrick Zimmermann 4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Andreas Preikschat 67d12883c1 head 2013-06-04 21:36:34 +02:00
Andreas Preikschat 6ddbdc196d fixed spelling 2013-06-01 20:19:53 +02:00
Andreas Preikschat 1290b85abe removed test 2013-06-01 16:49:47 +02:00
Andreas Preikschat 851c667c8d head 2013-06-01 16:48:30 +02:00
Tim Bentley 9f8a0572bc Fix Presentation plugin so it works.
Correct abuse of the service item title field
Add migration code and test to prove it

bzr-revno: 2247
2013-05-25 16:10:09 +01:00
Tim Bentley 6dd070f60e Add migration test 2013-05-25 06:48:08 +01:00
Arjan Schrijver 1a0e583880 Fix bugs in group images
- Fixed traceback on canceling the 'choose group' dialog
- Clear the 'new group' lineedit in the 'choose group' dialog
- Fixed traceback on adding multiple image groups to the service in one go
- Fixed a bug where new image groups added from the 'choose group' popup weren't added to the 'add group' and 'choose group' popup selectboxes
- Cleaned up obsolete line in imagetab
- Added a simple test for onResetClick()
- Added a test for recursively_delete_group()

bzr-revno: 2245
2013-05-23 16:35:56 +01:00
Andreas Preikschat b99d9a7ac9 More Python 3 changes - division fixes
bzr-revno: 2244
2013-05-19 19:13:26 +01:00
Arjan Schrijver 24cefc7249 HEAD 2013-05-19 13:32:31 +02:00
Arjan Schrijver 255ed90d97 Change helper method to private 2013-05-19 13:31:02 +02:00
Tim Bentley 945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
Andreas Preikschat 6e66edce03 removed test 2013-05-18 10:49:21 +02:00
Andreas Preikschat 7a42cd3769 added test 2013-05-18 10:44:03 +02:00
Arjan Schrijver dcd346c8e5 HEAD 2013-05-14 16:57:37 +02:00
Andreas Preikschat d03a9a8eec added comments 2013-05-12 14:04:15 +02:00
Andreas Preikschat 75c8382188 added test 2013-05-12 14:02:48 +02:00
Andreas Preikschat 20c200cf07 added test 2013-05-12 11:38:25 +02:00
Andreas Preikschat 0122ac64f2 fixed test 2013-05-11 19:24:03 +02:00
Andreas Preikschat 32957eca0c removed dead code 2013-05-09 21:38:57 +02:00
Andreas Preikschat 4ee6d014ff release the key 2013-05-08 22:13:33 +02:00
Andreas Preikschat 7e41362ca2 completed test 2013-05-08 22:05:54 +02:00