Commit Graph

1434 Commits

Author SHA1 Message Date
Samuel Mehrbrodt
2c6da0603b Fix tests 2014-04-16 22:33:06 +02:00
Jonathan Springer
f7a23737f2 merge trunk 2014-04-16 16:26:24 -04:00
Samuel Mehrbrodt
dd4e2c8d61 More PEP8 2014-04-16 21:59:34 +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
Jonathan Springer
cebec89556 merge trunk 2014-04-16 04:00:19 -04:00
Jonathan Springer
ebc4476fdd Fixes first time wizard to use url and paths in web config file
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt
c20939215a PDF Fixes
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt
49773de4f6 Fix transparent theme on OS X
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
2014-04-16 05:44:21 +01:00
Andreas Preikschat
cb29c78bb0 Print repository name and revision number when using script (especially the revno is interesting for devs)
+Tell jenkins who triggered the build
+Added a blacklist for outdated tokens
+Use colours to indicate success/failure
+fixed job names

bzr-revno: 2361
2014-04-16 05:42:16 +01:00
Samuel Mehrbrodt
be4a654298 More tests 2014-04-16 00:23:29 +02:00
Samuel Mehrbrodt
30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt
cd06c994d8 fixed: replacing background with video unblank screen even if it blanked to theme
bzr-revno: 2360
2014-04-15 23:00:41 +02:00
Jonathan Springer
90ddde07d4 Fix bzr tag test to handle being run from a different directory
bzr-revno: 2359
2014-04-15 22:55:21 +02:00
Samuel Mehrbrodt
5c20fbba22 Trunk 2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt
e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Stefan Strasser
db955cbf96 Some enhancements for songbeamer-import
bzr-revno: 2358
2014-04-15 22:52:14 +02:00
Jonathan Springer
721bcc20e2 Reorder imports 2014-04-15 16:51:55 -04:00
Samuel Mehrbrodt
8c18659adb Update verse order when verse names change (OpenLyrics Import)
bzr-revno: 2357
2014-04-15 22:46:54 +02:00
Andreas Preikschat
dbd6d74c8d removed not wanted code 2014-04-15 22:30:20 +02:00
Andreas Preikschat
5090a014ae use self.assert and friends 2014-04-15 22:27:32 +02:00
Jonathan Springer
87e1c5d986 Add tests for First Time Wizards web config file 2014-04-15 14:44:33 -04:00
Samuel Mehrbrodt
71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt
4b76bfc615 Trunk 2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt
4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt
82dbb7d219 Trunk 2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt
ccc138413e Trunk 2014-04-15 10:15:07 +02:00
Stefan Strasser
5e1a7ce767 replaced all occurrences of the deprecated alias assertEquals() with assertEqual() 2014-04-15 07:28:51 +02:00
Jonathan Springer
6c86c9768d Fix typo 2014-04-14 16:01:13 -04:00
Samuel Mehrbrodt
e7af43af4a Trunk 2014-04-14 21:46:02 +02:00
Jonathan Springer
97ecc3442f Fix bzt tag test to handle being run from a different directory 2014-04-14 15:45:41 -04:00
Samuel Mehrbrodt
e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat
0c2112091d fixed spelling 2014-04-14 21:36:07 +02:00
Andreas Preikschat
8cc3f3b968 head 2014-04-14 21:02:19 +02:00
Andreas Preikschat
2c8d163b09 fixed assertion message 2014-04-14 20:59:28 +02:00
Andreas Preikschat
877fd135d3 head 2014-04-14 20:53:33 +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
ff5279d21c Cleaned up the UI of the tabs on the "Library" toolbox.
Added a test. 
Fixed up PEP8 so that code analysis passes.

