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
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
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
Patrick Zimmermann
92b42a6bb5
Merge master.
2013-02-18 23:04:38 +01:00
Patrick Zimmermann
904620998f
Remove non-needed test __init__ file. Split up testfunctions.
2013-02-18 22:42:04 +01:00
Tim Bentley
4b30d6cd29
Openup servicemanager again
2013-02-18 21:36:36 +00:00
7407d6a16c
Comment out the test properly.
2013-02-18 23:25:42 +02:00
74fc1d3988
HEAD
2013-02-18 23:05:08 +02:00
3a9aa65d54
Comment out a test that don't wanna work.
2013-02-18 23:01:28 +02:00
c0653676e7
HEAD
2013-02-18 22:59:44 +02:00
Tim Bentley
45ed3bd97e
Test messages
2013-02-18 20:44:55 +00:00
Tim Bentley
89b7083a69
Head
2013-02-18 20:40:40 +00:00
Tim Bentley
b7c43aa65e
Minor code clean up and add more tests
...
bzr-revno: 2187
2013-02-18 20:39:48 +00:00
Patrick Zimmermann
8c8cd3b867
Replace DuplicateSongFinder class with a set of functions.
2013-02-18 21:27:11 +01:00
Tim Bentley
17e367c6ba
Fix up tests
2013-02-18 19:34:36 +00:00
Patrick Zimmermann
570b8e1f45
Merge master.
2013-02-18 19:56:26 +01:00
Patrick Zimmermann
10d9b506a6
Even more variables adapted to PEP8. Sentencify lots of comments.
2013-02-18 19:46:50 +01:00
Andreas Preikschat
4366d8307d
fixed interface test
2013-02-18 12:09:09 +01:00
Tim Bentley
748d9d9d30
Ahhhh blank line
2013-02-17 20:25:42 +00:00
Tim Bentley
219fec12d2
Revert some changes - functional Ok. Interfaces mess
2013-02-17 20:21:15 +00:00
Tim Bentley
5c0fa26289
Revert some changes - functional Ok. Interfaces mess
2013-02-17 20:11:37 +00:00
phill-ridout
ca2b2db640
fixed duplicates in verse order when adding verses with the same tag.
...
fixed handling of part verses eg (1a, 1b, 1.5, etc) in SongShowPlus importer
2013-02-17 19:37:59 +00:00
Andreas Preikschat
b58773cbfe
fixed tests
2013-02-17 14:03:59 +01:00
Tim Bentley
62b1653c46
Fix the unit test framework
2013-02-17 07:54:43 +00:00
Tim Bentley
2fab6cfb39
Head
2013-02-16 20:45:36 +00:00
Tim Bentley
a14f624a81
Fixes
2013-02-16 20:45:15 +00:00
Tim Bentley
e921e63e35
Head
2013-02-16 20:43:47 +00:00
Andreas Preikschat
e9ac83bf47
use own ScreenList() call instead of using parents to access it
...
And more tests
bzr-revno: 2184
2013-02-16 20:42:29 +00:00
Andreas Preikschat
ead6da8cbf
Added UiStrings test
...
Added FormattingTags test
bzr-revno: 2183
2013-02-16 20:41:33 +00:00
Tim Bentley
6f9126dc95
Fix messages
2013-02-16 20:40:05 +00:00
Tim Bentley
b736c24a47
More updates for Service Item Tests
2013-02-16 20:04:26 +00:00
Andreas Preikschat
573f687d9e
fixed spaces/lines
2013-02-16 21:00:31 +01:00
Tim Bentley
0c0742bbbf
Add Service Item Tests 2
2013-02-16 18:27:38 +00:00
Tim Bentley
a463314b7a
Add Service Item Tests
2013-02-16 18:24:31 +00:00
Andreas Preikschat
5b4e285782
created constant; changed test method description
2013-02-16 19:14:41 +01:00
Andreas Preikschat
db00a864fc
fixed test method descriptions; created costant
2013-02-16 19:11:22 +01:00
Andreas Preikschat
10f7a464b4
delete appliction in tearDown
2013-02-16 19:06:23 +01:00
Andreas Preikschat
fab327c89f
moved application creation
2013-02-16 19:04:17 +01:00
Andreas Preikschat
d78373e65e
r2182
2013-02-16 17:06:23 +01:00
Andreas Preikschat
a24ff2a4a2
added newline to end of file
2013-02-16 17:05:39 +01:00
Andreas Preikschat
bea5fe2596
cleaned code
2013-02-16 16:02:19 +01:00
Tim Bentley
8dc7c6ae65
Head
2013-02-16 13:25:18 +00:00
Tim Bentley
0d6e9389b9
Clean up Song Usage dialog
2013-02-16 13:02:20 +00:00
Andreas Preikschat
479244fde2
fixed import I just removed :/
2013-02-16 13:42:25 +01:00
Andreas Preikschat
b76656420b
moved file to match file name
2013-02-16 13:40:19 +01:00
Andreas Preikschat
ce1d5b6539
fixed import order
2013-02-16 13:33:54 +01:00
Andreas Preikschat
9ecb575d5b
clean up
2013-02-16 13:30:16 +01:00
Andreas Preikschat
b1ec7aa187
completed screen list test
2013-02-16 13:27:13 +01:00
a8fafc3363
HEAD
2013-02-16 14:01:10 +02:00
Andreas Preikschat
434349b47d
fixed test
2013-02-16 12:46:57 +01:00
Andreas Preikschat
a40defdeab
r2181
2013-02-16 12:46:12 +01:00
Tim Bentley
616684d9ad
Merge and fixes
2013-02-16 10:40:05 +00:00
Andreas Preikschat
74f983207c
r2180
2013-02-16 11:28:48 +01:00
Andreas Preikschat
7e0ea578ee
started with screen tests
2013-02-16 11:28:37 +01:00
Tim Bentley
454f428845
Text fix
2013-02-16 10:17:48 +00:00
Tim Bentley
8ad83b52ba
Text fix
2013-02-16 10:15:49 +00:00
Tim Bentley
8e16fc9d77
Head
2013-02-16 06:51:41 +00:00
Tim Bentley
11dea519d2
Fix import order
2013-02-16 06:51:25 +00:00
Andreas Preikschat
7c9506af4a
- fixed Bug #1100277 (Songs don't load with latest build)
...
- added nose to check_dependencies.py
- fixed version number compare in create_separated_list
bzr-revno: 2178
2013-02-16 06:48:52 +00:00