Author: richard.opalka(a)jboss.com
Date: 2010-01-04 05:14:26 -0500 (Mon, 04 Jan 2010)
New Revision: 11360
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java
Log:
[JBWS-2838] fixing common test suite
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
===================================================================
---
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2010-01-04
10:13:25 UTC (rev 11359)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2010-01-04
10:14:26 UTC (rev 11360)
@@ -36,10 +36,11 @@
import org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource;
/**
- *
+ *
*/
public class JBWS2000TestCase extends JBossWSTest
{
+
private FileTransferService port;
public static Test suite()
@@ -48,11 +49,11 @@
}
protected void setUp() throws Exception
- {
+ {
if (port == null)
{
- URL wsdlURL = new URL("http://" + getServerHost() +
":8080/jaxws-jbws2000/FileTransferServiceImpl?wsdl");
- QName serviceName = new
QName("http://service.mtom.test.net/",
"FileTransferServiceImplService");
+ URL wsdlURL = new URL("http://" + getServerHost() +
":8080/jaxws-jbws2000/FileTransfer?wsdl");
+ QName serviceName = new
QName("http://service.mtom.test.net/",
"FileTransferServiceImplService");
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(FileTransferService.class);
@@ -69,5 +70,5 @@
boolean success = port.transferFile("JBWS2000.data", dh);
assertTrue("Failed to transfer file", success);
}
-
+
}
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java
===================================================================
---
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java 2010-01-04
10:13:25 UTC (rev 11359)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java 2010-01-04
10:14:26 UTC (rev 11360)
@@ -44,13 +44,14 @@
*/
public class JAXBIntroTestCase extends JBossWSTest
{
- private String endpointAddress = "http://" + getServerHost() +
":8080/jaxws-samples-jaxbintros/EndpointBean";
-
+
+ private String endpointAddress = "http://" + getServerHost() +
":8080/jaxws-samples-jaxbintros/EndpointService";
+
public static Test suite()
{
return new JBossWSTestSetup(JAXBIntroTestCase.class,
"jaxws-samples-jaxbintros.jar");
}
-
+
@SuppressWarnings("unchecked")
public void testWSDLAccess() throws Exception
{
@@ -69,10 +70,10 @@
}
assertTrue("<xs:attribute name=\"string\" ..> not found in
wsdl", attributeFound);
}
-
+
/**
* Client side uses the annotated user type class, server side uses the plain one but
has jaxbintros in place
- *
+ *
* @throws Exception
*/
public void testAnnotatedUserEndpoint() throws Exception
@@ -89,5 +90,6 @@
AnnotatedUserType result = port.echo(user);
assertEquals("Foo", result.getString());
assertEquals(qname, result.getQname());
- }
+ }
+
}