Author: chris.laprun(a)jboss.com Date: 2008-11-26 14:18:43 -0500 (Wed, 26 Nov 2008) New Revision: 12309 Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java Log: - JBPORTAL-2244: Test was bad (relying on order where none actually exists) Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java 2008-11-26 18:10:13 UTC (rev 12308) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java 2008-11-26 19:18:43 UTC (rev 12309) @@ -144,7 +144,7 @@ // now modify Producer's set of required registration info String newPropName = "New Prop"; RegistrationPropertyDescription regProp = new RegistrationPropertyDescription(newPropName, - new QName("urn:oasis:names:tc:wsrp:v1:types", "LocalizedString", "ns1")); + new QName("urn:oasis:names:tc:wsrp:v1:types", "LocalizedString", "ns1")); regProp.setDefaultLabel("New Registration Property"); producer.getProducerRegistrationRequirements().addRegistrationProperty(regProp); @@ -184,10 +184,20 @@ // remove registration context, try again and check that we get new registration info gs.setRegistrationContext(null); PropertyDescription[] pds = serviceDescriptionService.getServiceDescription(gs) - .getRegistrationPropertyDescription().getPropertyDescriptions(); + .getRegistrationPropertyDescription().getPropertyDescriptions(); ExtendedAssert.assertEquals(2, pds.length); - assertEquals(WSRPUtils.convertToPropertyDescription(regProp), pds[1]); + // Check that one of the returned property description is equal to the one we just added + PropertyDescription description = pds[1]; + if (description.getName().startsWith("New")) + { + assertEquals(WSRPUtils.convertToPropertyDescription(regProp), description); + } + else + { + assertEquals(WSRPUtils.convertToPropertyDescription(regProp), pds[0]); + } + // Update registration data RegistrationData regData = createBaseRegData(); org.jboss.portal.wsrp.core.Property[] props = regData.getRegistrationProperties(); @@ -211,7 +221,7 @@ // now modify Producer's set of required registration info String newPropName = "New Prop"; RegistrationPropertyDescription regProp = new RegistrationPropertyDescription(newPropName, - new QName("urn:oasis:names:tc:wsrp:v1:types", "LocalizedString", "ns1")); + new QName("urn:oasis:names:tc:wsrp:v1:types", "LocalizedString", "ns1")); regProp.setDefaultLabel("New Registration Property"); producer.getProducerRegistrationRequirements().addRegistrationProperty(regProp);