raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Test for & in authors

Browse Source
This commit is contained in:
Martin Thompson 2010-09-02 20:43:28 +01:00
parent b4cfea211e
commit 192010588f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/opensongimport.py
View File

@ -286,7 +286,7 @@ class OpenSongImport(SongImport):
else: else:
tag = u'V' + tag # Assume it's a verse if it has no prefix tag = u'V' + tag # Assume it's a verse if it has no prefix
if not versetags.has_key(tag): if not versetags.has_key(tag):
log.warn(u'Got order %s but not in versetags, dropping this item from presentation order', tag) log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
else: else:
verse_order_list.append(tag) verse_order_list.append(tag)
# now copy the data # now copy the data

2
openlp/plugins/songs/lib/test/test.opensong
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<song> <song>
<title>Martins Test</title> <title>Martins Test</title>
<author>MartiÑ Thómpson</author> <author>MartiÑ &amp; Martin2 Thómpson</author>
<copyright>2010 Martin Thompson</copyright> <copyright>2010 Martin Thompson</copyright>
<hymn_number>1</hymn_number> <hymn_number>1</hymn_number>
<presentation>V1 C V2 C2 3 B1 V1 T U</presentation> <presentation>V1 C V2 C2 3 B1 V1 T U</presentation>

2
openlp/plugins/songs/lib/test/test_opensongimport.py
View File

@ -53,7 +53,7 @@ def test():
o.do_import() o.do_import()
o.print_song() o.print_song()
assert o.copyright == u'2010 Martin Thompson' assert o.copyright == u'2010 Martin Thompson'
assert o.authors == [u'MartiÑ Thómpson'] assert o.authors == [u'MartiÑ Thómpson', u'Martin2 Thómpson']
assert o.title == u'Martins Test' assert o.title == u'Martins Test'
assert o.alternate_title == u'' assert o.alternate_title == u''
assert o.song_number == u'1' assert o.song_number == u'1'