Cleanup

tests/test_engraving_cache.py

@@ -1,3 +1,4 @@
+import generator.score_io
 import tests.production_fixtures
 import argparse
 import contextlib
@@ -19,11 +20,11 @@ import generator.engraving.cache
 import generator.engraving.fonts
 import generator.engraving.layout
 import generator.engraving.pipeline
+import generator.engraving.worker
 import generator.engraving.raster
 import generator.engraving.types
 import generator.engraving.validation
 import generator.pico_artwork
-import generator.score
 import tests.solo_fixtures
 import tests.test_musicxml
 
@@ -173,8 +174,8 @@ class EngravingCacheTests(unittest.TestCase):
     style = generator.engraving.types.Style()
     documents = [self.document, tests.test_musicxml.parse(tests.test_musicxml.xml_score(tests.test_musicxml.xml_note('D')))]
     pages = [generator.engraving.layout.layout_score(document, style, family).pages[0] for document in documents]
-    result = generator.engraving.pipeline.GroupResult()
-    bands = generator.engraving.pipeline.BodyBands(self.root / 'spool', None, result, limit=1)
+    result = generator.engraving.worker.GroupResult()
+    bands = generator.engraving.worker.BodyBands(self.root / 'spool', None, result, limit=1)
     self.addCleanup(bands.close)
     original = None
     for index in (0, 1, 0):
@@ -338,7 +339,7 @@ class EngravingCacheTests(unittest.TestCase):
       reads.append(path)
       return read_text(path, *args, **kwargs)
     with unittest.mock.patch.object(pathlib.Path, 'read_text', read):
-      generator.score.validate_generated_tree(root)
+      generator.score_io.validate_generated_tree(root)
     self.assertCountEqual(reads, sorted(root.rglob('*.json')))
   def test_invalid_worker_count_and_overlapping_cache_are_rejected(self):
     root = self.root / 'assets'