fix(core): update

test/test.1.task.ts

@@ -1,116 +1,96 @@
 import { expect, tap } from '@push.rocks/tapbundle';
-
 import * as taskbuffer from '../ts/index.js';
-
 import * as smartpromise from '@push.rocks/smartpromise';
 import * as smartdelay from '@push.rocks/smartdelay';
 
-// setup some testData to work with
-let testTask: taskbuffer.Task;
-
-let testPreTask = new taskbuffer.Task({
-  taskFunction: async () => {
-    console.log('preTask executed');
-  },
-  preTask: testTask,
-});
-
-// some more tasks to test with
-let task1Counter = 0; // how often task 1 is being executed
-let task1 = new taskbuffer.Task({
-  name: 'Task 1',
-  taskFunction: () => {
-    let done = smartpromise.defer();
-    console.log('Task1 started');
-    setTimeout(() => {
-      task1Counter++;
-      console.log('Task1 executed');
-      done.resolve();
-    }, 5000);
-    return done.promise;
-  },
-});
-
-let task2 = new taskbuffer.Task({
-  name: 'Task 1',
-  taskFunction: async () => {
-    const done = smartpromise.defer();
-    console.log('Task2 started');
-    setTimeout(() => {
-      console.log('Task2 executed');
-      done.resolve();
-    }, 5000);
-    await done.promise;
-  },
-});
-
-let task3 = new taskbuffer.Task({
-  name: 'Task 3',
-  taskFunction: () => {
-    let done = smartpromise.defer();
-    console.log('Task3 started');
-    setTimeout(() => {
-      console.log('Task3 executed');
-      done.resolve();
-    }, 5000);
-    return done.promise;
-  },
-});
-
 tap.test('new Task() should return a new task', async () => {
-  testTask = new taskbuffer.Task({
+  const testTask = new taskbuffer.Task({
     taskFunction: async () => {
       console.log('executed twice');
     },
-    preTask: testPreTask,
   });
-});
-
-tap.test('expect testTask to be an instance of Task', async () => {
   expect(testTask).toBeInstanceOf(taskbuffer.Task);
 });
 
-tap.test('expect testTask.idle is true', async () => {
-  if (!testTask.idle) {
-    throw new Error('testTask.idle is not true');
-  }
+tap.test('should be able to get the task state', async () => {
+  const testTask = new taskbuffer.Task({
+    taskFunction: async () => {},
+  });
+  expect(testTask.state).toEqual('ready');
 });
 
-tap.test('testTask.running should be of type boolean and initially false', async () => {
-  expect(testTask.running).toBeTypeofBoolean();
-  // tslint:disable-next-line:no-unused-expression
-  expect(testTask.running).toBeFalse();
+tap.test('should have bufferMax set to the provided value', async () => {
+  const task2 = new taskbuffer.Task({
+    taskFunction: async () => {},
+  });
+  expect(task2.bufferMax).toBeUndefined();  // test for a task without bufferMax set
+  const bufferedTask = new taskbuffer.Task({
+    taskFunction: async () => {},
+    buffered: true,
+    bufferMax: 3,
+  });
+  expect(bufferedTask.bufferMax).toEqual(3);
 });
 
-tap.test('testTask.trigger() should return Promise', async () => {
-  expect(testTask.trigger()).toBeInstanceOf(Promise);
-});
-
-tap.test('testTask.trigger() returned Promise should be fullfilled', async () => {
-  await testTask.trigger();
-});
-
-tap.test('expect to run a task without pre and afterTask errorless', async () => {
-  let localTestTask = new taskbuffer.Task({
-    taskFunction: async () => {
-      console.log('only once');
+tap.test('should be able to trigger tasks multiple times', async () => {
+  let task1Counter = 0; 
+  const task1 = new taskbuffer.Task({
+    name: 'Task 1',
+    taskFunction: () => {
+      let done = smartpromise.defer();
+      console.log('Task1 started');
+      setTimeout(() => {
+        task1Counter++;
+        console.log('Task1 executed');
+        done.resolve();
+      }, 5000);
+      return done.promise;
     },
   });
-  await localTestTask.trigger();
+  await task1.trigger();
+  await task1.trigger();
+  expect(task1Counter).toEqual(2);
 });
 
-tap.test('expect task to run in buffered mode', async () => {
-  let localTestTask = new taskbuffer.Task({
+tap.test('should execute setup function before the task function', async () => {
+  const task2 = new taskbuffer.Task({
+    name: 'Task 2',
+    taskSetup: async () => {
+      console.log('this is the setup function for task 2. It should only run once.')
+      return {
+        nice: 'yes',
+      }
+    },
+    taskFunction: async (before, setupArg) => {
+      expect(setupArg).toEqual({ nice: 'yes' });
+      const done = smartpromise.defer();
+      console.log('Task2 started');
+      setTimeout(() => {
+        console.log('Task2 executed');
+        done.resolve();
+      }, 5000);
+      await done.promise;
+    },
+  });
+  await task2.trigger();
+});
+
+tap.test('should not exceed bufferMax when task is buffered', async () => {
+  let counter = 0;
+  const bufferedTask = new taskbuffer.Task({
     taskFunction: async () => {
-      await smartdelay.delayFor(3000);
+      counter++;
+      await smartdelay.delayFor(2000);
+      counter--;
     },
     buffered: true,
     bufferMax: 2,
   });
-  localTestTask.trigger();
-  localTestTask.trigger();
-  localTestTask.trigger();
-  await localTestTask.trigger();
+  bufferedTask.trigger();
+  bufferedTask.trigger();
+  bufferedTask.trigger();
+  await smartdelay.delayFor(100);
+  expect(counter <= bufferedTask.bufferMax).toBeTrue();
 });
 
 tap.start();