grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix handling of undefined values for optional call arguments

This commit is contained in:
murgatroid99 2018-02-12 16:57:48 -08:00
parent 42a15306e1
commit ca2704912c
2 changed files with 140 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/grpc-native-core/src/client.js
View File

@ -513,13 +513,23 @@ exports.Client = Client;
Client.prototype.makeUnaryRequest = function(method, serialize, deserialize,
argument, metadata, options,
callback) {
if (!(metadata instanceof Metadata)) {
callback = options;
options = metadata;
metadata = new Metadata();
}
if (options instanceof Function) {
callback = options;
if (metadata instanceof Metadata) {
options = {};
} else {
options = metadata;
metadata = new Metadata();
}
} else if (metadata instanceof Function) {
callback = metadata;
metadata = new Metadata();
options = {};
}
if (!metadata) {
metadata = new Metadata();
}
if (!options) {
options = {};
}
if (!((metadata instanceof Metadata) &&
@ -599,13 +609,23 @@ Client.prototype.makeUnaryRequest = function(method, serialize, deserialize,
Client.prototype.makeClientStreamRequest = function(method, serialize,
deserialize, metadata,
options, callback) {
if (!(metadata instanceof Metadata)) {
callback = options;
options = metadata;
metadata = new Metadata();
}
if (options instanceof Function) {
callback = options;
if (metadata instanceof Metadata) {
options = {};
} else {
options = metadata;
metadata = new Metadata();
}
} else if (metadata instanceof Function) {
callback = metadata;
metadata = new Metadata();
options = {};
}
if (!metadata) {
metadata = new Metadata();
}
if (!options) {
options = {};
}
if (!((metadata instanceof Metadata) &&

110
test/api/surface_test.js
View File

@ -506,6 +506,116 @@ describe('Echo metadata', function() {
done();
});
});
describe('Call argument handling', function() {
describe('Unary call', function() {
it('Should handle undefined options', function(done) {
var call = client.unary({}, metadata, undefined, function(err, data) {
assert.ifError(err);
});
call.on('metadata', function(metadata) {
assert.deepEqual(metadata.get('key'), ['value']);
done();
});
});
it('Should handle two undefined arguments', function(done) {
var call = client.unary({}, undefined, undefined, function(err, data) {
assert.ifError(err);
});
call.on('metadata', function(metadata) {
done();
});
});
it('Should handle one undefined argument', function(done) {
var call = client.unary({}, undefined, function(err, data) {
assert.ifError(err);
});
call.on('metadata', function(metadata) {
done();
});
});
});
describe('Client stream call', function() {
it('Should handle undefined options', function(done) {
var call = client.clientStream(metadata, undefined, function(err, data) {
assert.ifError(err);
});
call.on('metadata', function(metadata) {
assert.deepEqual(metadata.get('key'), ['value']);
done();
});
call.end();
});
it('Should handle two undefined arguments', function(done) {
var call = client.clientStream(undefined, undefined, function(err, data) {
assert.ifError(err);
});
call.on('metadata', function(metadata) {
done();
});
call.end();
});
it('Should handle one undefined argument', function(done) {
var call = client.clientStream(undefined, function(err, data) {
assert.ifError(err);
});
call.on('metadata', function(metadata) {
done();
});
call.end();
});
});
describe('Server stream call', function() {
it('Should handle undefined options', function(done) {
var call = client.serverStream({}, metadata, undefined);
call.on('data', function() {});
call.on('metadata', function(metadata) {
assert.deepEqual(metadata.get('key'), ['value']);
done();
});
});
it('Should handle two undefined arguments', function(done) {
var call = client.serverStream({}, undefined, undefined);
call.on('data', function() {});
call.on('metadata', function(metadata) {
done();
});
});
it('Should handle one undefined argument', function(done) {
var call = client.serverStream({}, undefined);
call.on('data', function() {});
call.on('metadata', function(metadata) {
done();
});
});
});
describe('Bidi stream call', function() {
it('Should handle undefined options', function(done) {
var call = client.bidiStream(metadata, undefined);
call.on('data', function() {});
call.on('metadata', function(metadata) {
assert.deepEqual(metadata.get('key'), ['value']);
done();
});
call.end();
});
it('Should handle two undefined arguments', function(done) {
var call = client.bidiStream(undefined, undefined);
call.on('data', function() {});
call.on('metadata', function(metadata) {
done();
});
call.end();
});
it('Should handle one undefined argument', function(done) {
var call = client.bidiStream(undefined);
call.on('data', function() {});
call.on('metadata', function(metadata) {
done();
});
call.end();
});
});
});
});
describe('Client malformed response handling', function() {
var server;