From 7ce01d0e65547fbe862e0022fd63b0b99d2006b2 Mon Sep 17 00:00:00 2001 From: Martin Thompson Date: Wed, 30 Jun 2010 20:53:08 +0100 Subject: [PATCH] Moved test scripts and data to a test folder --- openlp/plugins/songs/lib/test.opensong | 50 ------------------- .../songs/lib/{ => test}/test2.opensong | 0 .../lib/{ => test}/test_importing_lots.py | 4 +- .../lib/{ => test}/test_opensongimport.py | 0 4 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 openlp/plugins/songs/lib/test.opensong rename openlp/plugins/songs/lib/{ => test}/test2.opensong (100%) rename openlp/plugins/songs/lib/{ => test}/test_importing_lots.py (93%) rename openlp/plugins/songs/lib/{ => test}/test_opensongimport.py (100%) diff --git a/openlp/plugins/songs/lib/test.opensong b/openlp/plugins/songs/lib/test.opensong deleted file mode 100644 index af0f039ed..000000000 --- a/openlp/plugins/songs/lib/test.opensong +++ /dev/null @@ -1,50 +0,0 @@ - - - Martins Test - MartiÑ Thómpson - 2010 Martin Thompson - 1 - V1 C V2 C2 V3 B1 V1 - Blah - - - - - - - - - - - ;Comment -. A B C -1 v1 Line 1___ -2 v2 Line 1___ -. A B C7 -1 V1 Line 2 -2 V2 Line 2 - -[3] - V3 Line 1 - V3 Line 2 - -[b1] - Bridge 1 - Bridge 1 line 2 -[C] -. A B - Chorus 1 - -[C2] -. A B - Chorus 2 - - diff --git a/openlp/plugins/songs/lib/test2.opensong b/openlp/plugins/songs/lib/test/test2.opensong similarity index 100% rename from openlp/plugins/songs/lib/test2.opensong rename to openlp/plugins/songs/lib/test/test2.opensong diff --git a/openlp/plugins/songs/lib/test_importing_lots.py b/openlp/plugins/songs/lib/test/test_importing_lots.py similarity index 93% rename from openlp/plugins/songs/lib/test_importing_lots.py rename to openlp/plugins/songs/lib/test/test_importing_lots.py index 5161f4a30..59d72b34b 100644 --- a/openlp/plugins/songs/lib/test_importing_lots.py +++ b/openlp/plugins/songs/lib/test/test_importing_lots.py @@ -9,9 +9,10 @@ import codecs def opensong_import_lots(): ziploc=u'/home/mjt/openlp/OpenSong_Data/' files=[] + files=['test.opensong.zip'] # files.extend(glob(ziploc+u'Songs.zip')) # files.extend(glob(ziploc+u'SOF.zip')) - files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip')) + # files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip')) # files.extend(glob(ziploc+u'opensong_*.zip')) errfile=codecs.open(u'import_lots_errors.txt', u'w', u'utf8') manager=SongManager() @@ -32,6 +33,7 @@ def opensong_import_lots(): o=OpenSongImport(manager) try: o.do_import_file(songfile) + o.song.print_song() except: print "Failure", diff --git a/openlp/plugins/songs/lib/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py similarity index 100% rename from openlp/plugins/songs/lib/test_opensongimport.py rename to openlp/plugins/songs/lib/test/test_opensongimport.py