From 0b24ede354868ee323bf33ee7e511aaa7f9840a2 Mon Sep 17 00:00:00 2001 From: Nils-Helge Garli Date: Fri, 10 Aug 2007 06:37:07 +0000 Subject: [PATCH] WW-1836 Order of the entries in the entry set is not guaranteed. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@564485 13f79535-47bb-0310-9956-ffa450edef68 --- .../portlet/PortletRequestMapTest.java | 18 ++++++++++++++---- .../portlet/PortletSessionMapTest.java | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java index 75be1bb3a..b68f9ba4e 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java @@ -96,12 +96,22 @@ public class PortletRequestMapTest extends MockObjectTestCase { assertEquals(2, entries.size()); Iterator it = entries.iterator(); Map.Entry entry = (Map.Entry)it.next(); - assertEquals("testAttribute1", entry.getKey()); - assertEquals("testValue1", entry.getValue()); + checkEntry(entry); entry = (Map.Entry)it.next(); - assertEquals("testAttribute2", entry.getKey()); - assertEquals("testValue2", entry.getValue()); + checkEntry(entry); } + + private void checkEntry(Map.Entry entry) { + if(entry.getKey().equals("testAttribute1")) { + assertEquals("testValue1", entry.getValue()); + } + else if(entry.getKey().equals("testAttribute2")) { + assertEquals("testValue2", entry.getValue()); + } + else { + fail("Unexpected entry in etry set: " + entry); + } + } } diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java index 9d0834b2d..2e2246e14 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java @@ -99,12 +99,23 @@ public class PortletSessionMapTest extends TestCase { assertEquals(2, entries.size()); Iterator it = entries.iterator(); Map.Entry entry = (Map.Entry)it.next(); - assertEquals("testAttribute1", entry.getKey()); - assertEquals("testValue1", entry.getValue()); + checkEntry(entry); entry = (Map.Entry)it.next(); - assertEquals("testAttribute2", entry.getKey()); - assertEquals("testValue2", entry.getValue()); + checkEntry(entry); } + private void checkEntry(Map.Entry entry) { + if(entry.getKey().equals("testAttribute1")) { + assertEquals("testValue1", entry.getValue()); + } + else if(entry.getKey().equals("testAttribute2")) { + assertEquals("testValue2", entry.getValue()); + } + else { + fail("Unexpected entry in etry set: " + entry); + } + } + + }