Skip to content

Fix handling of undefined values for optional call arguments #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
murgatroid99 merged 1 commit into from
Feb 13, 2018
+138 −8
Merged

Fix handling of undefined values for optional call arguments #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions packages/grpc-native-core/src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,13 +513,23 @@ exports.Client = Client;
Client.prototype.makeUnaryRequest = function(method, serialize, deserialize,
argument, metadata, options,
callback) {
if (!(metadata instanceof Metadata)) {
if (options instanceof Function) {
callback = options;
options = metadata;
if (metadata instanceof Metadata) {
options = {};
} else {
options = metadata;
metadata = new Metadata();
}
} else if (metadata instanceof Function) {
callback = metadata;
metadata = new Metadata();
options = {};
}
if (options instanceof Function) {
callback = options;
if (!metadata) {
metadata = new Metadata();
}
if (!options) {
options = {};
}
if (!((metadata instanceof Metadata) &&
Expand Down Expand Up @@ -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)) {
if (options instanceof Function) {
callback = options;
options = metadata;
if (metadata instanceof Metadata) {
options = {};
} else {
options = metadata;
metadata = new Metadata();
}
} else if (metadata instanceof Function) {
callback = metadata;
metadata = new Metadata();
options = {};
}
if (options instanceof Function) {
callback = options;
if (!metadata) {
metadata = new Metadata();
}
if (!options) {
options = {};
}
if (!((metadata instanceof Metadata) &&
Expand Down
110 changes: 110 additions & 0 deletions test/api/surface_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down