test(Message): remove Message.MessagePriority, add EMessagePriority

weyoss · Dec 11, 2023 · 88a1368 · 88a1368
1 parent 702a01d
commit 88a1368
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/tests/common/message-producing-consuming.ts b/tests/common/message-producing-consuming.ts
@@ -7,7 +7,7 @@
  * in the root directory of this source tree.
  */
 
-import { EQueueType, IQueueParams } from '../../types';
+import { EMessagePriority, EQueueType, IQueueParams } from '../../types';
 import { MessageEnvelope } from '../../src/lib/message/message-envelope';
 import { untilConsumerEvent, untilMessageAcknowledged } from './events';
 import { getConsumer } from './consumer';
@@ -83,7 +83,7 @@ export async function produceMessageWithPriority(
   await producer.runAsync();
 
   const message = new MessageEnvelope();
-  message.setPriority(MessageEnvelope.MessagePriority.LOW).setQueue(queue);
+  message.setPriority(EMessagePriority.LOW).setQueue(queue);
   const { messages } = await producer.produceAsync(message);
   return { messageId: messages[0], producer, queue };
 }

diff --git a/tests/tests/consuming-messages/test00036.test.ts b/tests/tests/consuming-messages/test00036.test.ts
@@ -10,7 +10,7 @@
 import { MessageEnvelope } from '../../../src/lib/message/message-envelope';
 import { ProducerMessageNotPublishedError } from '../../../src/lib/producer/errors';
 import { getProducer } from '../../common/producer';
-import { EQueueType } from '../../../types';
+import { EMessagePriority, EQueueType } from '../../../types';
 import { getQueue } from '../../common/queue';
 
 test('Producing a message and expecting different kind of failures', async () => {
@@ -25,7 +25,7 @@ test('Producing a message and expecting different kind of failures', async () =>
     const msg = new MessageEnvelope()
       .setQueue('test0')
       .setBody('body')
-      .setPriority(MessageEnvelope.MessagePriority.LOW);
+      .setPriority(EMessagePriority.LOW);
     await producer.produceAsync(msg);
   } catch (e: unknown) {
     const m = e instanceof ProducerMessageNotPublishedError ? e.message : '';

diff --git a/tests/tests/misc/test00020.test.ts b/tests/tests/misc/test00020.test.ts
@@ -14,7 +14,7 @@ test('MessageEnvelope: validations', async () => {
   const msg = new MessageEnvelope();
   expect(() => {
     msg.getRequiredId();
-  }).toThrow('MessageEnvelope has not yet been published');
+  }).toThrow('Message has not yet been published');
   expect(() => {
     msg.setScheduledRepeatPeriod(-1);
   }).toThrow('Expected a positive integer value in milliseconds');

diff --git a/tests/tests/priority-queuing/test00002.test.ts b/tests/tests/priority-queuing/test00002.test.ts
@@ -12,7 +12,7 @@ import { MessageEnvelope } from '../../../src/lib/message/message-envelope';
 import { getConsumer } from '../../common/consumer';
 import { getProducer } from '../../common/producer';
 import { defaultQueue } from '../../common/message-producing-consuming';
-import { EQueueType } from '../../../types';
+import { EMessagePriority, EQueueType } from '../../../types';
 import { getQueue } from '../../common/queue';
 
 test('Priority queuing: case 2', async () => {
@@ -37,35 +37,35 @@ test('Priority queuing: case 2', async () => {
   // message 1
   const msg1 = new MessageEnvelope();
   msg1.setBody({ testing: 'message with low priority' });
-  msg1.setPriority(MessageEnvelope.MessagePriority.LOW);
+  msg1.setPriority(EMessagePriority.LOW);
   msg1.setQueue(defaultQueue);
   await producer.produceAsync(msg1);
 
   // message 2
   const msg2 = new MessageEnvelope();
   msg2.setBody({ testing: 'a message with very low priority' });
-  msg2.setPriority(MessageEnvelope.MessagePriority.VERY_LOW);
+  msg2.setPriority(EMessagePriority.VERY_LOW);
   msg2.setQueue(defaultQueue);
   await producer.produceAsync(msg2);
 
   // message 3
   const msg3 = new MessageEnvelope();
   msg3.setBody({ testing: 'a message with above normal priority' });
-  msg3.setPriority(MessageEnvelope.MessagePriority.ABOVE_NORMAL);
+  msg3.setPriority(EMessagePriority.ABOVE_NORMAL);
   msg3.setQueue(defaultQueue);
   await producer.produceAsync(msg3);
 
   // message 4
   const msg4 = new MessageEnvelope();
   msg4.setBody({ testing: 'a message with normal priority' });
-  msg4.setPriority(MessageEnvelope.MessagePriority.NORMAL);
+  msg4.setPriority(EMessagePriority.NORMAL);
   msg4.setQueue(defaultQueue);
   await producer.produceAsync(msg4);
 
   // message 5
   const msg5 = new MessageEnvelope();
   msg5.setBody({ testing: 'a message with high priority' });
-  msg5.setPriority(MessageEnvelope.MessagePriority.HIGH);
+  msg5.setPriority(EMessagePriority.HIGH);
   msg5.setQueue(defaultQueue);
   await producer.produceAsync(msg5);
 

diff --git a/tests/tests/queue-rate-limit/test00030.test.ts b/tests/tests/queue-rate-limit/test00030.test.ts
@@ -13,7 +13,7 @@ import { getConsumer } from '../../common/consumer';
 import { getProducer } from '../../common/producer';
 import { validateTime } from '../../common/validate-time';
 import { defaultQueue } from '../../common/message-producing-consuming';
-import { EQueueType } from '../../../types';
+import { EMessagePriority, EQueueType } from '../../../types';
 import { getQueue } from '../../common/queue';
 import { getQueueRateLimit } from '../../common/queue-rate-limit';
 
@@ -34,37 +34,37 @@ test('Rate limit a priority queue and check message rate', async () => {
     new MessageEnvelope()
       .setBody('msg 1')
       .setQueue(defaultQueue)
-      .setPriority(MessageEnvelope.MessagePriority.HIGH),
+      .setPriority(EMessagePriority.HIGH),
   );
   await producer.produceAsync(
     new MessageEnvelope()
       .setBody('msg 2')
       .setQueue(defaultQueue)
-      .setPriority(MessageEnvelope.MessagePriority.HIGH),
+      .setPriority(EMessagePriority.HIGH),
   );
   await producer.produceAsync(
     new MessageEnvelope()
       .setBody('msg 3')
       .setQueue(defaultQueue)
-      .setPriority(MessageEnvelope.MessagePriority.HIGH),
+      .setPriority(EMessagePriority.HIGH),
   );
   await producer.produceAsync(
     new MessageEnvelope()
       .setBody('msg 4')
       .setQueue(defaultQueue)
-      .setPriority(MessageEnvelope.MessagePriority.HIGH),
+      .setPriority(EMessagePriority.HIGH),
   );
   await producer.produceAsync(
     new MessageEnvelope()
       .setBody('msg 5')
       .setQueue(defaultQueue)
-      .setPriority(MessageEnvelope.MessagePriority.HIGH),
+      .setPriority(EMessagePriority.HIGH),
   );
   await producer.produceAsync(
     new MessageEnvelope()
       .setBody('msg 6')
       .setQueue(defaultQueue)
-      .setPriority(MessageEnvelope.MessagePriority.HIGH),
+      .setPriority(EMessagePriority.HIGH),
   );
 
   const messages: { ts: number; messageId: string }[] = [];

diff --git a/tests/tests/queue-scheduled-messages/test00010.test.ts b/tests/tests/queue-scheduled-messages/test00010.test.ts
@@ -10,7 +10,7 @@
 import { MessageEnvelope } from '../../../src/lib/message/message-envelope';
 import { ProducerMessageNotScheduledError } from '../../../src/lib/producer/errors';
 import { getProducer } from '../../common/producer';
-import { EQueueType } from '../../../types';
+import { EMessagePriority, EQueueType } from '../../../types';
 import { getQueue } from '../../common/queue';
 
 test('Scheduling a message and expecting different kind of failures', async () => {
@@ -25,7 +25,7 @@ test('Scheduling a message and expecting different kind of failures', async () =
     const msg = new MessageEnvelope()
       .setQueue('test0')
       .setBody('body')
-      .setPriority(MessageEnvelope.MessagePriority.LOW)
+      .setPriority(EMessagePriority.LOW)
       .setScheduledCRON('* * * * * *');
     await producer.produceAsync(msg);
   } catch (e: unknown) {

diff --git a/tests/tests/requeuing-messages/test00003.test.ts b/tests/tests/requeuing-messages/test00003.test.ts
@@ -12,7 +12,7 @@ import { untilMessageAcknowledged } from '../../common/events';
 import { getConsumer } from '../../common/consumer';
 import { getProducer } from '../../common/producer';
 import { defaultQueue } from '../../common/message-producing-consuming';
-import { EQueueType } from '../../../types';
+import { EMessagePriority, EQueueType } from '../../../types';
 import { getQueue } from '../../common/queue';
 import { getQueueAcknowledgedMessages } from '../../common/queue-acknowledged-messages';
 import { getQueueMessages } from '../../common/queue-messages';
@@ -33,7 +33,7 @@ test('Combined test. Requeue a priority message from acknowledged queue. Check q
   message
     .setBody({ hello: 'world' })
     .setQueue(defaultQueue)
-    .setPriority(MessageEnvelope.MessagePriority.ABOVE_NORMAL);
+    .setPriority(EMessagePriority.ABOVE_NORMAL);
 
   const producer = getProducer();
   await producer.runAsync();