Skip to content

Commit

Permalink
tests: replace deprecated assert.deepEqual with deep-equal
Browse files Browse the repository at this point in the history
  • Loading branch information
dougwilson committed Oct 11, 2018
1 parent a65a2a6 commit ba9238b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -16,6 +16,7 @@
],
"repository": "jshttp/range-parser",
"devDependencies": {
"deep-equal": "1.0.1",
"eslint": "4.19.1",
"eslint-config-standard": "11.0.0",
"eslint-plugin-markdown": "1.0.0-beta.8",
Expand Down
37 changes: 19 additions & 18 deletions test/range-parser.js
@@ -1,5 +1,6 @@

var assert = require('assert')
var deepEqual = require('deep-equal')
var parse = require('..')

describe('parseRange(len, str)', function () {
Expand All @@ -22,97 +23,97 @@ describe('parseRange(len, str)', function () {
var range = parse(1000, 'bytes=0-499')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 0, end: 499 })
deepEqual(range[0], { start: 0, end: 499 })
})

it('should cap end at size', function () {
var range = parse(200, 'bytes=0-499')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 0, end: 199 })
deepEqual(range[0], { start: 0, end: 199 })
})

it('should parse str', function () {
var range = parse(1000, 'bytes=40-80')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 40, end: 80 })
deepEqual(range[0], { start: 40, end: 80 })
})

it('should parse str asking for last n bytes', function () {
var range = parse(1000, 'bytes=-400')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 600, end: 999 })
deepEqual(range[0], { start: 600, end: 999 })
})

it('should parse str with only start', function () {
var range = parse(1000, 'bytes=400-')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 400, end: 999 })
deepEqual(range[0], { start: 400, end: 999 })
})

it('should parse "bytes=0-"', function () {
var range = parse(1000, 'bytes=0-')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 0, end: 999 })
deepEqual(range[0], { start: 0, end: 999 })
})

it('should parse str with no bytes', function () {
var range = parse(1000, 'bytes=0-0')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 0, end: 0 })
deepEqual(range[0], { start: 0, end: 0 })
})

it('should parse str asking for last byte', function () {
var range = parse(1000, 'bytes=-1')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 999, end: 999 })
deepEqual(range[0], { start: 999, end: 999 })
})

it('should parse str with multiple ranges', function () {
var range = parse(1000, 'bytes=40-80,81-90,-1')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 3)
assert.deepEqual(range[0], { start: 40, end: 80 })
assert.deepEqual(range[1], { start: 81, end: 90 })
assert.deepEqual(range[2], { start: 999, end: 999 })
deepEqual(range[0], { start: 40, end: 80 })
deepEqual(range[1], { start: 81, end: 90 })
deepEqual(range[2], { start: 999, end: 999 })
})

it('should parse str with some invalid ranges', function () {
var range = parse(200, 'bytes=0-499,1000-,500-999')
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 0, end: 199 })
deepEqual(range[0], { start: 0, end: 199 })
})

it('should parse non-byte range', function () {
var range = parse(1000, 'items=0-5')
assert.strictEqual(range.type, 'items')
assert.strictEqual(range.length, 1)
assert.deepEqual(range[0], { start: 0, end: 5 })
deepEqual(range[0], { start: 0, end: 5 })
})

describe('when combine: true', function () {
it('should combine overlapping ranges', function () {
var range = parse(150, 'bytes=0-4,90-99,5-75,100-199,101-102', { combine: true })
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 2)
assert.deepEqual(range[0], { start: 0, end: 75 })
assert.deepEqual(range[1], { start: 90, end: 149 })
deepEqual(range[0], { start: 0, end: 75 })
deepEqual(range[1], { start: 90, end: 149 })
})

it('should retain original order', function () {
var range = parse(150, 'bytes=-1,20-100,0-1,101-120', { combine: true })
assert.strictEqual(range.type, 'bytes')
assert.strictEqual(range.length, 3)
assert.deepEqual(range[0], { start: 149, end: 149 })
assert.deepEqual(range[1], { start: 20, end: 120 })
assert.deepEqual(range[2], { start: 0, end: 1 })
deepEqual(range[0], { start: 149, end: 149 })
deepEqual(range[1], { start: 20, end: 120 })
deepEqual(range[2], { start: 0, end: 1 })
})
})
})

0 comments on commit ba9238b

Please sign in to comment.