From 6125ae21e75ff5d60f1f3aec36da0a377d5199e1 Mon Sep 17 00:00:00 2001 From: Jeff Lee Date: Mon, 12 Jun 2017 11:14:47 -0700 Subject: [PATCH] sdk/node/test: ensure callback support for all query methods Closes #1304 --- generated/rev/RevId.java | 2 +- generated/rev/revid.go | 2 +- generated/rev/revid.js | 2 +- generated/rev/revid.rb | 2 +- sdk/node/test/accessTokens.js | 15 ++++++++++++--- sdk/node/test/accounts.js | 21 +++++++++++++++++---- sdk/node/test/assets.js | 21 +++++++++++++++++---- sdk/node/test/authorizationGrants.js | 10 ++++------ sdk/node/test/balances.js | 16 ++++++++++++++++ sdk/node/test/mockHsmKeys.js | 15 ++++++++++----- sdk/node/test/transactionFeeds.js | 15 ++++++++++----- sdk/node/test/transactions.js | 23 ++++++++++++++--------- sdk/node/test/unspentOutputs.js | 14 ++++++++++++++ 13 files changed, 118 insertions(+), 40 deletions(-) diff --git a/generated/rev/RevId.java b/generated/rev/RevId.java index 829a0a79bc..c0175aa9f7 100644 --- a/generated/rev/RevId.java +++ b/generated/rev/RevId.java @@ -1,4 +1,4 @@ public final class RevId { - public final String Id = "main/rev3229"; + public final String Id = "main/rev3230"; } diff --git a/generated/rev/revid.go b/generated/rev/revid.go index 1ea3aa9909..15254ddc94 100644 --- a/generated/rev/revid.go +++ b/generated/rev/revid.go @@ -1,3 +1,3 @@ package rev -const ID string = "main/rev3229" +const ID string = "main/rev3230" diff --git a/generated/rev/revid.js b/generated/rev/revid.js index 991aab9d0b..2927731827 100644 --- a/generated/rev/revid.js +++ b/generated/rev/revid.js @@ -1,2 +1,2 @@ -export const rev_id = "main/rev3229" +export const rev_id = "main/rev3230" diff --git a/generated/rev/revid.rb b/generated/rev/revid.rb index a5022398df..b674837b5f 100644 --- a/generated/rev/revid.rb +++ b/generated/rev/revid.rb @@ -1,4 +1,4 @@ module Chain::Rev - ID = "main/rev3229".freeze + ID = "main/rev3230".freeze end diff --git a/sdk/node/test/accessTokens.js b/sdk/node/test/accessTokens.js index ae58dbdc46..f89a2b65af 100644 --- a/sdk/node/test/accessTokens.js +++ b/sdk/node/test/accessTokens.js @@ -168,25 +168,34 @@ describe('Access token', () => { // tested in the promises test. describe('Callback support', () => { - it('Access token creation', (done) => { + it('create', (done) => { client.accessTokens.create( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Access token deletion', (done) => { + it('delete', (done) => { client.accessTokens.delete( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Access token query', (done) => { + it('query', done => { client.accessTokens.query( {}, // intentionally blank () => done() // intentionally ignore errors ) }) + + it('queryAll', done => { + client.accessTokens.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done + ) + }) + }) }) diff --git a/sdk/node/test/accounts.js b/sdk/node/test/accounts.js index e04a0fb5f0..42b5ec4580 100644 --- a/sdk/node/test/accounts.js +++ b/sdk/node/test/accounts.js @@ -147,32 +147,45 @@ describe('Account', () => { // tested in the promises test. describe('Callback support', () => { - it('Single account creation', (done) => { + it('create', (done) => { client.accounts.create( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Batch account creation', (done) => { + it('createBatch', (done) => { client.accounts.createBatch( [{}, {}], // intentionally blank () => done() // intentionally ignore errors ) }) - it('Single account tags update', (done) => { + it('updateTags', (done) => { client.accounts.updateTags( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Batch account tags update', (done) => { + it('updateTagsBatch', (done) => { client.accounts.updateTagsBatch( [{}, {}], // intentionally blank () => done() // intentionally ignore errors ) }) + + it('query', done => { + client.accounts.query({}, done) + }) + + it('queryAll', done => { + client.accounts.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done + ) + }) + }) }) diff --git a/sdk/node/test/assets.js b/sdk/node/test/assets.js index 004030b5cb..c56a9dda9e 100644 --- a/sdk/node/test/assets.js +++ b/sdk/node/test/assets.js @@ -147,32 +147,45 @@ describe('Asset', () => { // tested in the promises test. describe('Callback support', () => { - it('Single asset creation', (done) => { + it('create', (done) => { client.assets.create( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Batch asset creation', (done) => { + it('createBatch', (done) => { client.assets.createBatch( [{}, {}], // intentionally blank () => done() // intentionally ignore errors ) }) - it('Single asset tags update', (done) => { + it('updateTags', (done) => { client.assets.updateTags( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Batch asset tags update', (done) => { + it('updateTagsBatch', (done) => { client.assets.updateTagsBatch( [{}, {}], // intentionally blank () => done() // intentionally ignore errors ) }) + + it('query', done => { + client.assets.query({}, done) + }) + + it('queryAll', done => { + client.assets.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done + ) + }) + }) }) diff --git a/sdk/node/test/authorizationGrants.js b/sdk/node/test/authorizationGrants.js index b99f65e0a9..1d5ed3fabd 100644 --- a/sdk/node/test/authorizationGrants.js +++ b/sdk/node/test/authorizationGrants.js @@ -88,24 +88,22 @@ describe('Authorization grant', () => { // tested in the promises test. describe('Callback support', () => { - it('Authorization grant creation', (done) => { + it('create', (done) => { client.authorizationGrants.create( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Authorization grant deletion', (done) => { + it('delete', (done) => { client.authorizationGrants.delete( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Authorization grant list', (done) => { - client.authorizationGrants.list( - () => done() // intentionally ignore errors - ) + it('list', (done) => { + client.authorizationGrants.list(done) }) }) }) diff --git a/sdk/node/test/balances.js b/sdk/node/test/balances.js index 71300388e5..048a0dc114 100644 --- a/sdk/node/test/balances.js +++ b/sdk/node/test/balances.js @@ -73,4 +73,20 @@ describe('Balance', () => { }) }) + describe('Callback support', () => { + + it('query', done => { + client.balances.query({}, done) + }) + + it('queryAll', done => { + client.balances.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done + ) + }) + + }) + }) diff --git a/sdk/node/test/mockHsmKeys.js b/sdk/node/test/mockHsmKeys.js index 1d1860a993..016adec1a2 100644 --- a/sdk/node/test/mockHsmKeys.js +++ b/sdk/node/test/mockHsmKeys.js @@ -60,17 +60,22 @@ describe('MockHSM key', () => { // tested in the promises test. describe('Callback style', () => { - it('Key creation', (done) => { + it('create', (done) => { client.mockHsm.keys.create( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Key querying', (done) => { - client.mockHsm.keys.query( - {}, // intentionally blank - () => done() // intentionally ignore errors + it('query', done => { + client.mockHsm.keys.query({}, done) + }) + + it('queryAll', done => { + client.mockHsm.keys.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done ) }) diff --git a/sdk/node/test/transactionFeeds.js b/sdk/node/test/transactionFeeds.js index f965332d06..c4bebb40d4 100644 --- a/sdk/node/test/transactionFeeds.js +++ b/sdk/node/test/transactionFeeds.js @@ -136,17 +136,22 @@ describe('Transaction feed', () => { // These just test that the callback is engaged correctly. Behavior is // tested in the promises test. describe('Callback support', () => { - it('Creation', done => { + it('create', done => { client.transactionFeeds.create( {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Querying', done => { - client.transactionFeeds.query( - {}, // intentionally blank - () => done() // intentionally ignore errors + it('query', done => { + client.transactionFeeds.query({}, done) + }) + + it('queryAll', done => { + client.transactionFeeds.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done ) }) }) diff --git a/sdk/node/test/transactions.js b/sdk/node/test/transactions.js index 7b20ce0f1c..38ebefbda5 100644 --- a/sdk/node/test/transactions.js +++ b/sdk/node/test/transactions.js @@ -223,26 +223,31 @@ describe('Transaction', () => { // tested in the promises test. describe('Callback support', () => { - it('Transaction query', (done) => { - client.transactions.query( - {}, // intentionally blank - () => done() // intentionally ignore errors - ) - }) - - it('Transaction build', (done) => { + it('build', (done) => { client.transactions.build( () => {}, // intentionally blank () => done() // intentionally ignore errors ) }) - it('Transaction submit', (done) => { + it('submit', (done) => { client.transactions.submit( {}, // intentionally blank () => done() // intentionally ignore errors ) }) + it('query', done => { + client.transactions.query({}, done) + }) + + it('queryAll', done => { + client.transactions.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done + ) + }) + }) }) diff --git a/sdk/node/test/unspentOutputs.js b/sdk/node/test/unspentOutputs.js index d5c52586a5..1bb555f67f 100644 --- a/sdk/node/test/unspentOutputs.js +++ b/sdk/node/test/unspentOutputs.js @@ -71,4 +71,18 @@ describe('Unspent output', () => { }) }) + describe('Callback support', () => { + it('query', done => { + client.unspentOutputs.query({}, done) + }) + + it('queryAll', done => { + client.unspentOutputs.queryAll( + {}, + (t, next, queryDone) => queryDone(), + done + ) + }) + }) + })