Cleanup

tests/test_acoustic_voicing.py

@@ -1,3 +1,4 @@
+import generator.validation
 import copy
 import fractions
 import itertools
@@ -7,11 +8,9 @@ import unittest
 import generator.accompaniment
 import generator.acoustic
 import generator.acoustic_voicing
-import generator.arrange.generate
 import generator.fretboard
 import generator.harmony
 import generator.model
-import generator.musicxml
 import tests.test_acoustic
 import tests.test_accompaniment
 
@@ -79,7 +78,7 @@ class AcousticVoicingTests(unittest.TestCase):
           self.assertIn(strings, ([5], [6]))
         self.assertFalse(any(k.startswith('_') for k in note))
         self.assertTrue(all('tie_from' not in p and 'tie_to' not in p for p in note['pitches']))
-    generator.model.validate_document(document)
+    generator.validation.validate_document(document)
     return spans
   def test_independent_attacks_keep_one_complete_voicing(self):
     document = planned_document([[(0, 'FM7')]])
@@ -89,7 +88,7 @@ class AcousticVoicingTests(unittest.TestCase):
     before = tests.test_acoustic.sounding(document)
     generator.acoustic.combine(document)
     self.assertEqual(tests.test_acoustic.sounding(document), before)
-    generator.model.validate_document(document)
+    generator.validation.validate_document(document)
   def test_four_strings_allow_all_defined_bass_inversions(self):
     for symbol in ('CM', 'Dm', 'Caug', 'Cdim', 'C7', 'Cdim7', 'C7no5', 'C7b9', 'C7no1', 'C6', 'C13', 'Csus', 'Csus2'):
       with self.subTest(chord=symbol):