From 418655ebff757e3f62826e9b29f37dd45f55cce7 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Wed, 29 Apr 2020 21:19:58 +0300
Subject: [PATCH] Improve tests
---
src/Queue/DataStorageTaskProvider.ts | 5 ++---
src/Queue/TaskProvider.ts | 1 -
tests/Queue/TaskQueueTest.js.ts | 8 ++++----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/Queue/DataStorageTaskProvider.ts b/src/Queue/DataStorageTaskProvider.ts
index 36880dc..244ff9b 100644
--- a/src/Queue/DataStorageTaskProvider.ts
+++ b/src/Queue/DataStorageTaskProvider.ts
@@ -1,6 +1,5 @@
import { DataStorage } from '../DataStorage';
-import { uniqId } from '../utils';
-import { Task, TaskList, TaskProvider } from './TaskProvider';
+import {Task, TaskList, TaskProvider, uniqTaskId} from './TaskProvider';
const NAMESPACE = 'tasks:v1';
const QUEUE_NAME = 'queue';
@@ -25,7 +24,7 @@ export class DataStorageTaskProvider implements TaskProvider {
const storedItems = serialized as Array<{ [key: string]: any }>;
return storedItems.map(i => {
- const task = new Task(uniqId(), 0, '', {});
+ const task = new Task(uniqTaskId(), 0, '', {});
return Object.assign(task, i);
});
}
diff --git a/src/Queue/TaskProvider.ts b/src/Queue/TaskProvider.ts
index a1b50bd..eb39b14 100644
--- a/src/Queue/TaskProvider.ts
+++ b/src/Queue/TaskProvider.ts
@@ -36,6 +36,5 @@ export type ImmutableTaskList = ReadonlyArray<Task>;
export interface TaskProvider {
getTasks(): TaskList;
-
setTasks(tasks: TaskList): void;
}
diff --git a/tests/Queue/TaskQueueTest.js.ts b/tests/Queue/TaskQueueTest.js.ts
index fe87100..cbfd8fa 100644
--- a/tests/Queue/TaskQueueTest.js.ts
+++ b/tests/Queue/TaskQueueTest.js.ts
@@ -11,14 +11,14 @@ describe('Task Queue', function() {
const provider = new ArrayTaskProvider([new Task('1', 0, 'task', {})]);
const queue = new TaskQueue(provider, new NullLogger());
const task = queue.get(1);
- expect(task).instanceOf(Task);
+ expect(task).to.be.instanceOf(Task);
});
it("Don't get unready task from queue", function() {
const provider = new ArrayTaskProvider([new Task('1', 5, 'task', {})]);
const queue = new TaskQueue(provider, new NullLogger());
const task = queue.get(1);
- expect(task).is.equals(undefined);
+ expect(task).to.be.undefined;
});
it('Can remove task by id', function() {
@@ -26,8 +26,8 @@ describe('Task Queue', function() {
const queue = new TaskQueue(provider, new NullLogger());
queue.remove('id1');
const tasks = provider.getTasks();
- expect(1).is.equals(tasks.length);
- expect(2).is.equals(tasks[0].ts);
+ expect(tasks).to.have.lengthOf(1);
+ expect(tasks[0].ts).to.be.equals(2);
});
it('Can modify tasks', function() {