(james-project) 11/18: JAMES-3961 Mockito can no longer Mock EnumSet

[btellier]

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 6ea766d82aa5342f6a5aba903bce09876da43064
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Thu Jan 11 18:07:39 2024 +0100

    JAMES-3961 Mockito can no longer Mock EnumSet
---
 .../apache/james/jmap/draft/JMAPModuleTest.java    | 42 ++++++++++------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git 
a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java
 
b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java
index 0375d6ed6a..970da77e7a 100644
--- 
a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java
+++ 
b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java
@@ -39,19 +39,11 @@ class JMAPModuleTest {
 
         private RequiredCapabilitiesStartUpCheck testee;
         private MailboxManager mockMailboxManager;
-        private EnumSet<MailboxManager.MessageCapabilities> 
mockMessageCapabilities;
-        private EnumSet<MailboxManager.SearchCapabilities> 
mockSearchCapabilities;
 
         @SuppressWarnings("unchecked")
         @BeforeEach
         void beforeEach() {
             mockMailboxManager = mock(MailboxManager.class);
-            mockMessageCapabilities = 
(EnumSet<MailboxManager.MessageCapabilities>) mock(EnumSet.class);
-            mockSearchCapabilities = 
(EnumSet<MailboxManager.SearchCapabilities>) mock(EnumSet.class);
-            when(mockMailboxManager.getSupportedMessageCapabilities())
-                .thenReturn(mockMessageCapabilities);
-            when(mockMailboxManager.getSupportedSearchCapabilities())
-                .thenReturn(mockSearchCapabilities);
 
             testee = new RequiredCapabilitiesStartUpCheck(mockMailboxManager);
         }
@@ -60,10 +52,12 @@ class JMAPModuleTest {
         void checkShouldReturnGoodWhenAllChecksSatisfy() {
             when(mockMailboxManager.hasCapability(any()))
                 .thenReturn(true);
-            
when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class)))
-                .thenReturn(true);
-            
when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class)))
-                .thenReturn(true);
+
+
+            when(mockMailboxManager.getSupportedMessageCapabilities())
+                
.thenReturn(EnumSet.allOf(MailboxManager.MessageCapabilities.class));
+            when(mockMailboxManager.getSupportedSearchCapabilities())
+                
.thenReturn(EnumSet.allOf(MailboxManager.SearchCapabilities.class));
 
             assertThat(testee.check().isGood())
                 .isTrue();
@@ -73,10 +67,10 @@ class JMAPModuleTest {
         void checkShouldReturnBadWhenMailboxManagerDoesntHaveCapabilities() {
             when(mockMailboxManager.hasCapability(any()))
                 .thenReturn(false);
-            
when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class)))
-                .thenReturn(true);
-            
when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class)))
-                .thenReturn(true);
+            when(mockMailboxManager.getSupportedMessageCapabilities())
+                
.thenReturn(EnumSet.allOf(MailboxManager.MessageCapabilities.class));
+            when(mockMailboxManager.getSupportedSearchCapabilities())
+                
.thenReturn(EnumSet.allOf(MailboxManager.SearchCapabilities.class));
 
             assertThat(testee.check().isBad())
                 .isTrue();
@@ -86,10 +80,10 @@ class JMAPModuleTest {
         void 
checkShouldReturnBadWhenMailboxManagerDoesntHaveMessagesCapabilities() {
             when(mockMailboxManager.hasCapability(any()))
                 .thenReturn(true);
-            
when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class)))
-                .thenReturn(false);
-            
when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class)))
-                .thenReturn(true);
+            when(mockMailboxManager.getSupportedMessageCapabilities())
+                
.thenReturn(EnumSet.noneOf(MailboxManager.MessageCapabilities.class));
+            when(mockMailboxManager.getSupportedSearchCapabilities())
+                
.thenReturn(EnumSet.allOf(MailboxManager.SearchCapabilities.class));
 
             assertThat(testee.check().isBad())
                 .isTrue();
@@ -99,10 +93,10 @@ class JMAPModuleTest {
         void 
checkShouldReturnBadWhenMailboxManagerDoesntHaveSearchCapabilities() {
             when(mockMailboxManager.hasCapability(any()))
                 .thenReturn(true);
-            
when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class)))
-                .thenReturn(true);
-            
when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class)))
-                .thenReturn(false);
+            when(mockMailboxManager.getSupportedMessageCapabilities())
+                
.thenReturn(EnumSet.allOf(MailboxManager.MessageCapabilities.class));
+            when(mockMailboxManager.getSupportedSearchCapabilities())
+                
.thenReturn(EnumSet.noneOf(MailboxManager.SearchCapabilities.class));
 
             assertThat(testee.check().isBad())
                 .isTrue();


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org