test: improve code coverage

Author: Jason3S

src/scheduler/scheduler.test.ts

@@ -61,17 +61,23 @@ describe('Scheduler', () => {
             expect(scheduler.scheduleRequest(createRequestSpin(4000))).rejects.toEqual(expect.objectContaining({ message: expect.stringContaining('stopped')})),
             expect(scheduler.scheduleRequest(createRequestSpin(2000))).rejects.toEqual(expect.objectContaining({ message: expect.stringContaining('stopped')})),
             expect(delay(1).then(() => scheduler.dispose())).resolves.toEqual(expect.any(Number)),
+            expect(delay(5).then(() => scheduler.scheduleRequest(createRequestEcho('Too Late')))).rejects.toEqual(expect.objectContaining({ message: expect.stringContaining('stopped')})),
+            expect(delay(2).then(() => scheduler.dispose())).resolves.toEqual(expect.any(Number)),
+            expect(delay(3).then(() => scheduler.dispose())).resolves.toEqual(expect.any(Number)),
         ]);
     });
 
 
     test('Termination of single request', run(scheduler => {
+        const junkRequest: any = {};
         const spinRequest = createRequestSpin(5000);
         return Promise.all([
             expect(scheduler.scheduleRequest(spinRequest)).rejects.toEqual(expect.objectContaining({ message: expect.stringContaining('Request Terminated')})),
             expect(scheduler.scheduleRequest(createRequestEcho('One'))).resolves.toEqual(expect.objectContaining({ data: 'One' })),
             expect(scheduler.scheduleRequest(createRequestEcho('Two'))).resolves.toEqual(expect.objectContaining({ data: 'Two' })),
-            expect(delay(1).then(() => scheduler.terminateRequest(spinRequest.id)))
+            expect(scheduler.scheduleRequest(junkRequest)).rejects.toEqual(expect.objectContaining({ message: 'Bad Request' })),
+            expect(scheduler.terminateRequest('Bad ID')).rejects.toEqual(expect.objectContaining({ message: 'Unknown Request' })),
+            expect(delay(1).then(() => scheduler.terminateRequest(spinRequest.id))),
         ]);
     }));
 });

src/scheduler/scheduler.ts

@@ -1,5 +1,5 @@
 import { createWorker, Worker } from '../worker/worker';
-import { Request, Response, isResponse, createRequest, ErrorResponse, isErrorResponse  } from '../Procedures/procedure';
+import { Request, Response, isResponse, createRequest, ErrorResponse, isErrorResponse, isRequest  } from '../Procedures/procedure';
 import { UniqueID } from '../Procedures/uniqueId';
 
 export class Scheduler {
@@ -26,6 +26,9 @@ export class Scheduler {
         if (this.requestQueue.has(request.id)) {
             return this.requestQueue.get(request.id)!.promise as Promise<U>;
         }
+        if (!isRequest(request)) {
+            return Promise.reject(new ErrorBadRequest('Bad Request', request))
+        }
         const promise = new Promise<U>((resolve) => {
             this.pending.set(request.id, v => resolve(v as U));
             this.trigger();