Author: dkulp Date: Fri Nov 16 18:45:28 2012 New Revision: 1410533 URL: http://svn.apache.org/viewvc?rev=1410533&view=rev Log: Merged revisions 1410530 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1410530 | dkulp | 2012-11-16 13:40:47 -0500 (Fri, 16 Nov 2012) | 10 lines Merged revisions 1410515 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1410515 | dkulp | 2012-11-16 13:03:48 -0500 (Fri, 16 Nov 2012) | 2 lines Fix another IBM JDK random failure. ........ ........ Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java?rev=1410533&r1=1410532&r2=1410533&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java (original) +++ cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java Fri Nov 16 18:45:28 2012 @@ -21,6 +21,7 @@ package org.apache.cxf.tools.wsdlto.jaxw import java.io.File; import java.net.URISyntaxException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -32,6 +33,7 @@ import org.apache.cxf.tools.common.Front import org.apache.cxf.tools.common.ProcessorTestBase; import org.apache.cxf.tools.common.ToolConstants; import org.apache.cxf.tools.common.ToolContext; +import org.apache.cxf.tools.common.model.JavaException; import org.apache.cxf.tools.common.model.JavaInterface; import org.apache.cxf.tools.common.model.JavaMethod; import org.apache.cxf.tools.common.model.JavaModel; @@ -188,8 +190,13 @@ public class JAXWSContainerTest extends assertTrue(methodSame); assertEquals(2, m1.getExceptions().size()); - assertEquals("BadRecordLitFault", m1.getExceptions().get(0).getName()); - assertEquals("NoSuchCodeLitFault", m1.getExceptions().get(1).getName()); + List<String> names = new ArrayList<String>(); + for (JavaException exc : m1.getExceptions()) { + names.add(exc.getName()); + } + + assertTrue("BadRecordLitFault", names.contains("BadRecordLitFault")); + assertTrue("NoSuchCodeLitFault", names.contains("NoSuchCodeLitFault")); String address = null;
