[openejb-scm] openejb/modules/core/src/test/org/openejb/server/axis WSContainerTest.java

[djencks]

djencks     2005/07/01 20:03:42

  Modified:    modules/core/src/test/org/openejb/server/axis
                        WSContainerTest.java
  Log:

  fix broken openejb and tomcat wsdl-lookup tests
  
  Revision  Changes    Path
  1.9       +6 -5      
openejb/modules/core/src/test/org/openejb/server/axis/WSContainerTest.java
  
  Index: WSContainerTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/server/axis/WSContainerTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WSContainerTest.java      26 Jun 2005 17:39:52 -0000      1.8
  +++ WSContainerTest.java      2 Jul 2005 00:03:38 -0000       1.9
  @@ -109,7 +109,8 @@
   
           ObjectName ejbContainer = MockEJBContainer.addGBean(kernel, 
"MockEJB", classLoader);
           ObjectName listener = SoapHttpListenerGBean.addGBean(kernel, 
"HTTPSOAP");
  -        ObjectName wsContainer = WSContainerGBean.addGBean(kernel, 
"HTTPSOAP", ejbContainer, listener, new URI("/test/service"), wsdlURI, 
serviceInfo);
  +        //At the moment ejb web services can only be deployed at the 
location mentioned in the wsdl, so the uri has to be /services/Simple
  +        ObjectName wsContainer = WSContainerGBean.addGBean(kernel, 
"HTTPSOAP", ejbContainer, listener, new URI("/services/Simple"), wsdlURI, 
serviceInfo);
           ObjectName server = HttpServerGBean.addGBean(kernel, "HTTPSOAP", 
listener);
           ObjectName executor = buildExecutor(kernel);
           ObjectName stack = StandardServiceStackGBean.addGBean(kernel, 
"HTTPSOAP", 0, InetAddress.getByName("localhost"), null, null, null, executor, 
server);
  @@ -125,7 +126,7 @@
           try {
               kernel.setAttribute(stack, "soTimeout", new Integer(1000));
               int port = ((Integer) kernel.getAttribute(stack, 
"port")).intValue();
  -            URL url = new URL("http://localhost:"; + port + 
"/test/service?wsdl");
  +            URL url = new URL("http://localhost:"; + port + 
"/services/Simple?wsdl");
               in = url.openStream();
   
               WSDLReader wsdlReader = 
WSDLFactory.newInstance().newWSDLReader();
  @@ -141,8 +142,8 @@
               SOAPAddress address = (SOAPAddress) 
port2.getExtensibilityElements().get(0);
               assertNotNull(address);
               //TODO make sure we believe which of these is correct
  -//            assertEquals("http://localhost:"; + port + "/services/Simple", 
address.getLocationURI());
  -            assertEquals("http://localhost:"; + port + "/test/service", 
address.getLocationURI());
  +            assertEquals("http://localhost:"; + port + "/services/Simple", 
address.getLocationURI());
  +//            assertEquals("http://localhost:"; + port + "/test/service", 
address.getLocationURI());
   
           } finally {
               kernel.stopGBean(stack);