Commit Graph

517 Commits

Author SHA1 Message Date
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
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
ad715fec29 try to use locale.strxfrm 2013-07-15 20:02:54 +02: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
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
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
Tomas Groth
25557784c8 Added test cases for new json format in service files. 2013-06-17 21:01:11 +02:00
Andreas Preikschat
f261a95a37 head 2013-06-16 18:48:37 +02:00
Patrick Zimmermann
1aeb9bef2f Duplicate Song finder merge - UI and Services.
bzr-revno: 2252
2013-06-16 15:53:40 +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
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
Patrick Zimmermann
0557febe2b Merge trunk. 2013-04-29 20:23:06 +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
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
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
401d4d2688 close file 2013-04-20 20:39:10 +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
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
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
797a76f095 Head 2013-04-14 16:45:34 +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
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
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
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
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
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
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
f715810ce9 added test 2013-03-30 09:46:34 +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
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
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
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
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
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
Tim Bentley
3c32bc7501 Added tests 2013-03-13 19:51:56 +00:00
Andreas Preikschat
48e8838289 added image_manager get_image_bytes() test 2013-03-12 09:19:47 +01: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
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