Soloing & Measures

tests/test_electric_voicing.py

@@ -124,14 +124,15 @@ class ElectricVoicingTests(unittest.TestCase):
         self.assertEqual(measures, original)
       if section.role != 'accompaniment':
         continue
-      for m, old in zip(measures, original):
+      for offset, (m, old) in enumerate(zip(measures, original)):
+        source_number = source['staves'][0]['measures'][section.source_measure_index + offset]['number']
         for voice, old_voice in zip(m['voices'], old['voices']):
           self.assertEqual([{k: v for k, v in n.items() if k != 'pitches'} for n in voice['notes']], [{k: v for k, v in n.items() if k != 'pitches'} for n in old_voice['notes']])
           for n in voice['notes']:
-            if not n['pitches'] or m['number'] not in ('4', '12', '22', '24'):
+            if not n['pitches'] or source_number not in ('4', '12', '22', '24'):
               continue
-            expected = (3, 3, 3, 3) if m['number'] == '22' else (3, 5, 5, 5)
+            expected = (3, 3, 3, 3) if source_number == '22' else (3, 5, 5, 5)
             self.assertEqual(tuple(f for _, f in sorted(shape(n), reverse=True)), expected)
             self.assertTrue(all('tie_from' not in p and 'tie_to' not in p for p in n['pitches']))
-            checked.add(m['number'])
+            checked.add(source_number)
     self.assertEqual(checked, {'4', '12', '22', '24'})