Author: dkulp Date: Mon Jul 15 18:04:12 2013 New Revision: 1503380 URL: http://svn.apache.org/r1503380 Log: Merged revisions 1503348 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1503348 | dkulp | 2013-07-15 13:12:07 -0400 (Mon, 15 Jul 2013) | 10 lines Merged revisions 1502888 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1502888 | dkulp | 2013-07-13 17:29:39 -0400 (Sat, 13 Jul 2013) | 2 lines Don't compare the prefix ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?rev=1503380&r1=1503379&r2=1503380&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java Mon Jul 15 18:04:12 2013 @@ -84,7 +84,6 @@ public class JAXBEncoderDecoderTest exte @Before public void setUp() throws Exception { - context = JAXBContext.newInstance(new Class[] { GreetMe.class, GreetMeResponse.class, @@ -218,7 +217,7 @@ public class JAXBEncoderDecoderTest exte String xmlResult = stringWriter.toString(); // the following is a bit of a crock, but, to tell the truth, this test case most exists // so that it could be examined inside the debugger to see how JAXB works. - assertTrue(xmlResult.contains("ns3:string2")); + assertTrue(xmlResult.contains(":string2>cord</ns")); } @Test
