Skip to content

Commit 3f0541c

Browse files
author
AJ Keller
committed
Fix up linting
1 parent d7dbdd1 commit 3f0541c

File tree

3 files changed

+71
-65
lines changed

3 files changed

+71
-65
lines changed

‎openBCISimulator.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
'use strict';
2-
var EventEmitter = require('events').EventEmitter;
3-
var util = require('util');
4-
var stream = require('stream');
2+
const EventEmitter = require('events').EventEmitter;
3+
const util = require('util');
4+
const stream = require('stream');
55

6-
var openBCISample = require('./openBCIUtilities');
7-
var k = require('./openBCIConstants');
8-
var now = require('performance-now');
6+
const openBCISample = require('./openBCIUtilities');
7+
const k = require('./openBCIConstants');
8+
const now = require('performance-now');
9+
const Buffer = require('safe-buffer').Buffer;
910

10-
var _options = {
11+
const _options = {
1112
accel: true,
1213
alpha: true,
1314
boardFailure: false,
@@ -25,7 +26,7 @@ var _options = {
2526
};
2627

2728
function OpenBCISimulator (portName, options) {
28-
options = (typeof options !== 'function') && options || {};
29+
options = options || {};
2930
var opts = {};
3031

3132
stream.Stream.call(this);
@@ -186,7 +187,8 @@ OpenBCISimulator.prototype._output = function (dataBuffer) {
186187

187188
OpenBCISimulator.prototype.write = function (data, callback) {
188189
if (!this.connected) {
189-
if (callback) callback('Not connected');
190+
/* istanbul ignore else */
191+
if (callback) callback(Error('Not connected'));
190192
else throw new Error('Not connected!');
191193
return;
192194
}
@@ -298,7 +300,7 @@ OpenBCISimulator.prototype.close = function (callback) {
298300
this.emit('close');
299301
if (callback) callback();
300302
} else {
301-
if (callback) callback('not connected');
303+
if (callback) callback(Error('Not connected'));
302304
}
303305
};
304306

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"openbci",
1313
"openbci-node",
1414
"ganglion",
15+
"wifi",
1516
"cyton",
1617
"utilities"
1718
],

‎test/openBCISimulator-test.js‎

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ const bluebirdChecks = require('./bluebirdChecks');
33
const bufferEqual = require('buffer-equal');
44
const chai = require('chai');
55
const chaiAsPromised = require(`chai-as-promised`);
6+
const dirtyChai = require('dirty-chai');
67
const expect = chai.expect;
78
const should = chai.should(); // eslint-disable-line no-unused-vars
89
const OpenBCISimulator = require('../openBCISimulator');
910
const openBCIUtilities = require('../openBCIUtilities');
1011
const k = require('../openBCIConstants');
12+
const Buffer = require('safe-buffer').Buffer;
1113

1214
chai.use(chaiAsPromised);
15+
chai.use(dirtyChai);
1316

1417
describe('openBCISimulator', function () {
1518
this.timeout(4000);
@@ -28,17 +31,17 @@ describe('openBCISimulator', function () {
2831
});
2932
it('constructs with the correct default options', function () {
3033
simulator = new OpenBCISimulator();
31-
expect(simulator.options.accel).to.be.true;
32-
expect(simulator.options.alpha).to.be.true;
33-
expect(simulator.options.boardFailure).to.be.false;
34-
expect(simulator.options.daisy).to.be.false;
35-
expect(simulator.options.daisyCanBeAttached).to.be.true;
34+
expect(simulator.options.accel).to.be.true();
35+
expect(simulator.options.alpha).to.be.true();
36+
expect(simulator.options.boardFailure).to.be.false();
37+
expect(simulator.options.daisy).to.be.false();
38+
expect(simulator.options.daisyCanBeAttached).to.be.true();
3639
expect(simulator.options.drift).to.equal(0);
3740
expect(simulator.options.firmwareVersion).to.equal(k.OBCIFirmwareV1);
3841
expect(simulator.options.lineNoise).to.equal(k.OBCISimulatorLineNoiseHz60);
3942
expect(simulator.options.sampleRate).to.equal(k.OBCISampleRate250);
40-
expect(simulator.options.serialPortFailure).to.be.false;
41-
expect(simulator.options.verbose).to.be.false;
43+
expect(simulator.options.serialPortFailure).to.be.false();
44+
expect(simulator.options.verbose).to.be.false();
4245
expect(simulator.options.fragmentation).to.equal(k.OBCISimulatorFragmentationNone);
4346
expect(simulator.options.latencyTime).to.equal(16);
4447
expect(simulator.options.bufferSize).to.equal(4096);
@@ -47,7 +50,7 @@ describe('openBCISimulator', function () {
4750
simulator = new OpenBCISimulator(portName, {
4851
daisy: true
4952
});
50-
expect(simulator.options.daisy).to.be.true;
53+
expect(simulator.options.daisy).to.be.true();
5154
});
5255
it('should set the correct sample rate in daisy mode, if no sampleRate is provided', function () {
5356
simulator = new OpenBCISimulator(portName, {
@@ -60,7 +63,7 @@ describe('openBCISimulator', function () {
6063
daisy: true,
6164
sampleRate: 20
6265
});
63-
expect(simulator.options.daisy).to.be.true;
66+
expect(simulator.options.daisy).to.be.true();
6467
expect(simulator.options.sampleRate).to.equal(20);
6568
});
6669
it('should be able to put into firmware version 2', function () {
@@ -73,13 +76,13 @@ describe('openBCISimulator', function () {
7376
simulator = new OpenBCISimulator(portName, {
7477
boardFailure: true
7578
});
76-
expect(simulator.options.boardFailure).to.be.true;
79+
expect(simulator.options.boardFailure).to.be.true();
7780
});
7881
it('should be able to simulate serial port failure', function () {
7982
simulator = new OpenBCISimulator(portName, {
8083
serialPortFailure: true
8184
});
82-
expect(simulator.options.serialPortFailure).to.be.true;
85+
expect(simulator.options.serialPortFailure).to.be.true();
8386
});
8487
it('can turn 50Hz line noise on', function () {
8588
simulator = new OpenBCISimulator(portName, {
@@ -97,13 +100,13 @@ describe('openBCISimulator', function () {
97100
simulator = new OpenBCISimulator(portName, {
98101
alpha: false
99102
});
100-
expect(simulator.options.alpha).to.be.false;
103+
expect(simulator.options.alpha).to.be.false();
101104
});
102105
it('should be able to not use the accel', function () {
103106
simulator = new OpenBCISimulator(portName, {
104107
accel: false
105108
});
106-
expect(simulator.options.accel).to.be.false;
109+
expect(simulator.options.accel).to.be.false();
107110
});
108111
it('should be able to set positive drift', function () {
109112
simulator = new OpenBCISimulator(portName, {
@@ -197,7 +200,7 @@ describe('openBCISimulator', function () {
197200
// Now this data should be the time sync up packet
198201
expect(data[k.OBCIPacketPositionStopByte]).to.equal(openBCIUtilities.makeTailByteFromPacketType(k.OBCIStreamPacketAccelTimeSyncSet));
199202
// Expect flag to be down
200-
expect(simulator.sendSyncSetPacket).to.be.false;
203+
expect(simulator.sendSyncSetPacket).to.be.false();
201204
} else if (sampleCounter >= sampleTestSize) {
202205
simulator.write(k.OBCIStreamStop);
203206
simulator.removeListener('data', newDataFunc);
@@ -230,7 +233,7 @@ describe('openBCISimulator', function () {
230233
// Now this data should be the time sync up packet
231234
expect(data[k.OBCIPacketPositionStopByte]).to.equal(openBCIUtilities.makeTailByteFromPacketType(k.OBCIStreamPacketRawAuxTimeSyncSet));
232235
// Expect flag to be down
233-
expect(simulator.sendSyncSetPacket).to.be.false;
236+
expect(simulator.sendSyncSetPacket).to.be.false();
234237
} else if (sampleCounter >= sampleTestSize) {
235238
simulator.write(k.OBCIStreamStop);
236239
simulator.removeListener('data', newDataFunc);
@@ -355,8 +358,8 @@ describe('openBCISimulator', function () {
355358
var dataEmit = data => {
356359
buf = Buffer.concat([buf, data]);
357360
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
358-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
359-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
361+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
362+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
360363
expect(buf[buf.length - 4]).to.equal(0);
361364
simulator.removeListener('data', dataEmit);
362365
done();
@@ -375,8 +378,8 @@ describe('openBCISimulator', function () {
375378
var dataEmit = data => {
376379
buf = Buffer.concat([buf, data]);
377380
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
378-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false;
379-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true;
381+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false();
382+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true();
380383
expect(buf[buf.length - 4]).to.equal(9);
381384
simulator.removeListener('data', dataEmit);
382385
done();
@@ -395,8 +398,8 @@ describe('openBCISimulator', function () {
395398
var dataEmit = data => {
396399
buf = Buffer.concat([buf, data]);
397400
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
398-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
399-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
401+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
402+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
400403
expect(buf[buf.length - 4]).to.equal(newChanNum);
401404
expect(simulator.channelNumber).to.equal(newChanNum);
402405
expect(simulator.hostChannelNumber).to.equal(newChanNum);
@@ -415,8 +418,8 @@ describe('openBCISimulator', function () {
415418
var dataEmit = data => {
416419
buf = Buffer.concat([buf, data]);
417420
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
418-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false;
419-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true;
421+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false();
422+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true();
420423
simulator.removeListener('data', dataEmit);
421424
done();
422425
}
@@ -433,8 +436,8 @@ describe('openBCISimulator', function () {
433436
var dataEmit = data => {
434437
buf = Buffer.concat([buf, data]);
435438
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
436-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false;
437-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true;
439+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false();
440+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true();
438441
simulator.removeListener('data', dataEmit);
439442
done();
440443
}
@@ -453,10 +456,10 @@ describe('openBCISimulator', function () {
453456
var dataEmit = data => {
454457
buf = Buffer.concat([buf, data]);
455458
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
456-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
457-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
459+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
460+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
458461
expect(buf[buf.length - 4]).to.equal(newHostChannelNumber);
459-
expect(simulator.options.boardFailure).to.be.true;
462+
expect(simulator.options.boardFailure).to.be.true();
460463
expect(simulator.channelNumber).to.equal(systemChannelNumber);
461464
expect(simulator.hostChannelNumber).to.equal(newHostChannelNumber);
462465
simulator.removeListener('data', dataEmit);
@@ -477,10 +480,10 @@ describe('openBCISimulator', function () {
477480
var dataEmit = data => {
478481
buf = Buffer.concat([buf, data]);
479482
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
480-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
481-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
483+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
484+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
482485
expect(buf[buf.length - 4]).to.equal(systemChannelNumber);
483-
expect(simulator.options.boardFailure).to.be.false;
486+
expect(simulator.options.boardFailure).to.be.false();
484487
expect(simulator.channelNumber).to.equal(systemChannelNumber);
485488
expect(simulator.hostChannelNumber).to.equal(systemChannelNumber);
486489
simulator.removeListener('data', dataEmit);
@@ -498,8 +501,8 @@ describe('openBCISimulator', function () {
498501
var dataEmit = data => {
499502
buf = Buffer.concat([buf, data]);
500503
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
501-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false;
502-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true;
504+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false();
505+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true();
503506
simulator.removeListener('data', dataEmit);
504507
done();
505508
}
@@ -518,8 +521,8 @@ describe('openBCISimulator', function () {
518521
var dataEmit = data => {
519522
buf = Buffer.concat([buf, data]);
520523
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
521-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
522-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
524+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
525+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
523526
expect(buf[buf.length - 4]).to.equal(expectedPollTime);
524527
simulator.removeListener('data', dataEmit);
525528
done();
@@ -537,8 +540,8 @@ describe('openBCISimulator', function () {
537540
var dataEmit = data => {
538541
buf = Buffer.concat([buf, data]);
539542
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
540-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false;
541-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true;
543+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false();
544+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true();
542545
simulator.removeListener('data', dataEmit);
543546
done();
544547
}
@@ -556,8 +559,8 @@ describe('openBCISimulator', function () {
556559
var dataEmit = data => {
557560
buf = Buffer.concat([buf, data]);
558561
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
559-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
560-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
562+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
563+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
561564
expect(buf[buf.length - 4]).to.equal(newPollTime);
562565
simulator.removeListener('data', dataEmit);
563566
done();
@@ -575,8 +578,8 @@ describe('openBCISimulator', function () {
575578
var dataEmit = data => {
576579
buf = Buffer.concat([buf, data]);
577580
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
578-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false;
579-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true;
581+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false();
582+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true();
580583
simulator.removeListener('data', dataEmit);
581584
done();
582585
}
@@ -592,8 +595,8 @@ describe('openBCISimulator', function () {
592595
var dataEmit = data => {
593596
buf = Buffer.concat([buf, data]);
594597
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
595-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
596-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
598+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
599+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
597600
var eotBuf = new Buffer('$$$');
598601
var newBaudRateBuf;
599602
for (var i = buf.length; i > 3; i--) {
@@ -620,8 +623,8 @@ describe('openBCISimulator', function () {
620623
var dataEmit = data => {
621624
buf = Buffer.concat([buf, data]);
622625
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
623-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
624-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
626+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
627+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
625628
simulator.removeListener('data', dataEmit);
626629
done();
627630
}
@@ -638,8 +641,8 @@ describe('openBCISimulator', function () {
638641
var dataEmit = data => {
639642
buf = Buffer.concat([buf, data]);
640643
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
641-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
642-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
644+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
645+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
643646
var eotBuf = new Buffer(`$$$`);
644647
var newBaudRateBuf;
645648
for (var i = buf.length; i > 3; i--) {
@@ -666,8 +669,8 @@ describe('openBCISimulator', function () {
666669
var dataEmit = data => {
667670
buf = Buffer.concat([buf, data]);
668671
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
669-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
670-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
672+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
673+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
671674
simulator.removeListener('data', dataEmit);
672675
done();
673676
}
@@ -684,8 +687,8 @@ describe('openBCISimulator', function () {
684687
var dataEmit = data => {
685688
buf = Buffer.concat([buf, data]);
686689
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
687-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true;
688-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false;
690+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.true();
691+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.false();
689692
simulator.removeListener('data', dataEmit);
690693
done();
691694
}
@@ -702,8 +705,8 @@ describe('openBCISimulator', function () {
702705
var dataEmit = data => {
703706
buf = Buffer.concat([buf, data]);
704707
if (openBCIUtilities.doesBufferHaveEOT(buf)) {
705-
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false;
706-
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true;
708+
expect(openBCIUtilities.isSuccessInBuffer(buf)).to.be.false();
709+
expect(openBCIUtilities.isFailureInBuffer(buf)).to.be.true();
707710
simulator.removeListener('data', dataEmit);
708711
done();
709712
}
@@ -803,7 +806,7 @@ describe('openBCISimulator', function () {
803806
});
804807
it(`should emit the time sync sent command`, function (done) {
805808
simulator.once('data', data => {
806-
expect(openBCIUtilities.isTimeSyncSetConfirmationInBuffer(data)).to.be.true;
809+
expect(openBCIUtilities.isTimeSyncSetConfirmationInBuffer(data)).to.be.true();
807810
done();
808811
});
809812
simulator.write(k.OBCISyncTimeSet, (err, msg) => {
@@ -815,7 +818,7 @@ describe('openBCISimulator', function () {
815818
it(`should set synced to true`, function (done) {
816819
simulator.synced = false;
817820
var newData = data => {
818-
expect(simulator.synced).to.be.true;
821+
expect(simulator.synced).to.be.true();
819822
simulator.removeListener('data', newData);
820823
done();
821824
};

0 commit comments

Comments
 (0)