diff --git a/tests/common/base-instance.ts b/tests/common/base-instance.ts index 1f03bdd2..7469328e 100644 --- a/tests/common/base-instance.ts +++ b/tests/common/base-instance.ts @@ -7,19 +7,18 @@ * in the root directory of this source tree. */ -import { events } from '../../src/common/events/events'; import { Base } from '../../src/lib/base'; export async function shutDownBaseInstance(i: Base): Promise { if (i.isGoingUp()) { - await new Promise((resolve) => { - i.once(events.UP, resolve); + await new Promise((resolve) => { + i.once('up', resolve); }); } if (i.isRunning()) { // eslint-disable-next-line no-await-in-loop - await new Promise((resolve) => { - i.shutdown(resolve); + await new Promise((resolve) => { + i.shutdown(() => resolve()); }); } } diff --git a/tests/common/events.ts b/tests/common/events.ts index 57f79b3c..7ce5ddf3 100644 --- a/tests/common/events.ts +++ b/tests/common/events.ts @@ -8,12 +8,12 @@ */ import { Consumer } from '../../src/lib/consumer/consumer'; -import { events } from '../../src/common/events/events'; +import { TRedisSMQEvent } from '../../types'; // eslint-disable-next-line @typescript-eslint/no-explicit-any export async function consumerOnEvent>( consumer: Consumer, - event: string, + event: keyof TRedisSMQEvent, ) { return new Promise((resolve) => { // eslint-disable-next-line @typescript-eslint/ban-ts-comment @@ -28,10 +28,7 @@ export async function untilMessageAcknowledged( consumer: Consumer, messageId?: string, ): Promise { - const [id] = await consumerOnEvent<[string]>( - consumer, - events.MESSAGE_ACKNOWLEDGED, - ); + const [id] = await consumerOnEvent<[string]>(consumer, 'messageAcknowledged'); if (messageId && messageId !== id) { await untilMessageAcknowledged(consumer, messageId); } @@ -43,7 +40,7 @@ export async function untilMessageDeadLettered( ): Promise { const [, id] = await consumerOnEvent<[string, string]>( consumer, - events.MESSAGE_DEAD_LETTERED, + 'messageDeadLettered', ); if (messageId && messageId !== id) { await untilMessageDeadLettered(consumer, messageId); @@ -52,7 +49,7 @@ export async function untilMessageDeadLettered( export async function untilConsumerEvent( consumer: Consumer, - event: string, + event: keyof TRedisSMQEvent, ): Promise { return consumerOnEvent(consumer, event); } diff --git a/tests/common/message-producing-consuming.ts b/tests/common/message-producing-consuming.ts index 1b3be7d8..e50c0468 100644 --- a/tests/common/message-producing-consuming.ts +++ b/tests/common/message-producing-consuming.ts @@ -9,7 +9,6 @@ import { EQueueType, IQueueParams } from '../../types'; import { Message } from '../../src/lib/message/message'; -import { events } from '../../src/common/events/events'; import { untilConsumerEvent, untilMessageAcknowledged } from './events'; import { getConsumer } from './consumer'; import { getProducer } from './producer'; @@ -63,7 +62,7 @@ export async function produceAndDeadLetterMessage( const { messages } = await producer.produceAsync(message); consumer.run(); - await untilConsumerEvent(consumer, events.MESSAGE_DEAD_LETTERED); + await untilConsumerEvent(consumer, 'messageDeadLettered'); return { producer, consumer, messageId: messages[0], queue }; } diff --git a/tests/tests/consuming-messages/test00004.test.ts b/tests/tests/consuming-messages/test00004.test.ts index 018d0c4a..f89aedf1 100644 --- a/tests/tests/consuming-messages/test00004.test.ts +++ b/tests/tests/consuming-messages/test00004.test.ts @@ -9,7 +9,6 @@ import { delay } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { untilConsumerEvent } from '../../common/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -29,7 +28,7 @@ test('A message is dead-lettered and not delivered when messageTTL is exceeded', const consume = jest.spyOn(consumer, 'consume'); let unacknowledged = 0; - consumer.on(events.MESSAGE_UNACKNOWLEDGED, () => { + consumer.on('messageUnacknowledged', () => { unacknowledged += 1; }); @@ -40,7 +39,7 @@ test('A message is dead-lettered and not delivered when messageTTL is exceeded', await delay(5000); consumer.run(); - await untilConsumerEvent(consumer, events.MESSAGE_DEAD_LETTERED); + await untilConsumerEvent(consumer, 'messageDeadLettered'); expect(consume).toHaveBeenCalledTimes(0); expect(unacknowledged).toBe(1); const deadLetteredMessages = await getQueueDeadLetteredMessages(); diff --git a/tests/tests/consuming-messages/test00005.test.ts b/tests/tests/consuming-messages/test00005.test.ts index 51946ce8..3730a5d4 100644 --- a/tests/tests/consuming-messages/test00005.test.ts +++ b/tests/tests/consuming-messages/test00005.test.ts @@ -9,7 +9,6 @@ import { delay } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { untilConsumerEvent } from '../../common/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -29,7 +28,7 @@ test('Setting default message TTL from configuration', async () => { const consume = jest.spyOn(consumer, 'consume'); let unacks = 0; - consumer.on(events.MESSAGE_UNACKNOWLEDGED, () => { + consumer.on('messageUnacknowledged', () => { unacks += 1; }); const msg = new Message(); @@ -39,7 +38,7 @@ test('Setting default message TTL from configuration', async () => { await delay(5000); consumer.run(); - await untilConsumerEvent(consumer, events.MESSAGE_DEAD_LETTERED); + await untilConsumerEvent(consumer, 'messageDeadLettered'); expect(consume).toHaveBeenCalledTimes(0); expect(unacks).toBe(1); diff --git a/tests/tests/consuming-messages/test00006.test.ts b/tests/tests/consuming-messages/test00006.test.ts index 42142d3c..2bb698b4 100644 --- a/tests/tests/consuming-messages/test00006.test.ts +++ b/tests/tests/consuming-messages/test00006.test.ts @@ -8,7 +8,6 @@ */ import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { ICallback } from 'redis-smq-common'; import { untilConsumerEvent } from '../../common/events'; import { getConsumer } from '../../common/consumer'; @@ -43,6 +42,6 @@ test('A message is unacknowledged when messageConsumeTimeout is exceeded', async await producer.produceAsync(msg); consumer.run(); - await untilConsumerEvent(consumer, events.MESSAGE_UNACKNOWLEDGED); - await untilConsumerEvent(consumer, events.MESSAGE_ACKNOWLEDGED); + await untilConsumerEvent(consumer, 'messageUnacknowledged'); + await untilConsumerEvent(consumer, 'messageAcknowledged'); }); diff --git a/tests/tests/consuming-messages/test00007.test.ts b/tests/tests/consuming-messages/test00007.test.ts index 09dc0675..905ea08c 100644 --- a/tests/tests/consuming-messages/test00007.test.ts +++ b/tests/tests/consuming-messages/test00007.test.ts @@ -8,7 +8,6 @@ */ import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { ICallback } from 'redis-smq-common'; import { untilMessageAcknowledged } from '../../common/events'; import { getConsumer } from '../../common/consumer'; @@ -35,12 +34,12 @@ test('Unacknowledged message are re-queued when messageRetryThreshold is not exc }); let unacknowledged = 0; - consumer.on(events.MESSAGE_UNACKNOWLEDGED, () => { + consumer.on('messageUnacknowledged', () => { unacknowledged += 1; }); let acknowledged = 0; - consumer.on(events.MESSAGE_ACKNOWLEDGED, () => { + consumer.on('messageAcknowledged', () => { acknowledged += 1; }); diff --git a/tests/tests/consuming-messages/test00008.test.ts b/tests/tests/consuming-messages/test00008.test.ts index 0949f919..72866eee 100644 --- a/tests/tests/consuming-messages/test00008.test.ts +++ b/tests/tests/consuming-messages/test00008.test.ts @@ -8,7 +8,6 @@ */ import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { delay } from 'bluebird'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -37,12 +36,12 @@ test('Async exceptions are caught when consuming a message', async () => { }); let unacknowledged = 0; - consumer.on(events.MESSAGE_UNACKNOWLEDGED, () => { + consumer.on('messageUnacknowledged', () => { unacknowledged += 1; }); let acknowledged = 0; - consumer.on(events.MESSAGE_ACKNOWLEDGED, () => { + consumer.on('messageAcknowledged', () => { acknowledged += 1; }); diff --git a/tests/tests/consuming-messages/test00009.test.ts b/tests/tests/consuming-messages/test00009.test.ts index 9d722507..05275f1c 100644 --- a/tests/tests/consuming-messages/test00009.test.ts +++ b/tests/tests/consuming-messages/test00009.test.ts @@ -8,7 +8,6 @@ */ import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { delay } from 'bluebird'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -30,7 +29,7 @@ test('A message is dead-lettered when messageRetryThreshold is exceeded', async }); let unacknowledged = 0; - consumer.on(events.MESSAGE_UNACKNOWLEDGED, () => { + consumer.on('messageUnacknowledged', () => { unacknowledged += 1; }); diff --git a/tests/tests/consuming-messages/test00011.test.ts b/tests/tests/consuming-messages/test00011.test.ts index c66a2b43..289409cb 100644 --- a/tests/tests/consuming-messages/test00011.test.ts +++ b/tests/tests/consuming-messages/test00011.test.ts @@ -9,7 +9,6 @@ import { delay } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; import { @@ -28,10 +27,10 @@ test('Given many consumers, a message is delivered only to one consumer', async let unacks1 = 0; let acks1 = 0; consumer1 - .on(events.MESSAGE_UNACKNOWLEDGED, () => { + .on('messageUnacknowledged', () => { unacks1 += 1; }) - .on(events.MESSAGE_ACKNOWLEDGED, () => { + .on('messageAcknowledged', () => { acks1 += 1; }); @@ -46,10 +45,10 @@ test('Given many consumers, a message is delivered only to one consumer', async let unacks2 = 0; let acks2 = 0; consumer2 - .on(events.MESSAGE_UNACKNOWLEDGED, () => { + .on('messageUnacknowledged', () => { unacks2 += 1; }) - .on(events.MESSAGE_ACKNOWLEDGED, () => { + .on('messageAcknowledged', () => { acks2 += 1; }); diff --git a/tests/tests/consuming-messages/test00012.test.ts b/tests/tests/consuming-messages/test00012.test.ts index 5452b1ba..22defdb0 100644 --- a/tests/tests/consuming-messages/test00012.test.ts +++ b/tests/tests/consuming-messages/test00012.test.ts @@ -8,7 +8,6 @@ */ import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { untilMessageAcknowledged } from '../../common/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -36,12 +35,12 @@ test('An unacknowledged message is delayed given messageRetryDelay > 0 and messa }); let unacks = 0; - consumer.on(events.MESSAGE_UNACKNOWLEDGED, () => { + consumer.on('messageUnacknowledged', () => { unacks += 1; }); let acks = 0; - consumer.on(events.MESSAGE_ACKNOWLEDGED, () => { + consumer.on('messageAcknowledged', () => { acks += 1; }); diff --git a/tests/tests/consuming-messages/test00013.test.ts b/tests/tests/consuming-messages/test00013.test.ts index 9812b899..083c5e21 100644 --- a/tests/tests/consuming-messages/test00013.test.ts +++ b/tests/tests/consuming-messages/test00013.test.ts @@ -9,7 +9,6 @@ import { Message } from '../../../src/lib/message/message'; import { delay } from 'bluebird'; -import { events } from '../../../src/common/events/events'; import { ICallback } from 'redis-smq-common'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -44,7 +43,7 @@ test('Given many queues, a message is recovered from a consumer crash and re-que cb(); }, }); - queueAConsumer.on(events.MESSAGE_ACKNOWLEDGED, () => { + queueAConsumer.on('messageAcknowledged', () => { defaultQueueMetrics.acks += 1; }); await queueAConsumer.runAsync(); @@ -56,7 +55,7 @@ test('Given many queues, a message is recovered from a consumer crash and re-que cb(); }, }); - queueBConsumer.on(events.MESSAGE_ACKNOWLEDGED, () => { + queueBConsumer.on('messageAcknowledged', () => { queueBMetrics.acks += 1; }); await queueBConsumer.runAsync(); diff --git a/tests/tests/consuming-messages/test00014.test.ts b/tests/tests/consuming-messages/test00014.test.ts index a2197d4e..3d2c8ffc 100644 --- a/tests/tests/consuming-messages/test00014.test.ts +++ b/tests/tests/consuming-messages/test00014.test.ts @@ -42,8 +42,8 @@ test('Consume message from different queues and published by a single producer i const consumer = getConsumer({ queue: `queUE_${i}`, messageHandler: (msg, cb) => { - // message handlers start consuming message once started and before the consumer is fully started (when events.UP is emitted) - // untilMessageAcknowledged() may miss acknowledged events + // message handlers start consuming message once started and before the consumer is fully started (when event.UP is emitted) + // untilMessageAcknowledged() may miss acknowledged event // As a workaround, adding a delay before acknowledging a message setTimeout(cb, 10000); }, diff --git a/tests/tests/consuming-messages/test00019.test.ts b/tests/tests/consuming-messages/test00019.test.ts index 0f5e21dc..c13fc051 100644 --- a/tests/tests/consuming-messages/test00019.test.ts +++ b/tests/tests/consuming-messages/test00019.test.ts @@ -8,7 +8,6 @@ */ import { Message } from '../../../index'; -import { events } from '../../../src/common/events/events'; import { untilConsumerEvent } from '../../common/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -38,7 +37,7 @@ test('An unacknowledged message is dead-lettered and not delivered again, given await producer.produceAsync(msg); consumer.run(); - await untilConsumerEvent(consumer, events.MESSAGE_DEAD_LETTERED); + await untilConsumerEvent(consumer, 'messageDeadLettered'); const deadLetteredMessages = await getQueueDeadLetteredMessages(); const r = await deadLetteredMessages.getMessagesAsync(defaultQueue, 0, 100); expect(r.items.length).toBe(1); diff --git a/tests/tests/consuming-messages/test00022.test.ts b/tests/tests/consuming-messages/test00022.test.ts index 01d2e356..e9b18e41 100644 --- a/tests/tests/consuming-messages/test00022.test.ts +++ b/tests/tests/consuming-messages/test00022.test.ts @@ -8,7 +8,6 @@ */ import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { untilConsumerEvent } from '../../common/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; @@ -36,7 +35,7 @@ test('Shutdown a consumer when consuming a message with retryThreshold = 0: expe await producer.produceAsync(msg); consumer.run(); - await untilConsumerEvent(consumer, events.DOWN); + await untilConsumerEvent(consumer, 'down'); const deadLetteredMessages = await getQueueDeadLetteredMessages(); const res = await deadLetteredMessages.getMessagesAsync(defaultQueue, 0, 100); expect(res.totalItems).toBe(1); diff --git a/tests/tests/consuming-messages/test00023.test.ts b/tests/tests/consuming-messages/test00023.test.ts index f1efbb2a..0b616727 100644 --- a/tests/tests/consuming-messages/test00023.test.ts +++ b/tests/tests/consuming-messages/test00023.test.ts @@ -16,7 +16,6 @@ import { } from '../../common/message-producing-consuming'; import { getQueueDeadLetteredMessages } from '../../common/queue-dead-lettered-messages'; import { untilConsumerEvent } from '../../common/events'; -import { events } from '../../../src/common/events/events'; test('Messages produced from scheduled message are processed like normal message upon consume failures (retry, delay, requeue, etc)', async () => { await createQueue(defaultQueue, false); @@ -39,7 +38,7 @@ test('Messages produced from scheduled message are processed like normal message await producer.produceAsync(msg); consumer.run(); - await untilConsumerEvent(consumer, events.MESSAGE_DEAD_LETTERED); + await untilConsumerEvent(consumer, 'messageDeadLettered'); const deadLetteredMessages = await getQueueDeadLetteredMessages(); const res = await deadLetteredMessages.getMessagesAsync(defaultQueue, 0, 100); expect(res.totalItems).toBe(1); diff --git a/tests/tests/consuming-messages/test00035.test.ts b/tests/tests/consuming-messages/test00035.test.ts index 4882504a..c881145b 100644 --- a/tests/tests/consuming-messages/test00035.test.ts +++ b/tests/tests/consuming-messages/test00035.test.ts @@ -10,7 +10,6 @@ import { delay, promisifyAll } from 'bluebird'; import { Consumer } from '../../../src/lib/consumer/consumer'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { getProducer } from '../../common/producer'; import { shutDownBaseInstance } from '../../common/base-instance'; import { EQueueType } from '../../../types'; @@ -28,7 +27,7 @@ test('Consume message from different queues using a single consumer instance: ca await queue.saveAsync('test0', EQueueType.LIFO_QUEUE); await consumer.consumeAsync('test0', () => void 0); - consumer.once(events.MESSAGE_RECEIVED, () => { + consumer.once('messageReceived', () => { setTimeout(() => { // cancelling a queue when a message handler is active consumer.cancelAsync('test0').catch((e: unknown) => { diff --git a/tests/tests/event-listeners/test00001.test.ts b/tests/tests/event-listeners/test00001.test.ts index f7e371b8..a1710288 100644 --- a/tests/tests/event-listeners/test00001.test.ts +++ b/tests/tests/event-listeners/test00001.test.ts @@ -17,7 +17,6 @@ import { import { ICallback } from 'redis-smq-common'; import { config } from '../../common/config'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { createQueue, defaultQueue, @@ -28,10 +27,11 @@ import { delay } from 'bluebird'; import { getConsumer } from '../../common/consumer'; import { shutDownBaseInstance } from '../../common/base-instance'; import { Configuration } from '../../../src/config/configuration'; +import { TRedisSMQEvent } from '../../../types'; const consumerStats: Record< string, - { queue: IQueueParams; event: string; messageId: string }[] + { queue: IQueueParams; event: keyof TRedisSMQEvent; messageId: string }[] > = {}; class TestConsumerEventListener implements IEventListener { @@ -41,17 +41,17 @@ class TestConsumerEventListener implements IEventListener { ) { consumerStats[instanceId] = []; eventProvider.on( - events.MESSAGE_ACKNOWLEDGED, + 'messageAcknowledged', (messageId: string, queue: IQueueParams) => { consumerStats[instanceId].push({ queue, - event: events.MESSAGE_ACKNOWLEDGED, + event: 'messageAcknowledged', messageId, }); }, ); eventProvider.on( - events.MESSAGE_DEAD_LETTERED, + 'messageDeadLettered', ( _: EConsumeMessageDeadLetterCause, messageId: string, @@ -59,7 +59,7 @@ class TestConsumerEventListener implements IEventListener { ) => { consumerStats[instanceId].push({ queue, - event: events.MESSAGE_DEAD_LETTERED, + event: 'messageDeadLettered', messageId, }); }, @@ -119,30 +119,28 @@ test('Consumer event listeners', async () => { ]); expect(consumerStats[c0.getId()][0]).toEqual({ queue: defaultQueue, - event: events.MESSAGE_ACKNOWLEDGED, + event: 'messageAcknowledged', messageId: m0, }); expect(consumerStats[c1.getId()][0]).toEqual({ queue: defaultQueue, - event: events.MESSAGE_ACKNOWLEDGED, + event: 'messageAcknowledged', messageId: m1, }); expect(consumerStats[c2.getId()].length).toEqual(1); expect(consumerStats[c2.getId()][0].queue).toEqual(anotherQueue); - expect(consumerStats[c2.getId()][0].event).toEqual( - events.MESSAGE_DEAD_LETTERED, - ); + expect(consumerStats[c2.getId()][0].event).toEqual('messageDeadLettered'); expect(consumerStats[c2.getId()][0].messageId).toEqual(m2); expect(consumerStats[c3.getId()].length).toEqual(2); expect(consumerStats[c3.getId()][0]).toEqual({ queue: anotherQueue, - event: events.MESSAGE_ACKNOWLEDGED, + event: 'messageAcknowledged', messageId: m3.getRequiredId(), }); expect(consumerStats[c3.getId()][1]).toEqual({ queue: anotherQueue, - event: events.MESSAGE_ACKNOWLEDGED, + event: 'messageAcknowledged', messageId: m4.getRequiredId(), }); }); diff --git a/tests/tests/event-listeners/test00002.test.ts b/tests/tests/event-listeners/test00002.test.ts index 9748345d..8cf03416 100644 --- a/tests/tests/event-listeners/test00002.test.ts +++ b/tests/tests/event-listeners/test00002.test.ts @@ -15,7 +15,6 @@ import { import { ICallback } from 'redis-smq-common'; import { config } from '../../common/config'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { getProducer } from '../../common/producer'; import { createQueue, @@ -23,18 +22,14 @@ import { } from '../../common/message-producing-consuming'; import { Configuration } from '../../../src/config/configuration'; -const producerStats: Record = - {}; +const producerStats: Record = {}; class TestProducerEventListener implements IEventListener { init(args: TEventListenerInitArgs, cb: ICallback) { const { instanceId, eventProvider } = args; producerStats[instanceId] = []; - eventProvider.on(events.MESSAGE_PUBLISHED, (messageId: string) => { - producerStats[instanceId].push({ - event: events.MESSAGE_PUBLISHED, - messageId, - }); + eventProvider.on('messagePublished', (messageId: string) => { + producerStats[instanceId].push(messageId); }); cb(); } @@ -70,21 +65,9 @@ test('Producer event listeners', async () => { await p1.produceAsync(m3); expect(Object.keys(producerStats)).toEqual([p0.getId(), p1.getId()]); expect(producerStats[p0.getId()].length).toEqual(2); - expect(producerStats[p0.getId()][0]).toEqual({ - event: events.MESSAGE_PUBLISHED, - messageId: m0.getRequiredId(), - }); - expect(producerStats[p0.getId()][1]).toEqual({ - event: events.MESSAGE_PUBLISHED, - messageId: m1.getRequiredId(), - }); + expect(producerStats[p0.getId()][0]).toEqual(m0.getRequiredId()); + expect(producerStats[p0.getId()][1]).toEqual(m1.getRequiredId()); expect(producerStats[p1.getId()].length).toEqual(2); - expect(producerStats[p1.getId()][0]).toEqual({ - event: events.MESSAGE_PUBLISHED, - messageId: m2.getRequiredId(), - }); - expect(producerStats[p1.getId()][1]).toEqual({ - event: events.MESSAGE_PUBLISHED, - messageId: m3.getRequiredId(), - }); + expect(producerStats[p1.getId()][0]).toEqual(m2.getRequiredId()); + expect(producerStats[p1.getId()][1]).toEqual(m3.getRequiredId()); }); diff --git a/tests/tests/misc/test00014.test.ts b/tests/tests/misc/test00014.test.ts index 3f2569ad..88e4ff22 100644 --- a/tests/tests/misc/test00014.test.ts +++ b/tests/tests/misc/test00014.test.ts @@ -7,7 +7,6 @@ * in the root directory of this source tree. */ -import { events } from '../../../src/common/events/events'; import { getProducer } from '../../common/producer'; import { shutDownBaseInstance } from '../../common/base-instance'; @@ -17,8 +16,8 @@ test('Producer: isRunning, isGoingUp, isGoingDown, isUp, isDown', async () => { expect(typeof mProducer.getId()).toBe('string'); if (mProducer.isGoingUp()) { - await new Promise((resolve) => { - mProducer.once(events.UP, resolve); + await new Promise((resolve) => { + mProducer.once('up', resolve); }); } await shutDownBaseInstance(mProducer); diff --git a/tests/tests/queue-rate-limit/test00029.test.ts b/tests/tests/queue-rate-limit/test00029.test.ts index 2d0fe9e6..f1b9fe04 100644 --- a/tests/tests/queue-rate-limit/test00029.test.ts +++ b/tests/tests/queue-rate-limit/test00029.test.ts @@ -9,7 +9,6 @@ import { delay } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; import { @@ -53,7 +52,7 @@ test('Rate limit a queue without priority and check message rate', async () => { const messages: { ts: number; messageId: string }[] = []; const consumer = await getConsumer(); - consumer.on(events.MESSAGE_ACKNOWLEDGED, (messageId: string) => { + consumer.on('messageAcknowledged', (messageId: string) => { messages.push({ ts: Date.now(), messageId }); }); diff --git a/tests/tests/queue-rate-limit/test00030.test.ts b/tests/tests/queue-rate-limit/test00030.test.ts index 2f5952e5..9ee0d049 100644 --- a/tests/tests/queue-rate-limit/test00030.test.ts +++ b/tests/tests/queue-rate-limit/test00030.test.ts @@ -9,7 +9,6 @@ import { delay } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; import { validateTime } from '../../common/validate-time'; @@ -73,7 +72,7 @@ test('Rate limit a priority queue and check message rate', async () => { await consumer.cancelAsync(defaultQueue); await consumer.consumeAsync(defaultQueue, (msg, cb) => cb()); - consumer.on(events.MESSAGE_ACKNOWLEDGED, (messageId: string) => { + consumer.on('messageAcknowledged', (messageId: string) => { messages.push({ ts: Date.now(), messageId }); }); diff --git a/tests/tests/queue-rate-limit/test00031.test.ts b/tests/tests/queue-rate-limit/test00031.test.ts index a5798d20..faa8b994 100644 --- a/tests/tests/queue-rate-limit/test00031.test.ts +++ b/tests/tests/queue-rate-limit/test00031.test.ts @@ -9,7 +9,6 @@ import { delay } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { getConsumer } from '../../common/consumer'; import { getProducer } from '../../common/producer'; import { @@ -31,7 +30,7 @@ test('Set a rate limit for a queue and consume message using many consumers', as const messages: { ts: number; messageId: string }[] = []; for (let i = 0; i < 6; i += 1) { const consumer = await getConsumer(); - consumer.on(events.MESSAGE_ACKNOWLEDGED, (messageId: string) => { + consumer.on('messageAcknowledged', (messageId: string) => { messages.push({ ts: Date.now(), messageId }); }); await consumer.runAsync(); diff --git a/tests/tests/workers/test00001.test.ts b/tests/tests/workers/test00001.test.ts index 2a8df455..b78c28ab 100644 --- a/tests/tests/workers/test00001.test.ts +++ b/tests/tests/workers/test00001.test.ts @@ -9,7 +9,6 @@ import { delay, promisifyAll } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { DelayUnacknowledgedWorker } from '../../../src/workers/delay-unacknowledged.worker'; import { PublishScheduledWorker } from '../../../src/workers/publish-scheduled.worker'; import { WatchConsumersWorker } from '../../../src/workers/watch-consumers.worker'; @@ -47,7 +46,7 @@ test('WatchdogWorker -> DelayUnacknowledgedWorker -> PublishScheduledWorker', as ); consumer.run(); - await untilConsumerEvent(consumer, events.DOWN); + await untilConsumerEvent(consumer, 'down'); await shutDownBaseInstance(consumer); expect(message !== null).toBe(true); diff --git a/tests/tests/workers/test00002.test.ts b/tests/tests/workers/test00002.test.ts index 45069fb5..f6c18c6c 100644 --- a/tests/tests/workers/test00002.test.ts +++ b/tests/tests/workers/test00002.test.ts @@ -9,7 +9,6 @@ import { delay, promisifyAll } from 'bluebird'; import { Message } from '../../../src/lib/message/message'; -import { events } from '../../../src/common/events/events'; import { RequeueUnacknowledgedWorker } from '../../../src/workers/requeue-unacknowledged.worker'; import { WatchConsumersWorker } from '../../../src/workers/watch-consumers.worker'; import { untilConsumerEvent } from '../../common/events'; @@ -46,7 +45,7 @@ test('WatchdogWorker -> RequeueUnacknowledgedWorker', async () => { ); consumer.run(); - await untilConsumerEvent(consumer, events.DOWN); + await untilConsumerEvent(consumer, 'down'); await shutDownBaseInstance(consumer); expect(message !== null).toBe(true);