[jbossws-commits] JBossWS SVN: r4385 - in stack/native/trunk/src/test: java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo and 2 other directories.

Author: richard_opalka Date: 2007-08-16 06:49:29 -0400 (Thu, 16 Aug 2007) New Revision: 4385 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java stack/native/trunk/src/test/resources/test-excludes-jboss40.txt stack/native/trunk/src/test/resources/test-excludes-jboss42.txt stack/native/trunk/src/test/resources/test-excludes-jboss50.txt Log: [JBWS-1787] propagating minimized fixmes and excludes list to the trunk Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-08-16 09:33:05 UTC (rev 4384) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-08-16 10:49:29 UTC (rev 4385) @@ -28,6 +28,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPFactory; import junit.framework.Test; @@ -65,71 +66,68 @@ public void testWildCardArrayWithOtherNS() throws Exception { - System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew"); -// SOAPFactory factory = SOAPFactory.newInstance(); -// -// SOAPElement el1 = factory.createElement("name", "ns1", "http://somens"); -// el1.setValue("Kermmit"); -// SOAPElement el2 = factory.createElement("product", "ns1", "http://somens"); -// el2.setValue("Ferrari"); -// -// ArrayOfAny inObj = new ArrayOfAny(new SOAPElement[] { el1, el2 }); -// ArrayOfAny retObj = port.echo(inObj); -// -// assertNotNull(retObj); -// assertNotNull(retObj._any); -// assertEquals(inObj._any.length, retObj._any.length); -// -// for(int i = 0; i < inObj._any.length; ++i) -// { -// SOAPElement inE = inObj._any[i]; -// SOAPElement retE = retObj._any[i]; -// assertEquals(inE, retE); -// } + SOAPFactory factory = SOAPFactory.newInstance(); + + SOAPElement el1 = factory.createElement("name", "ns1", "http://somens"); + el1.setValue("Kermmit"); + SOAPElement el2 = factory.createElement("product", "ns1", "http://somens"); + el2.setValue("Ferrari"); + + ArrayOfAny inObj = new ArrayOfAny(new SOAPElement[] { el1, el2 }); + ArrayOfAny retObj = port.echo(inObj); + + assertNotNull(retObj); + assertNotNull(retObj._any); + assertEquals(inObj._any.length, retObj._any.length); + + for(int i = 0; i < inObj._any.length; ++i) + { + SOAPElement inE = inObj._any[i]; + SOAPElement retE = retObj._any[i]; + assertEquals(inE, retE); + } } public void testWildCardArrayWithAnyNS() throws Exception { - System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew"); -// SOAPFactory factory = SOAPFactory.newInstance(); -// -// SOAPElement el1 = factory.createElement("name", "ns1", "http://somens"); -// el1.setValue("Kermmit"); -// SOAPElement el2 = factory.createElement("product", "ns1", "http://somens"); -// el2.setValue("Ferrari"); -// -// ArrayOfAny2 inObj = new ArrayOfAny2(new SOAPElement[] { el1, el2 }); -// ArrayOfAny2 retObj = port.echo2(inObj); -// -// assertNotNull(retObj); -// assertNotNull(retObj._any); -// assertEquals(inObj._any.length, retObj._any.length); -// -// for(int i = 0; i < inObj._any.length; ++i) -// { -// SOAPElement inE = inObj._any[i]; -// SOAPElement retE = retObj._any[i]; -// assertEquals(inE, retE); -// } + SOAPFactory factory = SOAPFactory.newInstance(); + + SOAPElement el1 = factory.createElement("name", "ns1", "http://somens"); + el1.setValue("Kermmit"); + SOAPElement el2 = factory.createElement("product", "ns1", "http://somens"); + el2.setValue("Ferrari"); + + ArrayOfAny2 inObj = new ArrayOfAny2(new SOAPElement[] { el1, el2 }); + ArrayOfAny2 retObj = port.echo2(inObj); + + assertNotNull(retObj); + assertNotNull(retObj._any); + assertEquals(inObj._any.length, retObj._any.length); + + for(int i = 0; i < inObj._any.length; ++i) + { + SOAPElement inE = inObj._any[i]; + SOAPElement retE = retObj._any[i]; + assertEquals(inE, retE); + } } public void testWildCardArrayWithMaxOccurance() throws Exception { -// SOAPFactory factory = SOAPFactory.newInstance(); -// -// SOAPElement el1 = factory.createElement("name", "ns1", "http://somens"); -// el1.setValue("Kermmit"); -// -// TypeOfAny3 inObj = new TypeOfAny3(el1); -// TypeOfAny3 retObj = port.echo3(inObj); -// -// assertNotNull(retObj); -// assertNotNull(retObj._any); -// -// SOAPElement inE = inObj._any; -// SOAPElement retE = retObj._any; -// assertEquals(inE, retE); + SOAPFactory factory = SOAPFactory.newInstance(); + SOAPElement el1 = factory.createElement("name", "ns1", "http://somens"); + el1.setValue("Kermmit"); + + TypeOfAny3 inObj = new TypeOfAny3(el1); + TypeOfAny3 retObj = port.echo3(inObj); + + assertNotNull(retObj); + assertNotNull(retObj._any); + + SOAPElement inE = inObj._any; + SOAPElement retE = retObj._any; + assertEquals(inE, retE); } /** @@ -138,21 +136,20 @@ */ public void testWildCardContentsDeclared() throws Exception { - System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew"); -// SOAPFactory factory = SOAPFactory.newInstance(); -// -// SOAPElement el1 = factory.createElement("knownWildcard", "ns1", "http://somens"); -// el1.setValue("Kermmit"); -// -// TypeOfAny3 inObj = new TypeOfAny3(el1); -// TypeOfAny3 retObj = port.echo3(inObj); -// -// assertNotNull(retObj); -// assertNotNull(retObj._any); -// -// SOAPElement inE = inObj._any; -// SOAPElement retE = retObj._any; -// assertEquals(inE, retE); + SOAPFactory factory = SOAPFactory.newInstance(); + + SOAPElement el1 = factory.createElement("knownWildcard", "ns1", "http://somens"); + el1.setValue("Kermmit"); + + TypeOfAny3 inObj = new TypeOfAny3(el1); + TypeOfAny3 retObj = port.echo3(inObj); + + assertNotNull(retObj); + assertNotNull(retObj._any); + + SOAPElement inE = inObj._any; + SOAPElement retE = retObj._any; + assertEquals(inE, retE); } private static void assertEquals(SOAPElement myE, SOAPElement otherE) Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-08-16 09:33:05 UTC (rev 4384) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-08-16 10:49:29 UTC (rev 4385) @@ -56,7 +56,7 @@ if (port == null) { - if (isTargetJBoss42()) + if (!isTargetJBoss50()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); @@ -64,9 +64,7 @@ } else { - if (isTargetJBoss50()) - System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); - + System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml").toURL(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-08-16 09:33:05 UTC (rev 4384) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-08-16 10:49:29 UTC (rev 4385) @@ -77,12 +77,6 @@ public void testWSDLAccess() throws MalformedURLException { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBWEB-1770] Fix Endpoint API for jboss-5.0.0.Beta3"); - return; - } - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?wsdl"); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); @@ -91,12 +85,6 @@ public void testClientAccess() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBWEB-1770] Fix Endpoint API for jboss-5.0.0.Beta3"); - return; - } - // Create the port URL wsdlURL = new File("resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl").toURL(); QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService"); @@ -110,15 +98,8 @@ public void testServletAccess() throws Exception { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBWEB-1770] Fix Endpoint API for jboss-5.0.0.Beta3"); - return; - } - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); - } } Modified: stack/native/trunk/src/test/resources/test-excludes-jboss40.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-08-16 09:33:05 UTC (rev 4384) +++ stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-08-16 10:49:29 UTC (rev 4385) @@ -1,14 +1,9 @@ # JBossAS-4.0 excludes org/jboss/test/ws/jaxrpc/jbws723/** -# benchmark tests -org/jboss/test/ws/benchmark/** - # EJB3/Injection excludes org/jboss/test/ws/jaxws/jbws1581/** org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/serviceref/** org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/webserviceref/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss42.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-16 09:33:05 UTC (rev 4384) +++ stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-16 10:49:29 UTC (rev 4385) @@ -1,11 +1,3 @@ -# benchmark tests -org/jboss/test/ws/benchmark/** - # EJB3/Injection excludes -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/serviceref/** org/jboss/test/ws/jaxws/samples/webserviceref/** - org/jboss/test/ws/jaxws/webserviceref/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss50.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-08-16 09:33:05 UTC (rev 4384) +++ stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-08-16 10:49:29 UTC (rev 4385) @@ -1,19 +1,6 @@ -# benchmark tests -#org/jboss/test/ws/benchmark/** - # Fix before JBoss50 goes final -org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* -org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.* -org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.* -org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.* -org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.* -org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.* -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* org/jboss/test/ws/jaxrpc/wsdlpublish/** -