Add test for midi file with midi offs

Fix: #2

Author: fruch

test/clock_tower_short.mid

@@ -1,11 +1,16 @@
-class PWM():
+class PWM:
+    def __init__(self, *args, **kwargs):
+        pass
+
     def duty(self, i):
         pass
+
     def freq(self, f):
         pass
 
 
-class Pin():
+class Pin:
     OUT = "OUT"
-    def __init__(self, *arg, **kwargs):
+
+    def __init__(self, *args, **kwargs):
         pass

test/machine.py

@@ -1,12 +1,14 @@
 import struct
-import sys
 import logging
 
 logger = logging.getLogger(__name__)
 
+
 class Note(object):
-    "Represents a single MIDI note"
-    
+    """
+    Represents a single MIDI note
+    """
+
     note_names = ['A', 'A#', 'B', 'C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#']
 
     def __init__(self, channel, pitch, velocity, start, duration = 0):
@@ -26,10 +28,14 @@ def __str__(self):
     def get_end(self):
         return self.start + self.duration
 
+
 class MidiFile(object):
-    "Represents the notes in a MIDI file"
-    
-    def read_byte(self, file):
+    """
+    Represents the notes in a MIDI file
+    """
+
+    @staticmethod
+    def read_byte(file):
         return struct.unpack('B', file.read(1))[0]
 
     def read_variable_length(self, file, counter):
@@ -45,7 +51,7 @@ def read_variable_length(self, file, counter):
                 if not (c & 0x80):
                     break
 
-        return (num, counter)
+        return num, counter
 
     def __init__(self, file_name):
         self.tempo = 120
@@ -140,7 +146,7 @@ def read_track(self, track_num=1):
                             note = Note(channel, param1, param2, abs_time)
                             if nn == track_num:
                                 logger.debug("%s", note)
-                                track.append(str(note).split())
+                                track.append(note)
 
                         elif type == 0x8:
                             for note in reversed(track):
@@ -166,6 +172,7 @@ def getnote(q):
             return None
 
         for nn in track:
+            nn = str(nn).split()
             start, stop = float(nn[2]), float(nn[3])
 
             if start != stop:   # note ends because of NOTE OFF event
@@ -191,8 +198,12 @@ def getnote(q):
                 last2 = start
 
         return song    
-    
+
+
 def getdur(a, b):
-    "Calculate note length for PySynth"
+    """
+    Calculate note length for PySynth"
+    """
+
     return 4 / (b - a)
 

test/midi.py

@@ -22,33 +22,37 @@
     0.0,
 ]
 
-class RTTTL:
 
+class RTTTL:
     def __init__(self, tune):
         tune_pieces = tune.split(':')
         if len(tune_pieces) != 3:
             raise ValueError('tune should contain exactly 2 colons')
         self.tune = tune_pieces[2]
         self.tune_idx = 0
+        self.msec_per_whole_note = 0
+        self.default_octave = 0
+        self.default_duration = 0
+        self.bpm = 0
         self.parse_defaults(tune_pieces[1])
 
     def parse_defaults(self, defaults):
         # Example: d=4,o=5,b=140
         val = 0
-        id = ' '
+        _id = ' '
         for char in defaults:
             char = char.lower()
             if char.isdigit():
                 val *= 10
                 val += ord(char) - ord('0')
-                if id == 'o':
+                if _id == 'o':
                     self.default_octave = val
-                elif id == 'd':
+                elif _id == 'd':
                     self.default_duration = val
-                elif id == 'b':
+                elif _id == 'b':
                     self.bpm = val
             elif char.isalpha():
-                id = char
+                _id = char
                 val = 0
         # 240000 = 60 sec/min * 4 beats/whole-note * 1000 msec/sec
         self.msec_per_whole_note = 240000.0 / self.bpm
@@ -87,7 +91,7 @@ def notes(self):
                 return
 
             note = char.lower()
-            if note >= 'a' and note <= 'g':
+            if 'a' <= note <= 'g':
                 note_idx = ord(note) - ord('a')
             elif note == 'h':
                 note_idx = 1    # H is equivalent to B
@@ -109,7 +113,7 @@ def notes(self):
                 char = self.next_char()
 
             # Check for octave
-            if char >= '4' and char <= '7':
+            if '4' <= char <= '7':
                 octave = ord(char) - ord('0')
                 char = self.next_char()
             else:

test/rtttl.py

@@ -34,6 +34,7 @@
     'MissionImp:d=16,o=6,b=95:32d,32d#,32d,32d#,32d,32d#,32d,32d#,32d,32d,32d#,32e,32f,32f#,32g,g,8p,g,8p,a#,p,c7,p,g,8p,g,8p,f,p,f#,p,g,8p,g,8p,a#,p,c7,p,g,8p,g,8p,f,p,f#,p,a#,g,2d,32p,a#,g,2c#,32p,a#,g,2c,a#5,8c,2p,32p,a#5,g5,2f#,32p,a#5,g5,2f,32p,a#5,g5,2e,d#,8d',
 ]
 
