UMP constructor fix

jazz-soft · Jun 26, 2023 · 3109ec8 · 3109ec8
1 parent 48367b7
commit 3109ec8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/javascript/JZZ.js b/javascript/JZZ.js
@@ -2850,15 +2850,15 @@
   // JZZ.UMP
 
   function UMP(arg) {
-    var self = this instanceof UMP ? this : self = new UMP([0, 0, 0, 0]);
+    var self = this instanceof UMP ? this : self = new UMP();
     var i;
     if (arg instanceof UMP) {
       self._from = arg._from.slice();
       _for(arg, function(i) { if (i != '_from') self[i] = arg[i]; });
       return self;
     }
     else self._from = [];
-    if (typeof arg == 'undefined') return self;
+    if (typeof arg == 'undefined') arg = [0, 0, 0, 0];
     var arr = arg instanceof Array ? arg : arguments;
     self.length = 0;
     for (i = 0; i < arr.length; i++) {

diff --git a/test/common.js b/test/common.js
@@ -765,14 +765,24 @@ describe('MIDI messages', function() {
 
 describe('UMP messages', function() {
   it('throw', function() {
+    assert.throws(function() { JZZ.UMP(1); });
     assert.throws(function() { JZZ.UMP([1]); });
     assert.throws(function() { JZZ.UMP([1, 2, 3, 'error']); });
     assert.throws(function() { JZZ.UMP([1, 2, 3, 4, 5, 6, 7, 8]); });
   });
   it('noop', function() {
+    var s = '00000000';
     var msg =JZZ.UMP.noop();
-    assert.equal(msg.toString(), '00000000');
     assert.equal(typeof msg.getGroup(), 'undefined');
+    assert.equal(msg.toString(), s);
+    msg = new JZZ.UMP(msg);
+    assert.equal(msg.toString(), s);
+    msg = new JZZ.UMP();
+    assert.equal(msg.toString(), s);
+    msg = new JZZ.UMP([0, 0, 0, 0]);
+    assert.equal(msg.toString(), s);
+    msg = new JZZ.UMP(0, 0, 0, 0);
+    assert.equal(msg.toString(), s);
   });
   it('noteOn', function() {
     var s = '21923d7f';
@@ -833,6 +843,9 @@ describe('UMP messages', function() {
   it('sxGS', function() {
     assert.equal(JZZ.UMP.sxGS(5).toString(), '3516417f 42124000,35337f00 41000000');
   });
+  it('sxMidiSoft', function() {
+    assert.equal(JZZ.UMP.sxMidiSoft(5, 4, 'karaoke...').toString(), '35160020 2400046b,35266172 616f6b65,35332e2e 2e000000');
+  });
 });
 
 describe('SMF events', function() {