@@ -166,7 +166,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
166
166
} ;
167
167
const limitToLastQueryString = lengthPrefixedString ( limitToLastQuery ) ;
168
168
169
- async function getAllElement (
169
+ async function getAllElements (
170
170
bundle : BundleReader
171
171
) : Promise < SizedBundleElement [ ] > {
172
172
const result : SizedBundleElement [ ] = [ ] ;
@@ -194,7 +194,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
194
194
) ;
195
195
}
196
196
197
- async function parseThroughBundle (
197
+ async function generateBundleAndParse (
198
198
bundleString : string ,
199
199
bytesPerRead : number ,
200
200
validMeta = false
@@ -208,7 +208,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
208
208
expect ( await bundle . getMetadata ( ) ) . to . deep . equal ( meta . metadata ) ;
209
209
}
210
210
211
- await getAllElement ( bundle ) ;
211
+ await getAllElements ( bundle ) ;
212
212
}
213
213
214
214
it ( 'reads with query and doc with bytesPerRead ' + bytesPerRead , async ( ) => {
@@ -224,7 +224,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
224
224
225
225
expect ( await bundle . getMetadata ( ) ) . to . deep . equal ( meta . metadata ) ;
226
226
227
- const actual = await getAllElement ( bundle ) ;
227
+ const actual = await getAllElements ( bundle ) ;
228
228
expect ( actual . length ) . to . equal ( 4 ) ;
229
229
verifySizedElement ( actual [ 0 ] , limitQuery , limitQueryString ) ;
230
230
verifySizedElement ( actual [ 1 ] , limitToLastQuery , limitToLastQueryString ) ;
@@ -246,7 +246,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
246
246
) ;
247
247
const bundle = new BundleReader ( bundleStream ) ;
248
248
249
- const actual = await getAllElement ( bundle ) ;
249
+ const actual = await getAllElements ( bundle ) ;
250
250
expect ( actual . length ) . to . equal ( 5 ) ;
251
251
verifySizedElement ( actual [ 0 ] , doc1Meta , doc1MetaString ) ;
252
252
verifySizedElement ( actual [ 1 ] , doc1 , doc1String ) ;
@@ -270,7 +270,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
270
270
271
271
expect ( await bundle . getMetadata ( ) ) . to . deep . equal ( meta . metadata ) ;
272
272
273
- const actual = await getAllElement ( bundle ) ;
273
+ const actual = await getAllElements ( bundle ) ;
274
274
expect ( actual . length ) . to . equal ( 2 ) ;
275
275
verifySizedElement ( actual [ 0 ] , doc1Meta , doc1MetaString ) ;
276
276
verifySizedElement ( actual [ 1 ] , doc1 , doc1String ) ;
@@ -286,7 +286,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
286
286
287
287
expect ( await bundle . getMetadata ( ) ) . to . deep . equal ( meta . metadata ) ;
288
288
289
- const actual = await getAllElement ( bundle ) ;
289
+ const actual = await getAllElements ( bundle ) ;
290
290
expect ( actual . length ) . to . equal ( 3 ) ;
291
291
verifySizedElement ( actual [ 0 ] , noDocMeta , noDocMetaString ) ;
292
292
verifySizedElement ( actual [ 1 ] , doc1Meta , doc1MetaString ) ;
@@ -301,7 +301,7 @@ function genericBundleReadingTests(bytesPerRead: number): void {
301
301
302
302
expect ( await bundle . getMetadata ( ) ) . to . deep . equal ( meta . metadata ) ;
303
303
304
- const actual = await getAllElement ( bundle ) ;
304
+ const actual = await getAllElements ( bundle ) ;
305
305
expect ( actual . length ) . to . equal ( 0 ) ;
306
306
}
307
307
) ;
@@ -310,28 +310,32 @@ function genericBundleReadingTests(bytesPerRead: number): void {
310
310
'throws with ill-formatted bundle with bytesPerRead ' + bytesPerRead ,
311
311
async ( ) => {
312
312
await expect (
313
- parseThroughBundle ( 'metadata: "no length prefix"' , bytesPerRead )
313
+ generateBundleAndParse ( 'metadata: "no length prefix"' , bytesPerRead )
314
314
) . to . be . rejectedWith (
315
315
'Reached the end of bundle when a length string is expected.'
316
316
) ;
317
317
318
318
await expect (
319
- parseThroughBundle ( '{metadata: "no length prefix"}' , bytesPerRead )
319
+ generateBundleAndParse ( '{metadata: "no length prefix"}' , bytesPerRead )
320
320
) . to . be . rejectedWith ( 'Unexpected end of JSON input' ) ;
321
321
322
322
await expect (
323
- parseThroughBundle ( metaString + 'invalid-string' , bytesPerRead , true )
323
+ generateBundleAndParse (
324
+ metaString + 'invalid-string' ,
325
+ bytesPerRead ,
326
+ true
327
+ )
324
328
) . to . be . rejectedWith (
325
329
'Reached the end of bundle when a length string is expected.'
326
330
) ;
327
331
328
332
await expect (
329
- parseThroughBundle ( '1' + metaString , bytesPerRead )
333
+ generateBundleAndParse ( '1' + metaString , bytesPerRead )
330
334
) . to . be . rejectedWith ( 'Reached the end of bundle when more is expected.' ) ;
331
335
332
336
// First element is not BundleMetadata.
333
337
await expect (
334
- parseThroughBundle ( doc1MetaString + doc1String , bytesPerRead )
338
+ generateBundleAndParse ( doc1MetaString + doc1String , bytesPerRead )
335
339
) . to . be . rejectedWith ( 'The first element of the bundle is not a metadata' ) ;
336
340
}
337
341
) ;
0 commit comments