From 192010588f3660a4781be63b56e89cd9dbe112f4 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Thu, 2 Sep 2010 20:43:28 +0100
Subject: [PATCH] Test for & in authors

---
 openlp/plugins/songs/lib/opensongimport.py           | 2 +-
 openlp/plugins/songs/lib/test/test.opensong          | 2 +-
 openlp/plugins/songs/lib/test/test_opensongimport.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index e22f6f34d..dae60a3b7 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -286,7 +286,7 @@ class OpenSongImport(SongImport):
                 else:
                     tag = u'V' + tag # Assume it's a verse if it has no prefix
             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:
                 verse_order_list.append(tag)
         # now copy the data
diff --git a/openlp/plugins/songs/lib/test/test.opensong b/openlp/plugins/songs/lib/test/test.opensong
index 5d3bc5530..3633e7d62 100644
--- a/openlp/plugins/songs/lib/test/test.opensong
+++ b/openlp/plugins/songs/lib/test/test.opensong
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <song>
   <title>Martins Test</title>
-  <author>MartiÑ Thómpson</author>
+  <author>MartiÑ &amp; Martin2 Thómpson</author>
   <copyright>2010 Martin Thompson</copyright>
   <hymn_number>1</hymn_number>
   <presentation>V1 C V2 C2 3 B1 V1 T U</presentation>
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index 3398595f7..6aa954b06 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -53,7 +53,7 @@ def test():
     o.do_import()
     o.print_song()
     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.alternate_title == u''
     assert o.song_number == u'1'