Increased timeout waiting for entity creation

Author: hylkevds

FROST-Server.Tests/src/test/java/de/fraunhofer/iosb/ilt/statests/f01auth/FineGrainedAuthTests.java

@@ -25,6 +25,7 @@
 import static de.fraunhofer.iosb.ilt.statests.f01auth.SensorThingsUserModel.EP_USERNAME;
 import static de.fraunhofer.iosb.ilt.statests.util.EntityUtils.filterForException;
 import static de.fraunhofer.iosb.ilt.statests.util.EntityUtils.testFilterResults;
+import static de.fraunhofer.iosb.ilt.statests.util.mqtt.MqttHelper2.MQTT_READ_RETRIES;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -795,7 +796,7 @@ public static interface StringCreator {
 
     private static class MqttCreateTester {
 
-        private static final int JOIN_TIMEOUT = 5000;
+        private static final int JOIN_TIMEOUT = 500 + MqttHelper2.MQTT_READ_RETRIES * MqttHelper2.WAIT_AFTER_INSERT;
 
         private final MqttHelper2 mh;
         private final EntityHelper2 eh;
@@ -848,7 +849,7 @@ private void executeTest() {
                 Entity entity = entityCreator.create(name);
                 String json = JsonWriter.writeEntity(entity);
                 mh.publish(topic, json);
-                createdEntity = eh.getEntityWithRetry(et, filterCreator.create(name), null, 15);
+                createdEntity = eh.getEntityWithRetry(et, filterCreator.create(name), null, MQTT_READ_RETRIES);
                 if (createdEntity == null && !expectSuccess) {
                     success = true;
                     message = "Success";

FROST-Server.Tests/src/test/java/de/fraunhofer/iosb/ilt/statests/util/EntityHelper2.java

@@ -242,6 +242,7 @@ public Entity getEntityWithRetry(EntityType entityType, String filter, String ex
             }
             Entity entity = query.first();
             if (entity != null) {
+                LOGGER.info("Found entity of type {} after {} tries with filter {}: {}", entityType, retry, filter, entity);
                 return entity;
             }
             retry++;
@@ -259,7 +260,7 @@ public JsonNode getEntityJsonWithRetry(EntityType entityType, String expand, int
     public JsonNode getEntityJsonWithRetry(EntityType entityType, String filter, String expand, int retries) {
         int retry = 0;
         while (retry < retries) {
-            JsonNode entity = EntityHelper2.this.getEntityJson(entityType, filter, expand);
+            JsonNode entity = getEntityJson(entityType, filter, expand);
             if (entity != null) {
                 return entity;
             }

FROST-Server.Tests/src/test/java/de/fraunhofer/iosb/ilt/statests/util/mqtt/MqttHelper2.java

@@ -56,8 +56,9 @@
  */
 public class MqttHelper2 {
 
-    public static final int WAIT_AFTER_INSERT = 100;
+    public static final int WAIT_AFTER_INSERT = 150;
     public static final int WAIT_AFTER_CLEANUP = 1;
+    public static final int MQTT_READ_RETRIES = 40;
     public static final int QOS = 2;
     public String clientId = "TS";