Cleanup

tests/test_chord_families.py

@@ -1,18 +1,17 @@
 """General chord families and one-voice acoustic rhythm, not song overrides."""
+import generator.composition
+import generator.validation
 import copy
 import fractions
 import unittest
 
 import generator.acoustic
-import generator.accompaniment
 import generator.chord_families
 import generator.comping
 import generator.comping_rhythm
 import generator.fretboard
-import generator.guitar
 import generator.harmony
 import generator.model
-import generator.production
 import generator.vocabulary
 import tests.solo_fixtures
 import tests.test_acoustic
@@ -89,8 +88,8 @@ class ChordFamilies(unittest.TestCase):
     changed = copy.deepcopy(resources)
     changed['accompaniment']['instruments']['acoustic']['patterns'][0]['events'][0]['duration'] = '1/2'
     for role in ('electric_accompaniment', 'electric_melody', 'electric_solo', 'vocal_melody'):
-      self.assertEqual(generator.production.dependencies(role, resources), generator.production.dependencies(role, changed))
-    self.assertNotEqual(generator.production.dependencies('acoustic_accompaniment', resources), generator.production.dependencies('acoustic_accompaniment', changed))
+      self.assertEqual(generator.composition.dependencies(role, resources), generator.composition.dependencies(role, changed))
+    self.assertNotEqual(generator.composition.dependencies('acoustic_accompaniment', resources), generator.composition.dependencies('acoustic_accompaniment', changed))
 
 class CombinedAcoustic(unittest.TestCase):
   def document(self, bars):
@@ -107,7 +106,7 @@ class CombinedAcoustic(unittest.TestCase):
   def convert(self, document):
     before = tests.test_acoustic.sounding(document)
     generator.acoustic.combine(document)
-    generator.model.validate_document(document)
+    generator.validation.validate_document(document)
     generator.fretboard.validate_document(document)
     self.assertEqual(tests.test_acoustic.sounding(document), before)
     self.assertTrue(all(len(m['voices']) == 1 for m in document['staves'][0]['measures']))