Music Notation

tests/test_music_model.py

@@ -4,6 +4,7 @@ from fractions import Fraction
 from pathlib import Path
 import tempfile
 import unittest
+from unittest.mock import patch
 
 from generator import harmony
 from generator.__main__ import generate_assets
@@ -16,6 +17,10 @@ from generator.transposition import concert_document, shift_pitch, transpose_doc
 from tests.test_musicxml import parse, notes, xml_note, xml_score
 
 class MusicModelTests(unittest.TestCase):
+  def setUp(self):
+    engraving = patch('generator.__main__.engrave_tree')
+    engraving.start()
+    self.addCleanup(engraving.stop)
   def test_chord_semantics_are_not_voicing_heuristics(self):
     cases = {'C': {0, 4, 7}, 'Cdim': {0, 3, 6}, 'Cdim7': {0, 3, 6, 9}, 'Csus2': {0, 2, 7},
       'C7b5': {0, 4, 6, 10}, 'G7b9': {7, 11, 2, 5, 8}, 'Fmaj7#11': {5, 9, 0, 4, 11}}
@@ -28,6 +33,7 @@ class MusicModelTests(unittest.TestCase):
       harmony.parse_symbol('Cunrecognised')
   def test_transposition_preserves_spelling_octaves_modes(self):
     for p in ({'letter': 'b', 'alter': 1, 'octave': 4}, {'letter': 'c', 'alter': -1, 'octave': 4}, {'letter': 'f', 'alter': 2, 'octave': 4}):
+      p['alter'] = rational(p['alter'])
       self.assertEqual(shift_pitch(p, 0, 0), p)
       self.assertEqual(pitch_number(shift_pitch(p, 1, 2)), pitch_number(p) + 2)
     source = parse(xml_score(xml_note(), attributes='<key><fifths>-3</fifths><mode>minor</mode></key>'))
@@ -99,7 +105,7 @@ class MusicModelTests(unittest.TestCase):
     source = parse(xml_score(xml_note(), attributes='<transpose><diatonic>-1</diatonic><chromatic>-2</chromatic></transpose>'))
     concert = concert_document(source)
     p = notes(concert)[0]['pitches'][0]
-    self.assertEqual((p['letter'], p['alter'], p['octave']), ('b', -1, 3))
+    self.assertEqual((p['letter'], fraction(p['alter']), p['octave']), ('b', -1, 3))
     self.assertEqual(concert_document(concert), concert)
     self.assertEqual(concert['metadata']['key_signature'], 'Bb')
   def test_deterministic_generation_and_removal(self):
@@ -111,11 +117,13 @@ class MusicModelTests(unittest.TestCase):
       args = argparse.Namespace(data_dir=data, output_dir=output, static_assets_dir=Path('package/assets'), clean=True, check=False)
       generate_assets(args)
       first = {p.relative_to(output): p.read_bytes() for p in output.rglob('*') if p.is_file()}
+      args.clean = False
       generate_assets(args)
       self.assertEqual(first, {p.relative_to(output): p.read_bytes() for p in output.rglob('*') if p.is_file()})
       source.unlink()
       generate_assets(args)
       self.assertFalse(list(output.rglob('*.json')))
+      self.assertFalse(list(output.rglob('*.png')))
   def test_pickup_tie_survives_vocal_restoration(self):
     source = xml_score(xml_note(duration=1, kind='quarter', extra='<tie type="start"/>'), implicit=True)
     source = source.replace('</measure></part>', '</measure><measure number="2">' + xml_note(extra='<tie type="stop"/>') + '</measure></part>')