Author: alessio.soldano(a)jboss.com
Date: 2009-10-19 11:33:32 -0400 (Mon, 19 Oct 2009)
New Revision: 10954
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Log:
[JBWS-2479] Enabling test for Metro stack
Deleted:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java
===================================================================
---
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java 2009-10-19
15:20:40 UTC (rev 10953)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanNoAdapter.java 2009-10-19
15:33:32 UTC (rev 10954)
@@ -1,62 +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.smoke.tools;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlList;
-
-@WebService(targetNamespace = "http://foo.bar.com/calculator",
serviceName="CalculatorBeanService")
-public class CalculatorBeanNoAdapter
-{
- @WebMethod
- public int add(int a, int b)
- {
- return a+b;
- }
-
- @WebMethod
- public int subtract(int a, int b)
- {
- return a-b;
- }
-
- @WebMethod
- public Set<Integer> getKeys(HashMap<Integer, String> map)
- {
- if (map != null)
- return map.keySet();
- else
- return null;
- }
-
- @WebMethod
- @XmlList
- public List<String> processList(@XmlList List<String> list)
- {
- return list;
- }
-}
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
---
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-10-19
15:20:40 UTC (rev 10953)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-10-19
15:33:32 UTC (rev 10954)
@@ -159,17 +159,10 @@
responseWrapper =
loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.ProcessListResponse");
XmlList xmlList = (XmlList)
responseWrapper.getDeclaredField("_return").getAnnotation(XmlList.class);
assertNotNull("@XmlList missing from response wrapper's _return
field", xmlList);
- if (!isIntegrationMetro())
- {
- responseWrapper =
loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.ProcessCustomResponse");
- XmlJavaTypeAdapter xmlJavaTypeAdapter = (XmlJavaTypeAdapter)
responseWrapper.getDeclaredField("_return").getAnnotation(XmlJavaTypeAdapter.class);
- assertNotNull("@XmlJavaTypeAdapter missing from response wrapper's
_return field", xmlJavaTypeAdapter);
- assertEquals("org.jboss.test.ws.jaxws.smoke.tools.CustomAdapter",
xmlJavaTypeAdapter.value().getName());
- }
- else
- {
- System.out.println("FIXME: [JBWS-2479] @XmlJavaTypeAdapter on SEI causes
exception");
- }
+ responseWrapper =
loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.ProcessCustomResponse");
+ XmlJavaTypeAdapter xmlJavaTypeAdapter =
(XmlJavaTypeAdapter)responseWrapper.getDeclaredField("_return").getAnnotation(XmlJavaTypeAdapter.class);
+ assertNotNull("@XmlJavaTypeAdapter missing from response wrapper's _return
field", xmlJavaTypeAdapter);
+ assertEquals("org.jboss.test.ws.jaxws.smoke.tools.CustomAdapter",
xmlJavaTypeAdapter.value().getName());
}
/**
@@ -292,8 +285,6 @@
{
//provider.setGenerateSource(true);
provider.setOutputDirectory(outputDirectory);
- //JBWS-2479: using different beans because the whole smoke tools test is supposed
to be run for every stack
- //and we can't afford excluding it for Metro just because of JBWS-2479
- provider.provide(!isIntegrationMetro() ? CalculatorBean.class :
CalculatorBeanNoAdapter.class);
+ provider.provide(CalculatorBean.class);
}
}