Chord Families

tests/test_comping_rhythm.py

@@ -31,12 +31,15 @@ class LayeredComping(unittest.TestCase):
     self.resources = generator.vocabulary.load()
   def test_candidates_preserve_all_counts_and_articulations(self):
     m = self.source['staves'][0]['measures'][0]
-    policy = self.resources['accompaniment']
     for lane, expected in (('electric', {0, 1, 2}), ('bass', {1, 2}), ('upper', {1, 2, 3})):
+      policy = generator.vocabulary.accompaniment('electric' if lane == 'electric' else 'acoustic', self.resources)
       candidates = generator.comping_rhythm.lane_candidates(m, m['harmonies'][0], lane, (), policy, 'test')
       self.assertEqual({len(c.events) for c in candidates}, expected)
       self.assertTrue(any(e.end - e.start <= fractions.Fraction(1, 2) for c in candidates for e in c.events) if lane != 'bass' else True)
-      self.assertTrue(any(e.end - e.start >= 2 for c in candidates for e in c.events))
+      if lane == 'electric':
+        self.assertTrue(any(e.end - e.start >= 2 for c in candidates for e in c.events))
+      else:
+        self.assertEqual({e.end - e.start for c in candidates for e in c.events}, {fractions.Fraction(1, 2), fractions.Fraction(1)})
       if lane == 'bass':
         self.assertTrue(all(c.events[0].start == 0 for c in candidates))
   def test_ranges_downbeats_and_overlap(self):
@@ -125,7 +128,7 @@ class LayeredComping(unittest.TestCase):
             n.update(kind='rest', pitches=[])
       results[part + '_solo'] = empty
     assembled = generator.production.assemble(source, results)
-    self.assertTrue(any(len(m['voices']) == 2 for m in assembled['acoustic']['staves'][0]['measures']))
+    self.assertTrue(all(len(m['voices']) == 1 for m in assembled['acoustic']['staves'][0]['measures']))
     audit = generator.arrange.accompaniment.audit(self.source, assembled)
     self.assertGreater(audit['acoustic']['reused_bars'], 0)
     for doc in assembled.values():