From da3c2741e831c04e10e31378999e48c081fab712 Mon Sep 17 00:00:00 2001 From: simonh5 Date: Mon, 2 Oct 2023 02:26:37 -0500 Subject: [PATCH] Fix flaky test assertion #2644 in org.apache.helix.rest.server. TestInstancesAccessor#testGetAllInstances --- .../apache/helix/rest/server/TestInstancesAccessor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java index fa059ad303..19de8ca3c5 100644 --- a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java +++ b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java @@ -159,8 +159,12 @@ public void testGetAllInstances() throws IOException { Set instances = OBJECT_MAPPER.readValue(instancesStr, OBJECT_MAPPER.getTypeFactory().constructCollectionType(Set.class, String.class)); - Assert.assertEquals(instances, _instancesMap.get(CLUSTER_NAME), "Instances from response: " - + instances + " vs instances actually: " + _instancesMap.get(CLUSTER_NAME)); + Assert.assertEquals(instances.size(), _instancesMap.get(CLUSTER_NAME).size(), "Different amount of elements in " + + "the sets: " + instances.size() + " vs: " + _instancesMap.get(CLUSTER_NAME).size()); + Assert.assertTrue(instances.containsAll(_instancesMap.get(CLUSTER_NAME)), "instances set does not contain all " + + "elements of _instanceMap"); + Assert.assertTrue(_instancesMap.get(CLUSTER_NAME).containsAll(instances), "_instanceMap set does not contain all " + + "elements of instances"); System.out.println("End test :" + TestHelper.getTestMethodName()); }