Comp

tests/test_solo_drafts.py

@@ -89,7 +89,8 @@ class DraftRepresentationTests(unittest.TestCase):
     plan = dataclasses.replace(tests.test_solo_development.plan(), end=F(16))
     endings = generator.solo.drafts.ending_options(draft.anchors, plan, choices)
     self.assertEqual({a[-1].duration for a in endings}, {F(1, 2), F(1), F(2), F(3)})
-    self.assertTrue(all(a[-1].pitch == draft.anchors[-1].pitch and a[-1].earliest + a[-1].duration == 16 for a in endings))
+    self.assertTrue(all(a[-1].pitch == draft.anchors[-1].pitch and a[-1].earliest + a[-1].duration == a[-1].hold_until for a in endings))
+    self.assertEqual({16 - a[-1].hold_until for a in endings}, {F(), F(1, 2), F(1)})
   def test_revision_cannot_change_terminal_hold_or_identifying_rhythm(self):
     draft, _ = illustration()
     for index in (2, len(draft.notes) - 1):
@@ -219,7 +220,7 @@ class DraftCompositionTests(unittest.TestCase):
       self.assertTrue(generator.solo.drafts.contract_valid(phrase.draft, notes)[0])
       self.assertTrue(all(1 <= n.position.fret <= 12 for n in notes))
       for edit in phrase.edits:
-        self.assertLessEqual(edit.end - edit.start, 4 if edit.kind != 'elaboration' else phrase.plan.end - phrase.plan.start)
+        self.assertLessEqual(edit.end - edit.start, 8 if edit.kind in ('replace_idea', 'complete_route') else 4)
   def test_join_comparison_reuses_identical_upstream_draft_pool(self):
     plan = self.solo.phrases[0].plan
     measures = tests.test_solo.song(count=8)['staves'][0]['measures']