bzr-revno: 2354
2014-04-14 19:28:04 +01:00
Jonathan Springer
861f7a8722 Add test to check for proper tags on the current branch.
bzr-revno: 2353
2014-04-14 19:20:48 +01: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
Samuel Mehrbrodt
758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt
e0a85a668b Leading whitespace 2014-04-13 12:45:53 +02:00
Samuel Mehrbrodt
f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Andreas Preikschat
4f38ae2809 head 2014-04-13 09:36:42 +02:00
Dmitriy Marmyshev
3cf9094e5f Added ability to rename items in ServiceManager.
bzr-revno: 2352
2014-04-12 23:26:09 +02:00
b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
672eed037c HEAD 2014-04-12 21:48:15 +02:00
Andreas Preikschat
487f4279dd fixed blank line 2014-04-12 19:11:32 +02:00
Andreas Preikschat
321fed97e9 more output for the jenkins script 2014-04-12 18:52:29 +02:00
Andreas Preikschat
2c93a5840b head 2014-04-12 18:05:27 +02:00
Jonathan Springer
991eb6d004 Fix debug messages (bug #1170231)
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer
4cb71cb5e3 Remove orphaned and unused registry execute, and fix two functions to register to the registry
instead of executing.

Modify loading file from the command line to only load files ending with osz, or oszl.

Fix argument to pass correct type.

bzr-revno: 2350
2014-04-12 16:40:07 +02:00
Andreas Preikschat
d16d8066ad - updated vlc.py
bzr-revno: 2349
2014-04-12 16:37:38 +02:00
Jonathan Springer
307f46921c Merge trunk 2014-04-10 20:29:22 -04: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
Tomas Groth
f16a781309 Changed the clipselector gui a bit. 2014-04-09 22:24:19 +02:00
Samuel Mehrbrodt
ed250c400d Test 2014-04-09 13:10:18 +02:00
Samuel Mehrbrodt
31649b0a8e Better test 2014-04-08 23:20:51 +02:00
Samuel Mehrbrodt
11884adbed Disable two tests for the moment 2014-04-08 23:07:43 +02:00
Samuel Mehrbrodt
bfc086749b Test 2014-04-08 23:03:04 +02:00
Jonathan Springer
25c3503397 Add test to check for proper handling of service files passed in through the command line. 2014-04-08 16:45:40 -04:00
Samuel Mehrbrodt
e0c6381762 Fix test 2014-04-08 21:02:13 +02:00
Samuel Mehrbrodt
5b3a58d1d6 Add newline 2014-04-08 18:40:06 +02:00
Samuel Mehrbrodt
129f726d4c Rename method 2014-04-08 17:23:40 +02:00
Samuel Mehrbrodt
791fdba019 Fix test 2014-04-08 17:15:46 +02:00
Samuel Mehrbrodt
1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt
1759c72f36 Test 2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt
2b8586bf99 Test 2014-04-08 13:19:12 +02:00
Samuel Mehrbrodt
b0d3b54f53 Trunk 2014-04-08 11:17:55 +02:00
Tomas Groth
aefef04d97 Small fixes. Added checks of start/end times. 2014-04-07 23:08:48 +02:00
Jonathan Springer
d3526c6204 Simplify code per Andreas Preikschat's comment. 2014-04-07 13:22:12 -04:00
Samuel Mehrbrodt
d1ab85d2fc Trunk 2014-04-07 15:51:49 +02:00
Jonathan Springer
e19ab7a2c3 Merge trunk 2014-04-06 22:48:24 -04:00
Jonathan Springer
c751a208f9 Change back to using a white list. 2014-04-06 22:47:41 -04:00
Tomas Groth
bc2d45fc30 Head 2014-04-05 15:27:53 +02:00
Tomas Groth
43f18ee2c9 Added some tests. 2014-04-05 09:46:35 +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
8b2c2f9eef fixed a test 2014-04-04 23:12:44 +02:00
5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tomas Groth
232ff2b73f Some cleanup and comments 2014-04-04 22:28:55 +02:00
d1b867988d missed the test somehow 2014-04-04 22:25:49 +02:00
Tim Bentley
8813490bad fix tests 2014-04-04 21:24:11 +01:00
Tim Bentley
edb38d1255 head 2014-04-04 21:22:38 +01:00
Tomas Groth
5304b6b61f Fixed wrong dll load path.
bzr-revno: 2347
2014-04-04 21:22:12 +01: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
Tomas Groth
7ef62293f3 Added test 2014-04-03 22:22:10 +02:00
Tim Bentley
151f1017c5 finished 2014-04-02 20:35:09 +01:00
Tim Bentley
806ce25296 head 2014-04-02 19:51:36 +01:00
Tim Bentley
c38c576f94 test fixes 2014-04-02 19:51:21 +01:00
Andreas Preikschat
2a9c85c2a2 fixed a spelling mistake
bzr-revno: 2346
2014-04-02 19:51:06 +01:00
Samuel Mehrbrodt
eece90b2ec Merge trunk 2014-04-02 09:04:27 +02:00
73941ca56f Renamed a test case and added a test for the trace_error_handler() method. 2014-04-02 01:49:58 +02:00
Andreas Preikschat
5bc5678078 - added a script to trigger jenkins
bzr-revno: 2345
2014-03-31 22:05:42 +02:00
Samuel Mehrbrodt
a7dc47e80f Test 2014-03-31 21:07:54 +02:00
Andreas Preikschat
c451a8eafa added test 2014-03-31 19:01:09 +02:00
Andreas Preikschat
5f0b40fe30 Moved script 2014-03-31 18:27:26 +02:00
Andreas Preikschat
13c053bc5c added jenkins script 2014-03-31 18:08:42 +02:00
Andreas Preikschat
08835e80f8 merged from lp:~googol/openlp/vlc 2014-03-31 18:05:37 +02:00
Andreas Preikschat
729edf1d21 pep8 failure test 2014-03-31 17:44:18 +02:00
Andreas Preikschat
4da90f0c6a comments: updated comments 2014-03-31 17:36:11 +02:00
Andreas Preikschat
3260de7b7c added another test 2014-03-31 17:31:05 +02:00
Andreas Preikschat
9dd5f30254 be a bit more talky 2014-03-31 17:24:31 +02:00
Andreas Preikschat
3f038ad5c5 break 2014-03-31 17:21:41 +02:00
Andreas Preikschat
b391072e9f removed test code 2014-03-31 17:20:17 +02:00
Andreas Preikschat
d77c6fe7c0 added renderer test case 2014-03-31 17:17:40 +02:00
Andreas Preikschat
c64723371a test of ci script 2014-03-31 16:47:43 +02:00
Andreas Preikschat
5a02ab9471 test: splash screen test 2014-03-31 16:07:05 +02:00
Andreas Preikschat
b69f480dc0 head 2014-03-31 14:19:33 +02:00
Tomas Groth
73304d7ec3 Added check to see if given path exists. 2014-03-30 21:32:41 +02:00
Samuel Mehrbrodt
c98970d0e4 Fix mediaitem tests 2014-03-30 20:01:03 +02:00
Tomas Groth
bfbfcd5b15 Head 2014-03-30 13:26:13 +02:00
6ad3fca88e Try to fix bug #1136278 by detecting if the upgrades have already run
bzr-revno: 2343
Fixes: https://launchpad.net/bugs/1136278
2014-03-30 13:02:25 +02:00
3e047b3487 Fixes for inheritance in the song importers. This should make the tests pass in Python 3.4.
bzr-revno: 2342
2014-03-30 07:54:35 +01:00
Samuel Mehrbrodt
0adf961b3c Fix missing arguments in event handlers
bzr-revno: 2341
2014-03-30 07:51:35 +01:00
98a762e86c HEAD 2014-03-29 15:58:09 +02:00
e4c3f08a2a Fix some of the tests which were failing in Python 3.4 2014-03-29 15:31:28 +02:00
Andreas Preikschat
b4bf94a4f0 pep8 2014-03-28 21:41:27 +01:00
Andreas Preikschat
7787e1a845 head 2014-03-28 21:38:38 +01:00
Tomas Groth
19558e7a03 head 2014-03-26 19:39:54 +01:00
Samuel Mehrbrodt
bf32fe164a Test 2014-03-26 13:06:48 +01:00
Tomas Groth
8ad47cb888 Fixes for windows tests and for starting OpenLP on windows. 2014-03-24 17:49:50 +01:00
Samuel Mehrbrodt
78e7cb5873 Test for add_welcome_page 2014-03-24 14:32:28 +01:00
Andreas Preikschat
fcf4d0ce17 missing line at the end 2014-03-23 11:53:11 +01:00
Andreas Preikschat
7a1825a79a tests 2014-03-23 11:49:03 +01:00
Andreas Preikschat
91adff326d head 2014-03-22 20:18:04 +01:00
Andreas Preikschat
11fe2045e5 fixed tests 2014-03-22 10:24:52 +01:00
Tomas Groth
3608ad4fcd Added first tests for mediaclipselectorform.py 2014-03-20 22:52:53 +01:00
Tomas Groth
852ec00fd7 Head 2014-03-20 21:11:18 +01:00
Tomas Groth
734adbbd5a Fix import of MagicMock 2014-03-19 19:33:03 +01:00
Tomas Groth
991661b169 Head 2014-03-19 18:49:46 +01:00
35e3564655 Tests! 2014-03-18 23:03:53 +02:00
Tomas Groth
fa4120a4bd Small test fixes 2014-03-18 21:58:52 +01:00
Tomas Groth
258f1db411 Merged with head. 2014-03-18 20:40:09 +01:00
Tomas Groth
51ea57f35e Added a test for loading serviceitem with optical media item. 2014-03-17 21:59:58 +01:00
Tim Bentley
22e9d6d1a9 Head 2014-03-17 07:14:51 +00:00
Tim Bentley
86bbc0d66c Migrate new tests to mixins 2014-03-15 06:29:41 +00:00
Tim Bentley
9cf3428542 Head 2014-03-15 06:25:35 +00:00
Tim Bentley
85111766d5 Migrate tests and add copyright 2014-03-14 22:08:44 +00:00
Tim Bentley
1fa0d58f85 Tests 2014-03-14 20:06:24 +00:00
Tim Bentley
9dd4669f13 test fixes 2014-03-14 17:38:57 +00:00
Tim Bentley
4e834f6d70 Head 2014-03-14 17:37:28 +00:00
Tim Bentley
c2a429c52d Space 2014-03-14 17:35:00 +00:00
Tim Bentley
d2efa83e89 Head 2014-03-14 17:34:36 +00:00
Jonathan Springer
2b55c1ceb5 Change test to use a black list instead of a white list. 2014-03-13 17:36:01 -04:00
Tomas Groth
df69ff37aa minor cleanup 2014-03-13 22:16:38 +01:00
Tomas Groth
ed03ec2195 Fixes for tests on wine/windows 2014-03-13 21:59:10 +01:00
Tim Bentley
17f33712db minor fixes 2014-03-13 20:37:02 +00:00
Tim Bentley
9051692dba Mixin for tests 2014-03-13 20:34:46 +00:00
Jonathan Springer
84b621301b Add test to check for the proper tags on the branch 2014-03-13 00:50:45 -04:00
Jonathan Springer
af5e751d27 Merge trunk 2014-03-12 18:15:08 -04:00
Tomas Groth
ecc1ffbd4c Fix tests.
To avoid segfaults reuse QApplication instance.
Also use ICU when getting locale sort key.

bzr-revno: 2331
2014-03-13 00:07:23 +02:00
Jonathan Springer
92e9ef9394 Missed one 2014-03-12 15:05:06 -04: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
Tim Bentley
ff44daa258 Yet more tests - with file 2014-03-11 20:11:04 +00:00
Tim Bentley
6935adde29 Yet more tests 2014-03-11 20:10:46 +00:00
Tim Bentley
a74567b9f6 Bible database tests 2014-03-11 19:01:09 +00:00
Tomas Groth
2b55da02c1 Reuse QApplication instance to avoid segfaults. 2014-03-10 20:56:36 +01:00
Tim Bentley
0da1b7b5f7 Presentations 2014-03-08 21:23:47 +00:00
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
c607661aee HEAD 2014-03-04 23:51:54 +02:00
b094d48678 Add some error handling around the getting a song.
Add some more tests.
2014-03-04 23:28:15 +02:00
Tim Bentley
1301b4cfa3 Fix up presentation tests 2014-03-04 20:18:14 +00:00
831f2f3b69 HEAD 2014-02-27 23:39:44 +02:00
d2a5e8a4c4 Refactor SongSelect search into a separate class, and start writing some tests for that class. 2014-02-27 23:36:33 +02:00
Tomas Groth
52a73f3475 merged with head 2014-02-25 21:11:48 +01:00
Tim Bentley
3d556a9790 Head 2014-02-23 15:02:53 +00:00
Tomas Groth
e90f277bd6 merged with trunk 2014-02-21 22:48:25 +01:00
Philip Ridout
b718b76c8c HEAD 2014-02-11 21:07:06 +00:00
Philip Ridout
150ff4e980 HEAD 2014-02-11 20:29:57 +00:00
Tim Bentley
5d740a7706 Removep
bzr commit -mRemovep
2014-01-11 22:05:38 +00:00
Tim Bentley
9fc4f0c339 Add Main display tests 2014-01-11 19:46:31 +00:00
Tim Bentley
75b27422ad Add renderer tests 2014-01-11 19:31:06 +00:00
Felipe Polo-Wood
b58abe45b2 Added WebSocket engine 2014-01-09 14:53:56 -05:00
Felipe Polo-Wood
d2782e099f Merged with Tim's refactoring changes 2014-01-09 14:52:20 -05:00
Tim Bentley
5b6663b578 basic tests 2014-01-04 17:19:30 +00:00
Tim Bentley
0da7475748 Fix up comments 2014-01-04 12:06:48 +00:00
Tim Bentley
5eba575618 Add tests for new function 2014-01-04 11:50:27 +00:00
Tim Bentley
4c7fa599c6 Add app to test 2014-01-04 08:28:45 +00:00
Tim Bentley
06e68627d7 Head 2014-01-04 07:54:50 +00:00
Tim Bentley
d6aa4e2299 Fix message text 2014-01-03 21:33:40 +00:00
Tim Bentley
8518207417 Fix up test failures 2014-01-01 14:59:57 +00:00
Tim Bentley
259b2b074f Fix widget 2013-12-31 21:02:35 +00:00
Tim Bentley
51178b2ede Fix tests 2013-12-31 20:29:03 +00:00
Tomas Groth
f5ace2c238 merged with trunk 2013-12-31 12:20:11 +00:00
Tomas Groth
3cc69cc9fd Changed the way a serviceitem from the servicemanager is copied and converted. Also fixed for PEP8. 2013-12-31 12:15:18 +00:00
Tim Bentley
e49beeb2c4 More tests 2013-12-31 07:27:07 +00:00
Tim Bentley
c8a3b33044 Start to fix ServiceManager and extent tests 2013-12-30 19:50:34 +00:00
Felipe Polo-Wood
b495c47a5a More styling issues 2013-12-30 13:19:50 -05:00
Felipe Polo-Wood
1a83a0a557 Merge head 2013-12-30 03:53:51 -05:00
Felipe Polo-Wood
b993b0d4a8 Style changes 2013-12-30 03:35:05 -05:00
Tomas Groth
84334a039e Merged with trunk. 2013-12-29 19:47:54 +00:00
Tomas Groth
7dd3417217 Added tests for the PdfController. 2013-12-29 19:46:04 +00:00
Tim Bentley
e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Felipe Polo-Wood
08682a3bd2 formatting issues 2013-12-28 15:03:45 -05:00
Felipe Polo-Wood
1ef910463c Merge head 2013-12-28 12:06:29 -05:00
Tim Bentley
35c5577cb7 More fixes 2013-12-26 08:56:53 +00:00
Tim Bentley
508d050b4c Head 2013-12-24 11:32:56 +00:00
Tim Bentley
6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
3204a4db72 - Specify OpenLP as the user agent when querying SF.net
- Fix another test
- Update tests for get_web_page
2013-12-20 21:25:42 +02:00
553c93e790 Tidy up some tests 2013-12-18 23:54:56 +02:00
06d08f61a6 Fix bug #1211049: Add a list of valid user agents and a method to return an appropriate user agent for the current platform
Fixes: https://launchpad.net/bugs/1211049
2013-12-18 23:44:00 +02:00
Tim Bentley
d684359e59 Clean up exceptions used in error 2013-12-13 19:44:17 +00:00
Tim Bentley
84e90e01d1 new files 2013-12-13 18:42:26 +00:00
Tim Bentley
cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Samuel Mehrbrodt
7e484086dc Merge trunk 2013-12-07 18:35:06 +01:00
Tim Bentley
440cefa5f6 formatting 2013-12-06 19:09:29 +00:00
Tim Bentley
9fd590bb70 clean up tests 2013-12-06 19:07:02 +00:00
Tim Bentley
d0a9423982 Head 2013-12-06 19:00:55 +00:00
Tim Bentley
f32409b5a5 format changes 2013-12-06 19:00:37 +00:00
Philip Ridout
0883eb8a5d Fixes #1184869 Ensures that there is text in the anchor tag
bzr-revno: 2315
2013-12-06 18:57:21 +00:00
Philip Ridout
ec87ced59b Fixes Bug 1209515 by sub classing QFileDialog and reimplementing getOpenFileNames and attempting to urlunquote and file paths which do not exist
bzr-revno: 2314
2013-12-06 18:56:03 +00:00
Felipe Polo-Wood
b85b09c92c Merge back to trunk 2013-12-02 11:14:09 -05:00
Felipe Polo-Wood
e9848a2653 Fix the Http router return values
bzr-revno: 2313
2013-12-01 20:58:09 +00:00
Felipe Polo-Wood
04abbd97d0 implemented caching thru the ImageManager
Styling issues
Merge with fix-router changes
2013-11-22 13:21:07 -05:00
Philip Ridout
f5573502f3 HEAD 2013-11-16 21:24:18 +00:00
Philip Ridout
81c2f1a4b3 updated tests 2013-11-16 21:04:16 +00:00
Philip Ridout
c41842125d HEAD 2013-11-16 20:32:50 +00:00
Philip Ridout
875fa00b03 Adds song test helper and fixes up SongShowPlus
bzr-revno: 2312
2013-11-16 19:58:44 +00:00
Philip Ridout
96e1bb15fc Fix doc strings 2013-11-16 10:54:24 +00:00
Philip Ridout
20ae5d13b0 some final cleanups 2013-11-16 10:16:06 +00:00
Philip Ridout
4c8f817269 HEAD 2013-11-16 10:07:38 +00:00
Philip Ridout
cc3cdf7126 added some tests for PresentationController 2013-11-16 10:05:41 +00:00
Felipe Polo-Wood
e56414e22c Fixed OS specific string
Coding standard fixes
2013-11-14 15:33:46 -05:00
Samuel Mehrbrodt
dd1d08749e Fix SongBeamer Import and add Testcase
bzr-revno: 2311
2013-11-14 21:12:52 +02:00
Andreas Preikschat
1b89900336 head 2013-11-14 10:05:59 +01:00
Felipe Polo-Wood
649494589a Added unit tests for serve_file 2013-11-10 19:55:06 -05:00
Felipe Polo-Wood
20a1a2ad70 Fixed router so response and headers are sent correctly
Fixed tests so they run on Windows
Added unit test for new method get_content_type
2013-11-08 13:26:27 -05:00
Felipe Polo-Wood
768b1c77fc Code was not sending the headers back 2013-11-08 12:43:36 -05:00
Philip Ridout
47292d3ec7 Changed test path 2013-11-07 20:42:21 +00:00
Philip Ridout
2535bda1bb Added tests for load presentation 2013-11-07 20:33:55 +00:00
Felipe Polo-Wood
6c3253c7c0 Added caching for thumbnail images 2013-11-07 15:13:15 -05:00
Felipe Polo-Wood
946f5673ac Fixed two wrong line indentations 2013-11-01 12:07:44 -04:00
Felipe Polo-Wood
1759468ea5 - Undid superfluous line formatting 2013-11-01 11:03:43 -04:00
Felipe Polo-Wood
6d464dec4b Added resizing capabilities to the thumbnails
Fixed a problem with setting the presentation slides from the remote
2013-10-29 11:38:28 -04:00
Felipe Polo-Wood
9a07d6887b style fixes 2013-10-28 11:16:22 -04:00
Felipe Polo-Wood
1aae38cb8e Merging 2013-10-27 23:40:38 -04:00
Felipe Polo-Wood
b9850e6e68 bunch of cosmetic changes 2013-10-27 22:33:28 -04:00
Samuel Mehrbrodt
0ed0b2148e Small changes to the test 2013-10-27 21:33:58 +01:00
Samuel Mehrbrodt
abdc3937ef Small test for PresentationController Constructor 2013-10-27 13:39:13 +01:00
Dmitriy Marmyshev
70144c0da4 Trunk & fixes 2013-10-27 02:53:32 +04:00
Andreas Preikschat
6a839dc32a no need for MagicMock (inside another MagicMock)
bzr-revno: 2308
2013-10-26 21:03:57 +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
Felipe Polo-Wood
fa32ce43d7 Implemented tests for service_item and router 2013-10-25 13:58:55 -04:00
Felipe Polo-Wood
30278b1a56 Fixed compatibility with Ubuntu on the unit tests. 2013-10-24 22:33:54 -04:00
Felipe Polo-Wood
5644e26a85 Improved unit tests 2013-10-24 21:15:44 -04:00
Dmitriy Marmyshev
aed25c0f0b fixes 2013-10-25 00:24:58 +04:00
Dmitriy Marmyshev
77f1878ff5 Tests for transparency 2013-10-24 22:12:41 +04:00
Tim Bentley
63d65da6c1 Head 2013-10-23 20:26:03 +01:00
Tim Bentley
b1873016c9 Move and tests 2013-10-23 20:25:46 +01:00
Tim Bentley
1022661160 Theme cleanup start and major class restructure
bzr-revno: 2307
2013-10-23 19:49:39 +01:00
Felipe Polo-Wood
8072188cdf Added tests for __get_text_from_page 2013-10-22 23:12:45 -04:00
Felipe Polo-Wood
28345808da Added unit tests for the two new methods get_titles_and_notes and save_titles_and_notes 2013-10-22 14:24:56 -04: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
Andreas Preikschat
ea8497d559 no need for MagicMock 2013-10-21 09:38:18 +02:00
Felipe Polo-Wood
77f488e509 Removed old comments 2013-10-20 00:12:12 -04:00
Felipe Polo-Wood
d4d572bf80 Fixed and verified test on Ubuntu/Impress 2013-10-19 23:25:07 -04:00
Felipe Polo-Wood
f2a2468e01 Added tests for loading titles and notes on three presentation controllers 2013-10-19 19:18:31 -04:00
Tim Bentley
28a94a06fb Duplicate line 2013-10-18 19:11:17 +01:00
Tim Bentley
ba0808f551 Fix up json 2013-10-18 19:10:47 +01:00
Philip Ridout
a8e1d5005c made get_data private 2013-10-14 23:05:17 +01:00
Tim Bentley
4f3291b2ee Fixes to tests 2013-10-14 06:01:01 +01:00
Tim Bentley
b794623e7f Head 2013-10-14 05:55:20 +01:00
Tim Bentley
63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley
a82c64237c Fix move of check_directory_exists 2013-10-13 18:23:52 +01:00
Tim Bentley
a013d17bdd fix tests and add basic test 2013-10-13 18:02:12 +01:00
Tim Bentley
b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley
257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Dmitriy Marmyshev
3c246f2d2e some start 2013-10-11 19:48:14 +04:00
Andreas Preikschat
29bdf095d3 removed import 2013-10-11 12:15:09 +02:00
Andreas Preikschat
2b3825eaf0 missing imports 2013-10-11 12:13:04 +02:00
Andreas Preikschat
f0be2ecc17 head + conflict 2013-10-11 11:48:35 +02:00
Philip Ridout
24f80e10ab HEAD 2013-10-10 21:47:40 +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
47e4eacca8 HEAD 2013-10-05 20:06:23 +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
Jeffrey Smith
474f551839 Clean up language tests
bzr-revno: 2303
2013-10-05 06:24:05 +01:00
5481a4718d HEAD, and futher fixing of mock imports 2013-10-04 23:45:38 +02:00
Jeffrey S. Smith
cf9ddadf35 Missed removing one line when merging 2013-10-04 16:44:58 -05:00
Jeffrey S. Smith
ba6ff95539 Merged mock changes 2013-10-04 16:14:04 -05:00
Tim Bentley
40350aec0f tests updates 2013-10-04 21:36:02 +01:00
Tim Bentley
bd7d412cc9 Head 2013-10-04 20:28:09 +01:00
Tim Bentley
2fe31991e2 Fixes 2013-10-04 20:27:53 +01:00
3994669c1b Modified the check_dependencies.py script to only require mock if we're using Python 3.2 and earlier. 2013-10-03 21:56:12 +02:00
316f33c058 Change the indentation back to 4 2013-10-02 23:37:00 +02:00
1347ad61d1 Changed the way we create and initialise MediaManagerItems so that we can test things better. 2013-10-02 23:07:20 +02:00
3503c54ce4 Some bugs and minor tweaks. 2013-09-29 23:28:53 +02:00
16c5ded747 HEAD 2013-09-29 23:25:42 +02:00
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
1215494303 Updated more tests 2013-09-22 23:11:03 +02:00
Raoul Snyman
188f312669 Ooops. 2013-09-20 11:35:50 +02:00
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
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
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
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
ec2f013d1d r2265 2013-07-03 19:20:53 +02: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
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
88e1932097 HEAD 2013-07-02 22:28:06 +02:00
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
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
Andreas Preikschat
9a068f5144 started with test 2013-05-06 09:43:19 +02:00
Andreas Preikschat
6bff80ca05 head 2013-05-02 09:21:17 +02:00
Patrick Zimmermann
0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
Patrick Zimmermann
4c2f078bf1 Add a missing \n at EOF. Add a comment. 2013-04-27 22:59:56 +02:00
Patrick Zimmermann
c0d722e63a Name listpreviewwidget test class correctly. 2013-04-27 12:06:08 +02:00
Patrick Zimmermann
46882beefe Add tests for the listpreviewwidget. 2013-04-27 12:00:46 +02:00
Patrick Zimmermann
84e9f6f1b1 Add test utils and move a function to there. 2013-04-27 11:54:57 +02: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
Andreas Preikschat
6d414c0fdb r2240 2013-04-23 23:48:51 +02:00
Tim Bentley
0ef65fb8d2 minor fixes 2013-04-23 20:17:25 +01:00
Tim Bentley
11112e7712 Head 2013-04-23 20:08:50 +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
Andreas Preikschat
3f60c34440 head 2013-04-20 22:30:51 +02:00
Andreas Preikschat
3dd05a2f4d head 2013-04-20 22:25:06 +02:00
Andreas Preikschat
ab9e0d7ba2 - removed General section and introduced a Core section
- added test

bzr-revno: 2234
Fixes: https://launchpad.net/bugs/1133237
2013-04-20 22:19:53 +02:00
Andreas Preikschat
5f9d921808 - camelCase -> words_with_underscore
- fixed short lines
- fixed docs

bzr-revno: 2233
2013-04-20 22:18:26 +02:00
Andreas Preikschat
35bc76943f - close file
bzr-revno: 2232
2013-04-20 22:18:02 +02:00
Andreas Preikschat
401d4d2688 close file 2013-04-20 20:39:10 +02:00
Andreas Preikschat
17e2277d9c r2231 2013-04-20 20:38:19 +02:00
Andreas Preikschat
186ca920da fixed test 2013-04-20 20:05:01 +02:00
Andreas Preikschat
a393302a07 fixed test 2013-04-20 19:53:17 +02:00
Andreas Preikschat
58b21030e0 r2231 2013-04-20 13:38:27 +02:00
Andreas Preikschat
582f1aa003 code standards 2013-04-19 21:07:25 +02:00
Andreas Preikschat
c0d67ab45f fixed method name 2013-04-18 20:28:11 +02:00
Andreas Preikschat
31aaafa254 clean ups 2013-04-18 20:27:54 +02:00
Andreas Preikschat
e7f553afb1 added test 2013-04-18 20:27:22 +02:00
Patrick Zimmermann
9e53873a66 Merge trunk. 2013-04-18 20:22:53 +02:00
Arjan Schrijver
9752716672 HEAD 2013-04-18 15:57:31 +02:00
phill-ridout
09955c0ca2 Moved constants. 2013-04-17 22:10:19 +01:00
Andreas Preikschat
0fb24d2233 added tests 2013-04-17 20:33:44 +02:00
phill-ridout
cc1d3b3c5b finished tests 2013-04-16 18:06:42 +01:00
Tim Bentley
a0f4db607e Head and fix 2013-04-16 17:37:26 +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
Andreas Preikschat
908e048d1a head 2013-04-15 17:43:18 +02:00
phill-ridout
4d20ced421 Added logger class with help from mohij. 2013-04-14 21:10:08 +01:00
Andreas Preikschat
4bb4cd080a r2230 2013-04-14 21:51:35 +02:00
phill-ridout
f5213d315d Commented out failing test 2013-04-14 20:16:31 +01:00
Meinert Jordan
571934e166 Fix Natural Sorting so works with Python3
bzr-revno: 2230
2013-04-14 19:19:33 +01:00
Tim Bentley
220681c900 Comment fixes 2013-04-14 16:59:57 +01:00
Tim Bentley
797a76f095 Head 2013-04-14 16:45:34 +01:00
Philip Ridout
38a95ffab8 Fixed importing of songs with verses numbered 1A, or 1.5 etc. in SongShowPlus importer
bzr-revno: 2229
Fixes: https://launchpad.net/bugs/1125956
2013-04-14 17:30:06 +02: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
e6a1d93121 Add tests around some of the functions in the db module
- Fix some import ordering
- Add tests for init_db and get_upgrade_op
- Add an extra line for PEP8 compliance
2013-04-08 23:08:28 +02:00
Andreas Preikschat
d504b314ef removed not needed mocks and calls 2013-04-08 20:30:11 +02:00
Andreas Preikschat
352d8da185 head 2013-04-08 20:24:46 +02:00
Tim Bentley
31b4e561b4 Fix up code review change 2013-04-08 17:53:11 +01:00
M2j
c82d7f0e50 renameing openlp.core.utils.get_local_key in tests 2013-04-06 20:21:23 +02:00
M2j
6d5590d739 removed tests/interfaces/openlp_plugins/__init__.pyc 2013-04-06 19:17:59 +02:00
phill-ridout
047f567ed8 added some tests 2013-04-06 11:54:36 +01:00
Patrick Zimmermann
974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
Tim Bentley
e36706e3ec Head 2013-04-05 20:37:56 +01:00
Tim Bentley
fc80e3d106 Cleanups and more tests 2013-04-05 20:37:15 +01:00
phill-ridout
8a88cec855 Removed the use of the mock's call helper object 2013-04-05 19:26:39 +01:00
M2j
042bf4ed2d rename openlp.core.utils.get_local_key to openlp.core.utils.get_locale_key 2013-04-05 19:41:01 +02:00
Andreas Preikschat
d0cbe5a56a r2227 2013-04-05 11:05:39 +02:00
Andreas Preikschat
131b46edef - use QActionGroup instead of Checkboxes (Bug #1103906 'Auto Play Slides menu should use radioboxes')
bzr-revno: 2227
Fixes: https://launchpad.net/bugs/1103906
2013-04-05 11:04:38 +02:00
Andreas Preikschat
72ba94d390 replaced cPickle by pickle 2013-04-03 16:53:30 +02:00
Andreas Preikschat
03eaa91a08 fixed assertion message and method doc string 2013-04-02 23:03:07 +02:00
M2j
9612a52211 typo 2013-04-02 19:54:23 +02:00
M2j
316902fb88 Add unit tests for get_local_key and get_natural_key. 2013-04-02 19:51:19 +02:00
Andreas Preikschat
0d621f8699 changed assertion message 2013-04-02 17:14:27 +02:00
Andreas Preikschat
5e3563ceda added two tests 2013-04-02 17:08:46 +02:00
Andreas Preikschat
727f328383 r2225 2013-04-02 09:26:46 +02:00
Andreas Preikschat
ceb175e372 head 2013-03-31 19:21:12 +02:00
Andreas Preikschat
a0eed25c64 remove pyc 2013-03-31 19:20:53 +02: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
Andreas Preikschat
a0bdbd55be removed obsolete line 2013-03-30 16:39:20 +01:00
Andreas Preikschat
a9cb8b07a7 fixed assertion test 2013-03-30 15:47:38 +01:00
Andreas Preikschat
906c090e8d added test 2013-03-30 15:45:02 +01:00
Andreas Preikschat
c732a70fb2 removed extra line 2013-03-30 10:50:04 +01:00
Andreas Preikschat
85f64ddae6 fixed test order 2013-03-30 10:46:32 +01:00
Andreas Preikschat
c4448a402b added test 2013-03-30 10:01:21 +01:00
Andreas Preikschat
f715810ce9 added test 2013-03-30 09:46:34 +01:00
Andreas Preikschat
fd3cad1c7c r2223 2013-03-30 09:40:49 +01:00
Tim Bentley
25d74260ce Add tests for the server 2013-03-30 06:56:28 +00:00
phill-ridout
68f26d1151 HEAD 2013-03-29 21:39:37 +00:00
phill-ridout
dcf2cae3a1 minor changes 2013-03-29 21:27:43 +00:00
phill-ridout
03db7ff2a3 Started EasyWorship import test 2013-03-29 21:13:55 +00:00
Tim Bentley
efa7d8c8c0 minor fixes and move certificate location 2013-03-29 20:58:06 +00:00
Arjan Schrijver
e8dbbdfc89 Added a test for recursively_delete_group() 2013-03-29 15:15:16 +01:00
Andreas Preikschat
a69323ea89 fixed auto preview of next service item 2013-03-29 13:40:04 +01:00
Arjan Schrijver
1beb9b06d3 HEAD 2013-03-29 13:02:35 +01:00
Arjan Schrijver
28f8e31bf0 Added a simple test for onResetClick() 2013-03-29 13:00:06 +01:00
Tim Bentley
6cd384e028 Fix up tests 2013-03-29 09:32:46 +00:00
Tim Bentley
ced77e4ec3 Add some proper tests 2013-03-29 09:06:43 +00:00
Tim Bentley
31847abf2a Head and confilicts 2013-03-29 08:25:33 +00:00
Andreas Preikschat
48ffb04f5d moved tests 2013-03-29 07:25:01 +01:00
Andreas Preikschat
ffd409d24e wording 2013-03-28 23:12:09 +01:00
Andreas Preikschat
219ab48277 enabled test again 2013-03-28 23:10:24 +01:00
Andreas Preikschat
94b926d273 added test 2013-03-28 23:08:14 +01:00
Andreas Preikschat
818fa36734 fixed comment 2013-03-28 22:24:19 +01:00
phill-ridout
86f294e870 Changed path in test file 2013-03-28 21:17:07 +00:00
phill-ridout
2920eecd31 Moved sample song files to their own directory 2013-03-28 21:09:38 +00:00
Andreas Preikschat
06cf4e1cd6 fixed spelling 2013-03-28 21:23:53 +01:00
Andreas Preikschat
30a7034ac9 fixed regression + added test for it 2013-03-28 21:03:58 +01: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
Tim Bentley
ab011a22c1 last version before big refactor 2013-03-28 14:45:47 +00:00
Andreas Preikschat
e708140d13 head 2013-03-26 12:35:29 +01:00
Andreas Preikschat
2f6a1a37a2 r2218 2013-03-26 12:15:55 +01:00
Tim Bentley
401f5ac2be More updates 2013-03-26 08:55:05 +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
Tim Bentley
bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
phill-ridout
53889be2e5 HEAD 2013-03-21 19:05:40 +00:00
Tim Bentley
f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Tim Bentley
611dbdf044 Head 2013-03-19 17:53:51 +00:00
Tim Bentley
861e64ee83 plugin 1 2013-03-19 17:53:32 +00:00
Arjan Schrijver
ce528140ae This branch implements the 'images groups' feature. It has the following features:
- convert old 'images files' setting to SQLite database
- existing images are loaded as top-level items to minimize the change for users
- groups can be nested
- images can be moved between groups by drag&drop
- new images can be added directly to a group by drag&drop, or by clicking the 'Add images' button
- image groups can be used as service items with multiple images

bzr-revno: 2214
2013-03-19 09:38:01 +02:00
Arjan Schrijver
57651493ff - Removed wrong len() use
- Replaced wrong 'is' use with '=='
- Added tests for ImageMediaItem.save_new_images_list()
2013-03-18 23:04:09 +01:00
Arjan Schrijver
24a51c0eec Add tests for hook_upgrade_plugin_settings 2013-03-18 15:35:19 +01:00
Raoul Snyman
697639db41 Fixed up an issue with some tests that arose in the merge from HEAD 2013-03-18 13:58:52 +02:00
Raoul Snyman
e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Raoul Snyman
a3f1769818 HEAD 2013-03-18 12:16:50 +02:00
Tim Bentley
8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley
fdf705f94d change the tests 2013-03-17 20:20:43 +00:00
Tim Bentley
9f8b236f90 With tests 2013-03-17 17:37:19 +00:00
1a37d306a9 More cleanups 2013-03-15 00:22:18 +02:00
Raoul Snyman
55ea69295a Merge from upstream 2013-03-14 15:59:48 +02:00
Tim Bentley
3c32bc7501 Added tests 2013-03-13 19:51:56 +00:00
Tim Bentley
669da85b2b Config cleanup and bug fixes from previous cleanups
bzr-revno: 2209
2013-03-13 19:08:44 +00:00
Raoul Snyman
cee8d228f2 HEAD 2013-03-13 09:08:58 +02:00
Raoul Snyman
470e48c65a Some more cleanups and an empty test. 2013-03-13 09:08:41 +02:00
Tim Bentley
c2692b76ea fix field names 2013-03-12 09:37:27 +00:00
Tim Bentley
7efe1320fb Fix theme handling 2013-03-12 09:09:42 +00:00
Andreas Preikschat
48e8838289 added image_manager get_image_bytes() test 2013-03-12 09:19:47 +01:00
Tim Bentley
762a99dd66 review corrections 2013-03-12 07:39:19 +00:00
Tim Bentley
dcec6ebbac review corrections 2013-03-12 07:17:14 +00:00
4ec065e804 Added another test or two. 2013-03-11 23:47:55 +02:00
04acacddd6 Added another test. 2013-03-11 23:24:55 +02:00
cdbd34460a Fix an import issue after the last cleanup.
- Fix an issue with an import that changed in the last cleanup effort (as a side note, the plugins manager test is a good one to use to check for import regressions).
- Clean up some test comments.
2013-03-11 23:10:29 +02:00
Raoul Snyman
9383f2a4af HEAD 2013-03-11 15:55:06 +02:00
Raoul Snyman
837118bf07 Cleanup EditVerseForm and friends, and expand the test. 2013-03-11 10:07:17 +02:00
Tim Bentley
5f1db14ba4 Minor fixes 2013-03-10 20:35:14 +00:00
Tim Bentley
7d371228bc Config updates 2013-03-10 20:19:42 +00:00
Andreas Preikschat
ca406df0a4 head 2013-03-08 09:14:39 +01:00
Raoul Snyman
87212e5d1c More cleanups and more tests 2013-03-07 14:34:35 +02:00
Raoul Snyman
e5c87ed6f2 HEAD 2013-03-07 08:47:43 +02:00
Andreas Preikschat
b864d360d3 r2201 2013-03-06 22:54:13 +01:00
Tim Bentley
ca920ff774 Merge issues 2013-03-06 21:49:46 +00:00
Patrick Zimmermann
d390fff811 Merge trunk. 2013-03-05 20:55:20 +01:00
Andreas Preikschat
50538d66db removed not needed line 2013-03-05 15:44:47 +01:00
Andreas Preikschat
d5f4685788 added expand_tags() method test 2013-03-05 15:36:01 +01:00
Raoul Snyman
e2c0ab3d8a HEAD 2013-03-05 08:25:16 +02:00
Andreas Preikschat
4b2d20ff77 final clean ups 2013-03-04 21:44:34 +01:00
Andreas Preikschat
30ad9e5dca fixed comment 2013-03-04 21:40:30 +01:00
Andreas Preikschat
7c36d78ed8 r2197 2013-03-04 21:17:45 +01:00
Andreas Preikschat
42cba0da29 added clean_tags test 2013-03-04 21:17:13 +01:00
Tim Bentley
3a44717acf Head and conflict 2013-03-04 16:55:13 +00:00
Raoul Snyman
6c1a0aa5e7 HEAD 2013-03-04 10:53:43 +02:00
Tim Bentley
73fb71b4ce Head + conflicts 2013-03-01 17:45:17 +00:00
Tim Bentley
188aa53082 Head + conflicts 2013-03-01 17:36:43 +00:00
Andreas Preikschat
fe251f96a0 fixed test 2013-03-01 17:30:13 +01:00
Andreas Preikschat
550dfe12fa fixed/extended test 2013-03-01 17:18:50 +01:00
Andreas Preikschat
3a9908345a fileRenameForm/Dialog: code standards 2013-03-01 12:12:23 +01: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
9bcdb79e7b Merge master. 2013-02-28 22:55:36 +01:00
Patrick Zimmermann
ab565ae3e9 Cosmetic comment fixes in testing functions. 2013-02-28 22:46:36 +01:00
Tim Bentley
5da93e1f15 Fix tests to work 2013-02-28 21:19:01 +00:00
Andreas Preikschat
40de8647cf renamed general settings to core
Fixes: https://launchpad.net/bugs/1133237
2013-02-28 21:47:59 +01:00
Tim Bentley
8ddfd194c3 Remove unneeded tests 2013-02-28 05:45:34 +00:00
Tim Bentley
73aafdb62c failing tests 2013-02-27 21:42:21 +00:00
Andreas Preikschat
e61d76ecff fixed grammar 2013-02-27 22:40:55 +01:00
Tim Bentley
c564b05f36 Fix merge comments 2013-02-27 21:27:32 +00:00
Tim Bentley
e5c371feb5 Fix merge comments 2013-02-27 21:23:46 +00:00
Tim Bentley
b96304253e Fix merge comments 2013-02-27 21:11:43 +00:00
Andreas Preikschat
51eb93fe75 added test 2013-02-27 13:03:17 +01:00
Andreas Preikschat
25b1584a9d r2194 + conflict 2013-02-27 12:33:03 +01:00
Andreas Preikschat
4d1d912aaa merged settingsmanager with applocation; moved applocation 2013-02-27 12:24:50 +01:00
Tim Bentley
26ba57456f Head + conflicts 2013-02-26 17:27:30 +00:00
Tim Bentley
0a1ebfbdb9 Head + merge issues 2013-02-21 21:33:06 +00:00
Andreas Preikschat
db2b4ccd61 head + conflicts 2013-02-21 22:26:24 +01:00
Tim Bentley
fb466d25a2 Head 2013-02-21 21:21:33 +00:00
Tim Bentley
d0f36bb2e3 Head 2013-02-21 21:18:39 +00:00
Tim Bentley
2516417ee5 fix conflict 2013-02-21 19:16:05 +00:00
Tim Bentley
d6274d817a fix tests 2013-02-21 14:23:33 +00:00
Raoul Snyman
fe0f4d74b2 HEAD 2013-02-21 10:54:37 +02:00
Raoul Snyman
59a694b24c Add another few tests 2013-02-21 10:54:16 +02:00
Tim Bentley
3da378a7b7 Fixes 2013-02-21 07:33:21 +00:00
Patrick Zimmermann
2cf15f3b69 Add a lot more test functions. 2013-02-21 00:29:54 +01:00
Andreas Preikschat
477f5cefd0 renamed actions 2013-02-20 08:35:55 +01:00
Tim Bentley
5ca6d36935 Clean up custom plugin 2013-02-19 21:23:56 +00:00
Tim Bentley
6d732cf3ba Cleanups 2013-02-19 19:50:14 +00:00
Andreas Preikschat
269e5f5901 added actionList tests; removed useless test 2013-02-19 19:29:32 +01:00
Tim Bentley
b9a0458200 Minor updates 2013-02-19 18:27:17 +00:00
Raoul Snyman
9f70bf8e30 Write some more tests, and fix some potential bugs. 2013-02-19 16:07:34 +02:00
Andreas Preikschat
0f44fb3dd5 added actions test file (not started yet); fixed short lines 2013-02-19 13:53:24 +01:00
Raoul Snyman
dc849f3ff2 Add a test. 2013-02-19 14:49:21 +02:00
Andreas Preikschat
019e59d81f added language manager test 2013-02-19 11:54:24 +01:00
Andreas Preikschat
03941538e5 changed comment 2013-02-19 08:30:41 +01:00
Andreas Preikschat
718a440b8f added another formattingtags test 2013-02-19 08:27:55 +01:00
Andreas Preikschat
0b39b69e93 r2187 2013-02-19 08:09:56 +01:00