Skip to content

Commit b6ad520

Browse files
committed
tests: add error helper method for unit tests
1 parent 6cde9eb commit b6ad520

File tree

2 files changed

+12
-23
lines changed

2 files changed

+12
-23
lines changed

test/FakeServer.js

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,15 @@ function FakeConnection(socket) {
7272
}
7373

7474
FakeConnection.prototype.deny = function deny(message, errno) {
75+
message = message || 'Access Denied';
76+
errno = errno || Errors.ER_ACCESS_DENIED_ERROR;
77+
this.error(message, errno);
78+
};
79+
80+
FakeConnection.prototype.error = function deny(message, errno) {
7581
this._sendPacket(new Packets.ErrorPacket({
76-
message : (message || 'Access Denied'),
77-
errno : (errno || Errors.ER_ACCESS_DENIED_ERROR)
82+
message : (message || 'Error'),
83+
errno : (errno || Errors.ER_UNKNOWN_COM_ERROR)
7884
}));
7985
this._parser.resetPacketNumber();
8086
};
@@ -255,20 +261,11 @@ FakeConnection.prototype._handleQueryPacket = function _handleQueryPacket(packet
255261
}
256262

257263
if (/INVALID/i.test(sql)) {
258-
this._sendPacket(new Packets.ErrorPacket({
259-
errno : Errors.ER_PARSE_ERROR,
260-
message : 'Invalid SQL'
261-
}));
262-
this._parser.resetPacketNumber();
264+
this.error('Invalid SQL', Errors.ER_PARSE_ERROR);
263265
return;
264266
}
265267

266-
this._sendPacket(new Packets.ErrorPacket({
267-
errno : Errors.ER_QUERY_INTERRUPTED,
268-
message : 'Interrupted unknown query'
269-
}));
270-
271-
this._parser.resetPacketNumber();
268+
this.error('Interrupted unknown query', Errors.ER_QUERY_INTERRUPTED);
272269
};
273270

274271
FakeConnection.prototype._parsePacket = function() {
@@ -310,11 +307,7 @@ FakeConnection.prototype._parsePacket = function() {
310307
this.deny('User does not exist');
311308
break;
312309
} else if (packet.database === 'does-not-exist') {
313-
this._sendPacket(new Packets.ErrorPacket({
314-
errno : Errors.ER_BAD_DB_ERROR,
315-
message : 'Database does not exist'
316-
}));
317-
this._parser.resetPacketNumber();
310+
this.error('Database does not exist', Errors.ER_BAD_DB_ERROR);
318311
break;
319312
}
320313

test/unit/connection/test-exception-safety.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,7 @@ server.on('connection', function (conn) {
7373
conn.on('query', function(packet) {
7474
switch (packet.sql) {
7575
case 'INVALID SQL':
76-
this._sendPacket(new common.Packets.ErrorPacket({
77-
errno : common.Errors.ER_PARSE_ERROR,
78-
message : 'Parse error'
79-
}));
80-
this._parser.resetPacketNumber();
76+
this.error('Parse error', common.Errors.ER_PARSE_ERROR);
8177
break;
8278
case 'USE test':
8379
this._sendPacket(new common.Packets.OkPacket());

0 commit comments

Comments
 (0)