Author: alessio.soldano(a)jboss.com Date: 2013-04-16 12:09:54 -0400 (Tue, 16 Apr 2013) New Revision: 17496 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-537] Adding testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-04-16 16:09:00 UTC (rev 17495) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-04-16 16:09:54 UTC (rev 17496) @@ -155,6 +155,26 @@ prefix="WEB-INF/lib/"/> </war> + <!-- jaxws-cxf-embedded-fail --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-embedded-fail.war" + webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF"> + <include name="beans.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/spring/" + prefix="WEB-INF/lib/"/> + <zipfileset + dir="${tests.output.dir}/cxf-embedded/" + prefix="WEB-INF/lib/"/> + <manifest> + <attribute name="Dependencies" value="javax.wsdl4j.api,org.apache.ws.xmlschema,org.apache.neethi,org.codehaus.woodstox"/> + </manifest> + </war> + <!-- jaxws-cxf-endorse --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war" manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2013-04-16 16:09:54 UTC (rev 17496) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.noIntegration; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; + +/** + * [AS7-537] Filter Apache CXF and dependencies + * + * Verifies deployment fails if the webservices subsystem is not disabled for the current deployment + * + * @author alessio.soldano(a)jboss.com + * @since 15-Apr-2013 + */ +public class AS7537TestCase extends JBossWSTest +{ + public void testFailureWithoutJBossDeploymentStructure() throws Exception { + boolean undeploy = true; + try { + JBossWSTestHelper.deploy("jaxws-cxf-embedded-fail.war"); + fail("Deployment failure expected"); + } catch (Exception e) { + undeploy = false; + assertTrue(e.getMessage().contains("JBAS015599")); + } finally { + if (undeploy) { + try { + JBossWSTestHelper.undeploy("jaxws-cxf-embedded-fail.war"); + } catch (Exception e) { + //ignore + } + } + } + } +} Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:09:00 UTC (rev 17495) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:09:54 UTC (rev 17496) @@ -659,6 +659,9 @@ <!-- # [CXF-4875] NPE resolving policy reference --> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> + + <!--# [AS7-537] Fixed on AS 8 or greater --> + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin> @@ -721,6 +724,9 @@ <!-- # [CXF-4875] NPE resolving policy reference --> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> + + <!--# [AS7-537] Fixed on AS 8 or greater --> + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin> @@ -780,6 +786,9 @@ <!-- # [CXF-4875] NPE resolving policy reference --> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> + + <!--# [AS7-537] Fixed on AS 8 or greater --> + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin> @@ -859,6 +868,9 @@ <!-- # [AS7-6765] fix in commit https://github.com/undertow-io/undertow/commit/d1747d12af796e9048308d3c63... --> <exclude>org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase*</exclude> + + <!--# [AS7-537] Filter Apache CXF --> + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin>