Cleanup

tests/test_arrangement_ending.py

@@ -1,11 +1,14 @@
 """The held recording tail has exact score time and no vocal attacks."""
+import generator.arrange.form
+import generator.composition
+import generator.source
+import generator.validation
 import copy
 import fractions
 import pathlib
 import unittest
 
 import generator.acoustic
-import generator.arrange.ending
 import generator.arrange.generate
 import generator.fretboard
 import generator.harmony
@@ -13,7 +16,6 @@ import generator.model
 import generator.musicxml
 import generator.parts
 import generator.performance
-import generator.production
 import generator.score
 import tests.solo_fixtures
 
@@ -45,7 +47,7 @@ class ArrangementEnding(unittest.TestCase):
         self.assertEqual(generator.model.fraction(timing['sustain_start']), 672)
         self.assertEqual(generator.model.fraction(timing['duration']), 684)
         self.assertEqual(len(timing['clicks']), 672)
-        generator.model.validate_document(result)
+        generator.validation.validate_document(result)
         generator.fretboard.validate_document(result)
       self.assertEqual(source, before)
   def test_ending_uses_final_meter_and_does_not_extend_solo_windows(self):
@@ -54,10 +56,10 @@ class ArrangementEnding(unittest.TestCase):
       prepared = generator.parts.prepare_document(source)
       for part in ('acoustic', 'electric'):
         role = part + '_accompaniment'
-        result = generator.production.generate_role(generator.production.SourceAnalysis.read(prepared), role, pathlib.Path('data'))
+        result = generator.composition.generate_role(generator.source.SourceAnalysis.read(prepared), role, pathlib.Path('data'))
         tail = result['document']['staves'][0]['measures'][-3:]
         self.assertEqual([generator.model.fraction(m['duration']) for m in tail], [meter] * 3)
-        windows = generator.production.windows(prepared, part)
+        windows = generator.arrange.form.windows(prepared, part)
         self.assertEqual(windows[-1][2], role)
         self.assertEqual(windows[-1][1] - windows[-1][0], 3 * meter)
         self.assertEqual(sum(b - a for a, b, r in windows if r == part + '_solo'), 2 * meter)