[jbossws-commits] JBossWS SVN: r10864 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Oct 8 06:39:42 EDT 2009
Author: alessio.soldano at jboss.com
Date: 2009-10-08 06:39:42 -0400 (Thu, 08 Oct 2009)
New Revision: 10864
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotationReaderTestCase.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2714] Removing tests move to framework + excluding test depending on CXF update
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotationReaderTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotationReaderTestCase.java 2009-10-08 10:39:04 UTC (rev 10863)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotationReaderTestCase.java 2009-10-08 10:39:42 UTC (rev 10864)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.jaxbintros;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-
-import org.jboss.jaxb.intros.IntroductionsAnnotationReader;
-import org.jboss.jaxb.intros.IntroductionsConfigParser;
-import org.jboss.jaxb.intros.configmodel.JaxbIntros;
-import org.jboss.wsf.test.JBossWSTest;
-
-import com.sun.xml.bind.api.JAXBRIContext;
-
-/**
- * @author Heiko.Braun at jboss.com
- */
-public class AnnotationReaderTestCase extends JBossWSTest
-{
- public void testUnmarshal() throws Exception
- {
- String reqString =
- " <ns1:user xmlns:ns1='http://org.jboss.ws/provider' string='Kermit'>" +
- " <qname>The Frog</qname>" +
- " </ns1:user>";
-
- JaxbIntros config = IntroductionsConfigParser.parseConfig(new FileInputStream(getResourceFile("jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml").getPath()));
-
- IntroductionsAnnotationReader reader = new IntroductionsAnnotationReader(config);
- Map<String, Object> jaxbConfig = new HashMap<String, Object>();
-
- jaxbConfig.put(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.ws/provider");
- jaxbConfig.put(JAXBRIContext.ANNOTATION_READER, reader);
-
- JAXBContext jaxbContext = JAXBContext.newInstance(new Class[] { UserType.class }, jaxbConfig);
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-
- JAXBElement jbe = unmarshaller.unmarshal(new StreamSource(new ByteArrayInputStream(reqString.getBytes())
-
- ), UserType.class);
-
- UserType ut = (UserType)jbe.getValue();
- assertEquals("Kermit", ut.getString());
- assertEquals("The Frog", ut.getQname().getLocalPart());
-
- }
-}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2009-10-08 10:39:04 UTC (rev 10863)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2009-10-08 10:39:42 UTC (rev 10864)
@@ -86,27 +86,26 @@
*/
public void testEndpoint() throws Exception
{
- System.out.println("FIXME: [CXF-2460][JBWS-2714] Re-enable test after updating to CXF 2.2.4");
-// try
-// {
-// URL wsdlURL = new URL(endpointAddress + "?wsdl");
-// QName serviceName = new QName("http://org.jboss.ws/cxf/jaxbintros", "EndpointBeanService");
-//
-// setBindingCustomizationOnClientSide();
-// Service service = Service.create(wsdlURL, serviceName);
-// Endpoint port = service.getPort(Endpoint.class);
-// UserType user = new UserType();
-// QName qname = new QName("ns", "local", "prefix");
-// user.setQname(qname);
-// user.setString("Foo");
-// UserType result = port.echo(user);
-// assertEquals("Foo", result.getString());
-// assertEquals(qname, result.getQname());
-// }
-// finally
-// {
-// restoreConfigurer();
-// }
+ try
+ {
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/cxf/jaxbintros", "EndpointBeanService");
+
+ setBindingCustomizationOnClientSide();
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = service.getPort(Endpoint.class);
+ UserType user = new UserType();
+ QName qname = new QName("ns", "local", "prefix");
+ user.setQname(qname);
+ user.setString("Foo");
+ UserType result = port.echo(user);
+ assertEquals("Foo", result.getString());
+ assertEquals(qname, result.getQname());
+ }
+ finally
+ {
+ restoreConfigurer();
+ }
}
/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-10-08 10:39:04 UTC (rev 10863)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-10-08 10:39:42 UTC (rev 10864)
@@ -44,3 +44,6 @@
# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2780] Update to CXF 2.2.4 to get fix for [CXF-2460]
+org/jboss/test/ws/jaxws/cxf/jaxbintros/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-10-08 10:39:04 UTC (rev 10863)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-10-08 10:39:42 UTC (rev 10864)
@@ -44,3 +44,6 @@
# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2780] Update to CXF 2.2.4 to get fix for [CXF-2460]
+org/jboss/test/ws/jaxws/cxf/jaxbintros/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-10-08 10:39:04 UTC (rev 10863)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-10-08 10:39:42 UTC (rev 10864)
@@ -44,3 +44,6 @@
# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2780] Update to CXF 2.2.4 to get fix for [CXF-2460]
+org/jboss/test/ws/jaxws/cxf/jaxbintros/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-08 10:39:04 UTC (rev 10863)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-08 10:39:42 UTC (rev 10864)
@@ -50,3 +50,6 @@
# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2780] Update to CXF 2.2.4 to get fix for [CXF-2460]
+org/jboss/test/ws/jaxws/cxf/jaxbintros/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-10-08 10:39:04 UTC (rev 10863)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-10-08 10:39:42 UTC (rev 10864)
@@ -44,3 +44,6 @@
# [JBWS-2770] Rewrite org.jboss.test.ws.jaxws.binding testcase
org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2780] Update to CXF 2.2.4 to get fix for [CXF-2460]
+org/jboss/test/ws/jaxws/cxf/jaxbintros/**
More information about the jbossws-commits
mailing list