Fix flaky tests (faucetsdn#1057)

khyatimahendru · Jan 7, 2025 · 05adf88 · 05adf88
1 parent edddcbe
commit 05adf88
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/udmis/src/test/java/com/google/bos/udmi/service/core/ProcessorTestBase.java b/udmis/src/test/java/com/google/bos/udmi/service/core/ProcessorTestBase.java
@@ -15,6 +15,7 @@
 import com.google.udmi.util.CleanDateFormat;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import udmi.schema.EndpointConfiguration;
@@ -30,7 +31,7 @@ public abstract class ProcessorTestBase extends MessageTestBase {
   public static final String TEST_USER = "[email protected]";
   public static final Date TEST_TIMESTAMP = CleanDateFormat.cleanDate();
   public static final long ASYNC_PROCESSING_DELAY_MS = 2000;
-  protected final List<Object> captured = new ArrayList<>();
+  protected final List<Object> captured = Collections.synchronizedList(new ArrayList<>());
   protected IotAccessBase provider;
   private ProcessorBase processor;
 

diff --git a/...s/src/test/java/com/google/bos/udmi/service/messaging/impl/MessageDispatcherImplTest.java b/...s/src/test/java/com/google/bos/udmi/service/messaging/impl/MessageDispatcherImplTest.java
@@ -12,6 +12,7 @@
 import com.google.bos.udmi.service.messaging.MessageDispatcher;
 import com.google.udmi.util.JsonUtil;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -33,7 +34,7 @@ public class MessageDispatcherImplTest {
 
   public static final long GET_TIMEOUT_SEC = 1;
 
-  List<Object> devNullCapture = new ArrayList<>();
+  List<Object> devNullCapture = Collections.synchronizedList(new ArrayList<>());
 
   private EndpointConfiguration getConfiguration(boolean reversed) {
     EndpointConfiguration config = new EndpointConfiguration();

diff --git a/udmis/src/test/java/com/google/bos/udmi/service/messaging/impl/TraceMessagePipeTest.java b/udmis/src/test/java/com/google/bos/udmi/service/messaging/impl/TraceMessagePipeTest.java
@@ -15,6 +15,7 @@
 import com.google.udmi.util.JsonUtil;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -42,7 +43,7 @@ public class TraceMessagePipeTest {
   private static final String VALUE_ONE = "value1";
   private static final String VALUE_TWO = "value2";
   private static final Date FIRST_PUBLISHED = new Date(1681554607000L);
-  private final List<Bundle> consumed = new ArrayList<>();
+  private final List<Bundle> consumed = Collections.synchronizedList(new ArrayList<>());
 
   @SuppressWarnings("unchecked")
   private Map<String, String> extractMessage(Bundle bundle) {

diff --git a/validator/src/main/java/com/google/daq/mqtt/util/IotMockProvider.java b/validator/src/main/java/com/google/daq/mqtt/util/IotMockProvider.java
@@ -13,6 +13,7 @@
 import com.google.udmi.util.IotProvider;
 import com.google.udmi.util.SiteModel;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +36,7 @@ public class IotMockProvider implements IotProvider {
   private final SiteModel siteModel;
   private final String client;
   private final Map<String, CloudModel> cloudDevices = new HashMap<>();
-  private List<MockAction> mockActions = new ArrayList<>();
+  private List<MockAction> mockActions = Collections.synchronizedList(new ArrayList<>());
 
   /**
    * Create a mock provider used for unit testing.