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

More pipeline fixes

Browse Source
This commit is contained in:
STEPHANVS 2021-07-22 23:08:23 +02:00
parent 6ea2f9d43d
commit d0d9653c67
No known key found for this signature in database
GPG Key ID: 4EFE47E471FD62A9
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,7 +604,7 @@ def transpose_verse(verse_text, transpose_value, notation, key):
else: else:
# This MUST be a chord # This MUST be a chord
transposed_chord, key, lastchord = transpose_chord(word, transpose_value, notation, key, lastchord, transposed_chord, key, lastchord = transpose_chord(word, transpose_value, notation, key, lastchord,
isbass) isbass)
isbass = False isbass = False
transposed_lyrics += transposed_chord transposed_lyrics += transposed_chord
# If still inside a chord tag something is wrong! # If still inside a chord tag something is wrong!

31
tests/openlp_plugins/songs/test_lib.py
View File

@ -275,12 +275,17 @@ def test_transpose_chord_up():
""" """
# GIVEN: A Chord # GIVEN: A Chord
chord = 'C' chord = 'C'
key = None
lastchord = None
isbass = False
# WHEN: Transposing it 1 up # WHEN: Transposing it 1 up
new_chord = transpose_chord(chord, 1, 'english', None, None, False) new_chord, key, lastchord = transpose_chord(chord, 1, 'english', key, lastchord, isbass)
# THEN: The chord should be transposed up one note # THEN: The chord should be transposed up one note
assert new_chord == 'C#', 'The chord should be transposed up.' assert new_chord == 'C#', 'The chord should be transposed up.'
assert key == None, 'The key should not be set'
assert lastchord == 'C#', 'If not isbass, then lastchord should be returned'
def test_transpose_chord_up_adv(): def test_transpose_chord_up_adv():
@ -289,13 +294,22 @@ def test_transpose_chord_up_adv():
""" """
# GIVEN: An advanced Chord # GIVEN: An advanced Chord
chord = '(D/F#)' chord = '(D/F#)'
key = None
lastchord = None
isbass = False
chordsplit = chord.split("/")
# WHEN: Transposing it 1 up # WHEN: Transposing it 1 up
new_chord = transpose_chord(chord, 1, 'english', None, None, False) new_chord, key, lastchord = transpose_chord(chordsplit[0], 1, 'english', key, lastchord, isbass)
# AFTER "/" isbass is true, lastchord is set
isbass = True
new_bass, key, lastchord = transpose_chord(chordsplit[1], 1, 'english', key, lastchord, isbass)
# THEN: The chord should be transposed up one note # THEN: The chord should be transposed up one note
assert new_chord == '(Eb/G)', 'The chord should be transposed up.' assert new_chord == '(Eb', 'The chord should be transposed up.'
assert new_bass == 'G)', 'Bass should be transposed up.'
assert key == None, 'no key should be defined'
assert lastchord == 'Eb', 'lastchord is generated'
def test_transpose_chord_down(): def test_transpose_chord_down():
""" """
@ -303,12 +317,17 @@ def test_transpose_chord_down():
""" """
# GIVEN: A Chord # GIVEN: A Chord
chord = 'C' chord = 'C'
key = None
lastchord = None
isbass = False
# WHEN: Transposing it 1 down # WHEN: Transposing it 1 down
new_chord = transpose_chord(chord, -1, 'english', None, None, False) new_chord, key, lastchord = transpose_chord(chord, -1, 'english', key, lastchord, isbass)
# THEN: The chord should be transposed down one note # THEN: The chord should be transposed down one note
assert new_chord == 'B', 'The chord should be transposed down.' assert new_chord == 'B', 'The chord should be transposed down.'
assert key == None, 'The key should not be set'
assert lastchord == 'B', 'If not isbass, then lastchord should be returned'
def test_transpose_chord_error(): def test_transpose_chord_error():