[jbossws-commits] JBossWS SVN: r13386 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor and 1 other directory.

Author: jim.ma Date: 2010-12-03 00:43:31 -0500 (Fri, 03 Dec 2010) New Revision: 13386 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java Log: [JBPAPP-5494]:Added cast case Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-12-02 18:46:58 UTC (rev 13385) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-12-03 05:43:31 UTC (rev 13386) @@ -26,7 +26,11 @@ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/TestLoggingInInterceptor.class"/> </classes> + <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/"> + <include name="cxf.xml"/> + </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-02 18:46:58 UTC (rev 13385) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2010-12-03 05:43:31 UTC (rev 13386) @@ -29,4 +29,5 @@ public interface DescriptorEndpoint { String echo(String input); + String getInBoundLog(); } Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-02 18:46:58 UTC (rev 13385) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2010-12-03 05:43:31 UTC (rev 13386) @@ -46,4 +46,10 @@ return input; } + + @WebMethod + public String getInBoundLog() + { + return new String(TestLoggingInInterceptor.stringWriter.getBuffer()); + } } Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-02 18:46:58 UTC (rev 13385) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2010-12-03 05:43:31 UTC (rev 13386) @@ -57,5 +57,9 @@ Object retObj = port.echo("Hello"); assertEquals("Hello", retObj); + + //JBPAPP-5494/JBWS-3174: test the cxf.xml is loaded + String serverInBoundLog = port.getInBoundLog(); + assertTrue(serverInBoundLog.length() > 0); } }