Cleanup

tests/test_acoustic.py

@@ -1,10 +1,10 @@
+import generator.validation
 import copy
 import fractions
 import pathlib
 import unittest
 import unittest.mock
 
-import generator.accompaniment
 import generator.acoustic
 import generator.arrange.generate
 import generator.engraving.fonts
@@ -41,19 +41,19 @@ def acoustic_document(bars):
       for note in notes:
         note.update(voice=lane, stem='down' if lane == 'bass' else 'up')
       measure['voices'].append({'id': lane, 'notes': notes})
-  generator.model.validate_document(document)
+  generator.validation.validate_document(document)
   return document
 
 class AcousticTests(unittest.TestCase):
   def combine(self, document):
     generator.acoustic.prepare(document)
-    generator.model.validate_document(document)
+    generator.validation.validate_document(document)
     prepared = copy.deepcopy(document)
     generator.acoustic.prepare(document)
     self.assertEqual(document, prepared)
     before = sounding(document)
     generator.acoustic.combine(document)
-    generator.model.validate_document(document)
+    generator.validation.validate_document(document)
     self.assertEqual(sounding(document), before)
     self.assertTrue(all(len(m['voices']) == 1 for m in document['staves'][0]['measures']))
     for measure in document['staves'][0]['measures']:
@@ -130,7 +130,7 @@ class AcousticTests(unittest.TestCase):
         separate = builder(source, 'acoustic')
       combined = builder(source, 'acoustic')
       self.assertEqual(sounding(separate), sounding(combined))
-      generator.model.validate_document(combined)
+      generator.validation.validate_document(combined)
       for measure in combined['staves'][0]['measures']:
         self.assertIn(len(measure['voices']), (1, 2))
         if len(measure['voices']) == 2: