JAMES-1894 Uid variableName should be messageUid and not MessageId

apache · Jan 9, 2017 · ebb86c7 · ebb86c7
1 parent da9ebbf
commit ebb86c7
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/...mes/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java b/...mes/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java
@@ -87,13 +87,13 @@ public void addShouldIndex() throws Exception {
             .andReturn(user);
 
         Mailbox mailbox = control.createMock(Mailbox.class);
-        MessageUid messageId = MessageUid.of(1);
+        MessageUid messageUid = MessageUid.of(1);
         TestId mailboxId = TestId.of(12);
         expect(mailbox.getMailboxId()).andReturn(mailboxId);
-        MailboxMessage message = mockedMessage(messageId);
+        MailboxMessage message = mockedMessage(messageUid);
 
         IndexResponse expectedIndexResponse = control.createMock(IndexResponse.class);
-        expect(indexer.indexMessage(eq(mailboxId.serialize() + ":" + messageId), anyString()))
+        expect(indexer.indexMessage(eq(mailboxId.serialize() + ":" + messageUid.asLong()), anyString()))
             .andReturn(expectedIndexResponse);
 
         control.replay();
@@ -116,12 +116,12 @@ public void addShouldNotPropagateExceptionWhenExceptionOccurs() throws Exception
 
         Mailbox mailbox = control.createMock(Mailbox.class);
 
-        MessageUid messageId = MessageUid.of(1);
+        MessageUid messageUid = MessageUid.of(1);
         TestId mailboxId = TestId.of(12);
-        MailboxMessage message = mockedMessage(messageId);
+        MailboxMessage message = mockedMessage(messageUid);
         expect(mailbox.getMailboxId()).andReturn(mailboxId);
 
-        expect(indexer.indexMessage(eq(mailboxId.serialize() + ":" + messageId), anyString()))
+        expect(indexer.indexMessage(eq(mailboxId.serialize() + ":" + messageUid.asLong()), anyString()))
             .andThrow(new ElasticsearchException(""));
 
         control.replay();
@@ -134,7 +134,7 @@ public void addShouldNotPropagateExceptionWhenExceptionOccurs() throws Exception
     public void deleteShouldWork() throws Exception {
         MailboxSession session = control.createMock(MailboxSession.class);
         Mailbox mailbox = control.createMock(Mailbox.class);
-        MessageUid messageId = MessageUid.of(1);
+        MessageUid messageUid = MessageUid.of(1);
         TestId mailboxId = TestId.of(12);
         expect(mailbox.getMailboxId()).andReturn(mailboxId);
 
@@ -143,7 +143,7 @@ public void deleteShouldWork() throws Exception {
             .andReturn(expectedBulkResponse);
 
         control.replay();
-        testee.delete(session, mailbox, Lists.newArrayList(messageId));
+        testee.delete(session, mailbox, Lists.newArrayList(messageUid));
         control.verify();
     }
 
@@ -152,11 +152,11 @@ public void deleteShouldWork() throws Exception {
     public void deleteShouldWorkWhenMultipleMessageIds() throws Exception {
         MailboxSession session = control.createMock(MailboxSession.class);
         Mailbox mailbox = control.createMock(Mailbox.class);
-        MessageUid messageId1 = MessageUid.of(1);
+        MessageUid messageUid1 = MessageUid.of(1);
-        MessageUid messageId2 = MessageUid.of(2);
+        MessageUid messageUid2 = MessageUid.of(2);
-        MessageUid messageId3 = MessageUid.of(3);
+        MessageUid messageUid3 = MessageUid.of(3);
-        MessageUid messageId4 = MessageUid.of(4);
+        MessageUid messageUid4 = MessageUid.of(4);
-        MessageUid messageId5 = MessageUid.of(5);
+        MessageUid messageUid5 = MessageUid.of(5);
         TestId mailboxId = TestId.of(12);
         expect(mailbox.getMailboxId()).andReturn(mailboxId).times(5);
 
@@ -165,7 +165,7 @@ public void deleteShouldWorkWhenMultipleMessageIds() throws Exception {
             .andReturn(expectedBulkResponse);
 
         control.replay();
-        testee.delete(session, mailbox, Lists.newArrayList(messageId1, messageId2, messageId3, messageId4, messageId5));
+        testee.delete(session, mailbox, Lists.newArrayList(messageUid1, messageUid2, messageUid3, messageUid4, messageUid5));
         control.verify();
     }
 
@@ -174,15 +174,15 @@ public void deleteShouldWorkWhenMultipleMessageIds() throws Exception {
     public void deleteShouldNotPropagateExceptionWhenExceptionOccurs() throws Exception {
         MailboxSession session = control.createMock(MailboxSession.class);
         Mailbox mailbox = control.createMock(Mailbox.class);
-        MessageUid messageId = MessageUid.of(1);
+        MessageUid messageUid = MessageUid.of(1);
         TestId mailboxId = TestId.of(12);
         expect(mailbox.getMailboxId()).andReturn(mailboxId).times(2);
 
         expect(indexer.deleteMessages(anyObject(List.class)))
             .andThrow(new ElasticsearchException(""));
 
         control.replay();
-        testee.delete(session, mailbox, Lists.newArrayList(messageId));
+        testee.delete(session, mailbox, Lists.newArrayList(messageUid));
         control.verify();
     }
 
@@ -194,8 +194,8 @@ public void updateShouldWork() throws Exception {
         Mailbox mailbox = control.createMock(Mailbox.class);
 
         Flags flags = new Flags();
-        MessageUid messageId = MessageUid.of(1);
+        MessageUid messageUid = MessageUid.of(1);
-        UpdatedFlags updatedFlags = new UpdatedFlags(messageId, MODSEQ, flags, flags);
+        UpdatedFlags updatedFlags = new UpdatedFlags(messageUid, MODSEQ, flags, flags);
         TestId mailboxId = TestId.of(12);
 
         expectLastCall();
@@ -217,8 +217,8 @@ public void updateShouldNotPropagateExceptionWhenExceptionOccurs() throws Except
 
         Mailbox mailbox = control.createMock(Mailbox.class);
         Flags flags = new Flags();
-        MessageUid messageId = MessageUid.of(1);
+        MessageUid messageUid = MessageUid.of(1);
-        UpdatedFlags updatedFlags = new UpdatedFlags(messageId, MODSEQ, flags, flags);
+        UpdatedFlags updatedFlags = new UpdatedFlags(messageUid, MODSEQ, flags, flags);
         TestId mailboxId = TestId.of(12);
 
         expectLastCall();