+
 def find(name):
     for song in SONGS:
         song_name = song.split(':')[0]

test/songs.py

@@ -14,49 +14,56 @@
 
 for k in range(88):
     freq = int(27.5 * 2. ** (k / 12.))
-    oct = (k + 9) // 12
-    note = '%s%d' % (keys_s[k % 12], oct)
+    _oct = (k + 9) // 12
+    note = '%s%d' % (keys_s[k % 12], _oct)
     PITCHHZ[note] = freq
 
+
 class BuzzerTests(unittest.TestCase):
     sample_file = os.path.join(os.path.dirname(__file__), 'Zlilmehuvan.mid')
     nokia_file = os.path.join(os.path.dirname(__file__), 'star_wars.nokia')
 
     def test_00(self):
-        for k, v  in PITCHHZ.items():
-            self.assertAlmostEqual(note_freq(k),  v, delta=2)
+        for key, val in PITCHHZ.items():
+            self.assertAlmostEqual(note_freq(key),  val, delta=2)
 
-    def test_01_init_no_params(self):
+    @staticmethod
+    def test_01_init_no_params():
         b = BuzzerPlayer()
 
-    def test_02_init(self):
-        b = BuzzerPlayer(1,2,4)
+    @staticmethod
+    def test_02_init():
+        b = BuzzerPlayer(1, 2, 4)
 
-    def test_03_play_nokia_tone(self):
-        buzz = BuzzerPlayer(1,2,4)
+    @staticmethod
+    def test_03_play_nokia_tone():
+        buzz = BuzzerPlayer(1, 2, 4)
         song = nokia_songs['pink_panther']
         buzz.play_nokia_tone(song, name='pink_panther')
 
-    def test_03_play_nokia_tone_esp8266(self):
+    @staticmethod
+    def test_03_play_nokia_tone_esp8266():
         buzz = BuzzerPlayer(12, platform="esp8266")
         song = nokia_songs['pink_panther']
         buzz.play_nokia_tone(song, name='pink_panther')
 
-    def test_03_play_nokia_tone_pyborad(self):
-        buzz = BuzzerPlayer(1,2,4,  platform='pyboard')
+    @staticmethod
+    def test_03_play_nokia_tone_pyborad():
+        buzz = BuzzerPlayer(1, 2, 4,  platform='pyboard')
         song = nokia_songs['pink_panther']
         buzz.play_nokia_tone(song, name='pink_panther')
 
     def test_03_play_nokie_tone_file(self):
-        buzz = BuzzerPlayer(1,2,4)
+        buzz = BuzzerPlayer(1, 2, 4)
         buzz.play_nokia_tone(buzz.from_file(self.nokia_file), name='star_wars')
 
     def test_04_play_midi(self):
         buzz = BuzzerPlayer()
         if hasattr(buzz, 'play_midi'):
             buzz.play_midi(self.sample_file, track=1)
-            
-    def test_05_play_rtttl(self):
+
+    @staticmethod
+    def test_05_play_rtttl():
         buzz = BuzzerPlayer()
         if hasattr(buzz, 'play_rtttl'):
             buzz.play_rtttl(songs.find('Entertainer'))

test/test_buzzer.py

@@ -6,9 +6,11 @@
 #import logging
 #logging.basicConfig(level=logging.DEBUG)
 
+
 def isclose(a, b, rel_tol=1e-09, abs_tol=0.0):
     return abs(a-b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol)
 
+
 class TestMidi(unittest.TestCase):
     sample_file = os.path.join(os.path.dirname(__file__), 'Zlilmehuvan.mid')
 
@@ -17,18 +19,27 @@ def assertSequenceEqual(self, it1, it2):
 
     def test_01_init_no_file(self):
         with self.assertRaises(OSError):
-            m =  MidiFile('nonexist')
+            m = MidiFile('nonexist')
 
     def test_02_init(self):
-        m =  MidiFile(self.sample_file)
+        m = MidiFile(self.sample_file)
 
     def test_03_read_track(self):
-        m =  MidiFile(self.sample_file)
+        m = MidiFile(self.sample_file)
         notes = m.read_track(1)
         for n, expected in zip(notes[:4], (('r', 0.4343891402714933), ('c2', 1.116279069767441), ('r', 48.00000000000171), ('f1', 1.499999999999998))):
             self.assertEqual(n[0], expected[0])
             self.assertTrue(isclose(n[1], n[1]))
 
+    def test_04_midi_offs(self):
+        midi_file = os.path.join(os.path.dirname(__file__), 'clock_tower_short.mid')
+        m = MidiFile(midi_file)
+        notes = m.read_track(1)
+        for n, expected in zip(notes[:4], (('r', 2.2857142857142856), ('f#5', 4.0), ('r', 8.0), ('d5', 4.0))):
+            self.assertEqual(n[0], expected[0])
+            self.assertTrue(isclose(n[1], n[1]))
+
+
 if __name__ == "__main__":
     unittest.main()