From 277d61d5986090a676661d1ed25ffd9f84527042 Mon Sep 17 00:00:00 2001 From: Omkar Pote Date: Wed, 7 Feb 2024 12:30:21 +0530 Subject: [PATCH 1/2] fixing flaky test shouldConstructGraphAndCreateViewWithGroups --- .../src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java b/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java index 7ca4e6f7a1e..26f78e67df5 100644 --- a/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java +++ b/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java @@ -922,8 +922,8 @@ public void shouldConstructGraphAndCreateViewWithGroups(@Mock final Store store) // Then assertNotSame(schema, resultView); - assertArrayEquals(entities.keySet().toArray(), resultView.getEntityGroups().toArray()); - assertArrayEquals(edges.keySet().toArray(), resultView.getEdgeGroups().toArray()); + assertThat(entities.keySet()).isEqualTo(resultView.getEntityGroups()); + assertThat(edges.keySet()).isEqualTo(resultView.getEdgeGroups()); for (final ViewElementDefinition resultElementDef : resultView.getEntities().values()) { assertNotNull(resultElementDef); From 3472917f7ccf8af7fd347b4175997174c4fd78cc Mon Sep 17 00:00:00 2001 From: Omkar Pote Date: Wed, 7 Feb 2024 16:37:09 +0530 Subject: [PATCH 2/2] removing unused import --- core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java b/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java index 26f78e67df5..13c4075a764 100644 --- a/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java +++ b/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java @@ -115,7 +115,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull;