From cc1b12beddee5bb5c2a913fc908aa2b13ea19c99 Mon Sep 17 00:00:00 2001 From: Anirudh Date: Tue, 21 Nov 2023 10:50:52 -0600 Subject: [PATCH 1/2] fix flaky test --- .../asserts/hamcrest/ParameterHolderAssertionsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java b/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java index 8f2b68b..f859f9b 100644 --- a/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java +++ b/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java @@ -1,5 +1,4 @@ package net.ttddyy.dsproxy.asserts.hamcrest; - import net.ttddyy.dsproxy.asserts.ParameterByIndexHolder; import net.ttddyy.dsproxy.asserts.ParameterByNameHolder; import org.junit.Assert; @@ -15,6 +14,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.LinkedHashMap; import static net.ttddyy.dsproxy.asserts.hamcrest.ParameterHolderAssertions.param; import static net.ttddyy.dsproxy.asserts.hamcrest.ParameterHolderAssertions.paramAsArray; @@ -110,9 +110,9 @@ public void testParamsByName() { @Test public void testParamsByNameUnmatchedMessage() { - Map map = new HashMap<>(); - map.put("foo", 100); + Map map = new LinkedHashMap<>(); map.put("bar", 200); + map.put("foo", 100); ParameterByNameHolder holder = mock(ParameterByNameHolder.class); given(holder.getSetParamsByName()).willReturn(map); From e89442fec66b3b96f5a489fd67a3c8ad8deb3aa1 Mon Sep 17 00:00:00 2001 From: Anirudh Madhavan Date: Wed, 22 Nov 2023 15:53:32 -0600 Subject: [PATCH 2/2] revert new line --- .../dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java b/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java index f859f9b..d0ebda7 100644 --- a/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java +++ b/src/test/java/net/ttddyy/dsproxy/asserts/hamcrest/ParameterHolderAssertionsTest.java @@ -1,4 +1,5 @@ package net.ttddyy.dsproxy.asserts.hamcrest; + import net.ttddyy.dsproxy.asserts.ParameterByIndexHolder; import net.ttddyy.dsproxy.asserts.ParameterByNameHolder; import org.junit.Assert;