[plugin-email] Stabilize flaky unit tests (#2312)

vividus-framework · Dec 22, 2021 · eb591ca · eb591ca
1 parent ff5cf18
commit eb591ca
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...dus-plugin-email/src/test/java/org/vividus/email/service/ImapFetchServiceSystemTests.java b/...dus-plugin-email/src/test/java/org/vividus/email/service/ImapFetchServiceSystemTests.java
@@ -66,9 +66,6 @@ class ImapFetchServiceSystemTests
     private static GreenMail mailServer;
     private static GreenMailUser mailUser;
 
-    private final EmailFetchService service = new ImapFetchService(Duration.ofSeconds(30), 6, "INBOX",
-            new EmailMessageFactory());
-
     @BeforeAll
     static void initServer()
     {
@@ -102,6 +99,7 @@ void cleanUp() throws FolderException
     })
     void testFetch(long deliveryDelay, long testTimeout) throws MessagingException
     {
+        ImapFetchService service = serviceWith(90, 15);
         String subject = GreenMailUtil.random();
         FailablePredicate<Message, MessagingException> subjectPredicate = EmailParameterFilterFactory.SUBJECT
                 .createFilter(ComparisonRule.EQUAL_TO.name(), subject);
@@ -136,6 +134,7 @@ void testFetchNoEmailReceived()
                 .createFilter(ComparisonRule.EQUAL_TO.name(), subject);
 
         List<EmailMessage> receivedMessages = new ArrayList<>();
+        ImapFetchService service = serviceWith(5, 1);
         assertTimeout(Duration.ofMinutes(1),
             () -> receivedMessages.addAll(service.fetch(List.of(subjectPredicate), getConfig())));
 
@@ -151,6 +150,11 @@ private static EmailServerConfiguration getConfig()
                 ));
     }
 
+    private ImapFetchService serviceWith(int waitTimeout, int retries)
+    {
+        return new ImapFetchService(Duration.ofSeconds(waitTimeout), retries, "INBOX", new EmailMessageFactory());
+    }
+
     private static void scheduleSendEmail(long deliveryDelay, String subject)
     {
         try