Review: Fix license header; stabilize unit tests.

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Nov 3, 2021 · a391b0d · a391b0d
1 parent d90c7de
commit a391b0d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...vity/model/src/main/java/org/eclipse/ditto/connectivity/model/OAuthClientCredentials.java b/...vity/model/src/main/java/org/eclipse/ditto/connectivity/model/OAuthClientCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.

diff --git a/...e/src/test/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActorTest.java b/...e/src/test/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActorTest.java
@@ -135,7 +135,7 @@ public void reconnectsInConnectingStateIfFailureResponseReceived() {
 
     @Test
     public void reconnectsInConnectingStateAfterBackoffWhenMultipleFailuresAreReceived() {
-        // expect reconnects after 100ms + 200ms + 400ms + 400ms = 1100ms backoff in total
+        // expect reconnects after 100ms + 200ms + 400ms + 400ms = 1100ms
         final long expectedTotalBackoffMs = 1100L;
         reconnectsAfterBackoffWhenMultipleFailuresReceived(false, expectedTotalBackoffMs);
     }

diff --git a/.../test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpClientActorTest.java b/.../test/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpClientActorTest.java
@@ -43,7 +43,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -472,22 +471,23 @@ public void testSetMessageListenerOnConsumerFails() throws JMSException {
             amqpClientActor.tell(OpenConnection.of(CONNECTION_ID, DittoHeaders.empty()), getRef());
             expectMsgClass(Status.Failure.class);
 
-            final AtomicInteger count = new AtomicInteger(20);
             Awaitility.await()
                     .pollInterval(Duration.ofMillis(100))
-                    .atMost(Duration.ofSeconds(5)).until(() -> {
-                        amqpClientActor.tell(RetrieveConnectionStatus.of(CONNECTION_ID, DittoHeaders.empty()), getRef());
+                    .atMost(Duration.ofSeconds(10))
+                    .untilAsserted(() -> {
+                        amqpClientActor.tell(RetrieveConnectionStatus.of(CONNECTION_ID, DittoHeaders.empty()),
+                                getRef());
                         fishForMessage(Duration.ofSeconds(1), "client status", o -> {
                             if (o instanceof ResourceStatus) {
                                 final ResourceStatus resourceStatus = (ResourceStatus) o;
                                 if (resourceStatus.getResourceType() == ResourceStatus.ResourceType.CLIENT) {
-                                    assertThat((Object) resourceStatus.getStatus()).isEqualTo(ConnectivityStatus.MISCONFIGURED);
+                                    assertThat((Object) resourceStatus.getStatus())
+                                            .isEqualTo(ConnectivityStatus.MISCONFIGURED);
                                     return true;
                                 }
                             }
                             return false;
                         });
-                        return count.decrementAndGet() == 0;
                     });
         }};
     }