WFLY-3260 Fix WSTestCase

- send request to servlet to initialize it
wildfly · Jun 16, 2014 · 6c73d55 · 6c73d55
1 parent 993a4d1
commit 6c73d55
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/...te/integration/smoke/src/test/java/org/jboss/as/test/smoke/webservices/SimpleServlet.java b/...te/integration/smoke/src/test/java/org/jboss/as/test/smoke/webservices/SimpleServlet.java
@@ -54,10 +54,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         log.info("Received request");
 
         Writer writer = resp.getWriter();
-        writer.write("Servlet Response\n");
-        SimpleStatelessSessionLocal bean = session;
-        String msg = bean.echo("Hello from Servlet");
-        writer.write(msg);
+        boolean ok = session.isInjectionOK();
+        writer.write("" + ok);
         writer.close();
     }
 

diff --git a/...n/smoke/src/test/java/org/jboss/as/test/smoke/webservices/SimpleStatelessSessionBean.java b/...n/smoke/src/test/java/org/jboss/as/test/smoke/webservices/SimpleStatelessSessionBean.java
@@ -48,7 +48,8 @@ public void setEndpoint4(EndpointService endpoint) {
         endpoint4 = endpoint;
     }
 
-    public String echo(String msg) {
-        return "Echo " + msg + " -- Endpoint:" + endpoint1 + " " + endpoint2 + " " + endpoint3 + " " + endpoint4 + ")";
+    @Override
+    public boolean isInjectionOK() {
+        return (endpoint1 != null && endpoint2 != null && endpoint3 != null && endpoint4 != null);
     }
 }
diff --git a/.../smoke/src/test/java/org/jboss/as/test/smoke/webservices/SimpleStatelessSessionLocal.java b/.../smoke/src/test/java/org/jboss/as/test/smoke/webservices/SimpleStatelessSessionLocal.java
@@ -27,5 +27,5 @@
  *
  */
 public interface SimpleStatelessSessionLocal {
-   String echo(String msg);
+    boolean isInjectionOK();
 }
diff --git a/...suite/integration/smoke/src/test/java/org/jboss/as/test/smoke/webservices/WSTestCase.java b/...suite/integration/smoke/src/test/java/org/jboss/as/test/smoke/webservices/WSTestCase.java
@@ -70,7 +70,7 @@ public static Archive<?> getDeployment() {
 
     @Test
     public void testWSDL() throws Exception {
-        String s = performCall("?wsdl");
+        String s = performCall("ws-example/?wsdl");
         Assert.assertNotNull(s);
         Assert.assertTrue(s.contains("wsdl:definitions"));
     }
@@ -125,7 +125,7 @@ public void testManagementDescriptionMetrics() throws Exception {
             checkCountMetric(endpointResult, managementClient.getControllerClient(), "response-count");
         }
     }
-    
+
     private void checkCountMetric(final ModelNode endpointResult, final ModelControllerClient client, final String metricName) throws IOException {
     	final ModelNode readAttribute = new ModelNode();
         readAttribute.get(ModelDescriptionConstants.OP).set(ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION);
@@ -147,9 +147,13 @@ public void testAccess() throws Exception {
         Assert.assertEquals("Foo", port.echo("Foo"));
     }
 
+    @Test
+    public void testWSInjection() throws Exception {
+        Assert.assertEquals("true", performCall("servlet"));
+    }
 
-    private String performCall(String params) throws Exception {
-        URL url = new URL(this.url.toExternalForm() + "ws-example/" + params);
+    private String performCall(String urlPattern) throws Exception {
+        URL url = new URL(this.url.toExternalForm() + urlPattern);
         return HttpRequest.get(url.toExternalForm(), 30, TimeUnit.SECONDS);
     }
 }