update to latest standards

This commit is contained in:
2017-06-09 23:26:23 +02:00
parent 2f8d3f7625
commit 5477911b5e
13 changed files with 318 additions and 460 deletions

1
test/test.d.ts vendored
View File

@ -1 +0,0 @@
import 'typings-test';

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
import 'typings-test'
import { expect, tap } from 'tapbundle'
import taskbuffer = require('../dist/index')
import { expect } from 'smartchai'
import * as q from 'smartq'
// setup some testData to work with
@ -32,7 +32,6 @@ let testPreTask = new taskbuffer.Task({
preTask: testTask
})
// some more tasks to wirj with
let task1 = new taskbuffer.Task({
name: 'Task 1',
@ -71,153 +70,139 @@ let task3 = new taskbuffer.Task({
}
})
// the actual tests
describe('taskbuffer', function () {
describe('.Task', function () {
it('new Task() should return a new task', function () {
testTask = new taskbuffer.Task({ taskFunction: testTaskFunction, preTask: testPreTask })
})
it('testTask should be and instance of Task', function () {
expect(testTask).to.be.instanceof(taskbuffer.Task)
})
it('testTask.idle is true', function () {
if (!testTask.idle) {
throw new Error('testTask.idle is not true')
}
})
it('testTask.running is type boolean and initially false', function () {
expect(testTask.running).to.be.a('boolean')
expect(testTask.running).to.be.false
})
it('testTask.trigger() expect return Promise', function () {
expect(testTask.trigger()).to.be.instanceof(Promise)
})
it('testTask.trigger() returned Promise expect be fullfilled', function (done) {
testTask.trigger()
.then(done)
})
it('expect run a task without pre and afterTask', function (done) {
let localTestTask = new taskbuffer.Task({ taskFunction: testTaskFunction })
localTestTask.trigger().then(done)
})
it('expect run buffered', function (done) {
this.timeout(10000)
let localTestTask = new taskbuffer.Task({
taskFunction: testTaskFunctionTimeout,
buffered: true,
bufferMax: 2
})
localTestTask.trigger()
localTestTask.trigger()
localTestTask.trigger()
localTestTask.trigger().then(() => {
done()
})
})
})
describe('Taskchain', function () {
let testTaskchain
let testTaskArray = [
new taskbuffer.Task({
name: 'task1',
taskFunction: function () {
let done = q.defer()
setTimeout(done.resolve, 2000)
return done.promise
}
}),
new taskbuffer.Task({
name: 'task2',
taskFunction: function () {
let done = q.defer()
setTimeout(done.resolve, 2000)
return done.promise
}
})
]
it('expect run tasks in sequence', function (done) {
this.timeout(5000)
testTaskchain = new taskbuffer.Taskchain({
name: 'Taskchain1',
taskArray: testTaskArray
})
testTaskchain.trigger().then(done)
})
})
describe('taskparallel', function () {
it('expect run in Parallel', function (done) {
this.timeout(7000)
let testTaskparallel = new taskbuffer.Taskparallel({
taskArray: [ task1, task2, task3 ]
})
testTaskparallel.trigger().then(() => {
done()
})
})
})
describe('some flowtests', function () {
let flowTask1 = new taskbuffer.Task({
taskFunction: (x: number) => {
let done = q.defer()
console.log('flowTask1')
console.log(x)
done.resolve(x)
return done.promise
}
})
let flowTaskBuffered = new taskbuffer.Task({
taskFunction: (x: number) => {
let done = q.defer()
console.log('flowTask1')
console.log(x)
done.resolve(x)
return done.promise
},
buffered: true,
bufferMax: 1
})
let flowTask2 = new taskbuffer.Task({
taskFunction: (x: number) => {
let done = q.defer()
console.log('flowTask2')
console.log(x)
done.resolve(x)
return done.promise
},
preTask: flowTask1
})
let flowTask3 = new taskbuffer.Taskchain({
taskArray: [ flowTask1, flowTask2 ]
})
it('should let a value flow through a task', function (done) {
flowTask1.trigger(12).then((x) => {
expect(x).to.equal(12)
done()
}).catch(done)
})
it('should let a values flow between tasks', function (done) {
flowTask2.trigger(12).then((x) => {
expect(x).to.equal(12)
done()
}).catch(done)
})
it('expect let a values flow between tasks when buffered', function (done) {
flowTaskBuffered.trigger(12).then((x) => {
expect(x).to.equal(12)
done()
}).catch(done)
})
it('should let a values flow between tasks in Taskchain', function (done) {
flowTask3.trigger(12).then((x) => {
expect(x).to.equal(12)
done()
}).catch(done)
})
})
tap.test('new Task() should return a new task', async () => {
testTask = new taskbuffer.Task({ taskFunction: testTaskFunction, preTask: testPreTask })
})
tap.test('testTask should be and instance of Task', async () => {
expect(testTask).to.be.instanceof(taskbuffer.Task)
})
tap.test('testTask.idle is true', async () => {
if (!testTask.idle) {
throw new Error('testTask.idle is not true')
}
})
tap.test('testTask.running is type boolean and initially false', async () => {
expect(testTask.running).to.be.a('boolean')
// tslint:disable-next-line:no-unused-expression
expect(testTask.running).to.be.false
})
tap.test('testTask.trigger() expect return Promise', async () => {
expect(testTask.trigger()).to.be.instanceof(Promise)
})
tap.test('testTask.trigger() returned Promise expect be fullfilled', async () => {
await testTask.trigger()
})
tap.test('expect run a task without pre and afterTask', async () => {
let localTestTask = new taskbuffer.Task({ taskFunction: testTaskFunction })
await localTestTask.trigger()
})
tap.test('expect run buffered', async () => {
let localTestTask = new taskbuffer.Task({
taskFunction: testTaskFunctionTimeout,
buffered: true,
bufferMax: 2
})
localTestTask.trigger()
localTestTask.trigger()
localTestTask.trigger()
await localTestTask.trigger()
})
let testTaskchain
let testTaskArray = [
new taskbuffer.Task({
name: 'task1',
taskFunction: function () {
let done = q.defer()
setTimeout(done.resolve, 2000)
return done.promise
}
}),
new taskbuffer.Task({
name: 'task2',
taskFunction: function () {
let done = q.defer()
setTimeout(done.resolve, 2000)
return done.promise
}
})
]
tap.test('expect run tasks in sequence', async () => {
testTaskchain = new taskbuffer.Taskchain({
name: 'Taskchain1',
taskArray: testTaskArray
})
await testTaskchain.trigger()
})
tap.test('expect run in Parallel', async () => {
let testTaskparallel = new taskbuffer.Taskparallel({
taskArray: [ task1, task2, task3 ]
})
await testTaskparallel.trigger()
})
let flowTask1 = new taskbuffer.Task({
taskFunction: (x: number) => {
let done = q.defer()
console.log('flowTask1')
console.log(x)
done.resolve(x)
return done.promise
}
})
let flowTaskBuffered = new taskbuffer.Task({
taskFunction: (x: number) => {
let done = q.defer()
console.log('flowTask1')
console.log(x)
done.resolve(x)
return done.promise
},
buffered: true,
bufferMax: 1
})
let flowTask2 = new taskbuffer.Task({
taskFunction: (x: number) => {
let done = q.defer()
console.log('flowTask2')
console.log(x)
done.resolve(x)
return done.promise
},
preTask: flowTask1
})
let flowTask3 = new taskbuffer.Taskchain({
taskArray: [ flowTask1, flowTask2 ]
})
tap.test('should let a value flow through a task', async () => {
let result = await flowTask1.trigger(12)
expect(result).to.equal(12)
})
tap.test('should let a values flow between tasks', async () => {
let result = await flowTask2.trigger(12)
expect(result).to.equal(12)
})
tap.test('expect let a values flow between tasks when buffered', async () => {
let result = await flowTaskBuffered.trigger(12)
expect(result).to.equal(12)
})
tap.test('should let a values flow between tasks in Taskchain', async () => {
let result = await flowTask3.trigger(12)
expect(result).to.equal(12)
})
tap.start()