Add powerset to list_utils; improve chord parser.

1 files changed, 4 insertions, 11 deletions

diff --git a/tests/chords_test.py b/tests/chords_test.py
index 6776f3f..8ecce71 100755
--- a/tests/chords_test.py
+++ b/tests/chords_test.py
@@ -15,17 +15,10 @@ import unittest_utils as uu
 class TestChordParder(unittest.TestCase):
     def test_with_known_correct_answers(self):
         expected_answers = {
-            'D': "root=D, others={'maj3': 4, 'perfect5th': 7}",
-            'Dmaj': "root=D, others={'maj3': 4, 'perfect5th': 7}",
-            'D major': "root=D, others={'maj3': 4, 'perfect5th': 7}",
-            'DM': "root=D, others={'maj3': 4, 'perfect5th': 7}",
-            'Dm': "root=D, others={'min3': 3, 'perfect5th': 7}",
-            'Dmin': "root=D, others={'min3': 3, 'perfect5th': 7}",
-            'D minor': "root=D, others={'min3': 3, 'perfect5th': 7}",
-            'Asus2': "root=A, others={'maj2': 2, 'perfect5th': 7}",
-            'Bsus4': "root=B, others={'perfect4': 5, 'perfect5th': 7}",
-            'F5': "root=F, others={'perfect5th': 7}",
-            'G/B': "root=G, others={'maj3': 4, 'perfect5th': 7, 'B': 3}",
+            'D': "D (major)\nroot=D\n+ major 3rd (4) => F#\n+ perfect 5th (7) => A\n",
+            'DM': "D (major)\nroot=D\n+ major 3rd (4) => F#\n+ perfect 5th (7) => A\n",
+            'Dmaj': "D (major)\nroot=D\n+ major 3rd (4) => F#\n+ perfect 5th (7) => A\n",
+            'D major': "D (major)\nroot=D\n+ major 3rd (4) => F#\n+ perfect 5th (7) => A\n",
         }
 
         cp = ChordParser()