Merge pull request #15634 from jkoehler22/JAXRS20ClientAsyncInvokerTest

Remove the EE9 skipped FAT tests from com.ibm.ws.jaxrs.2.0.client_fat JAXRS20ClientAsyncInvokerTest
OpenLiberty · Jan 23, 2021 · 953fb1e · 953fb1e
2 parents 92406ce + 0efa267
commit 953fb1e
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 33 deletions.
diff --git a/...xrs.2.0.client_fat/fat/src/com/ibm/ws/jaxrs20/client/fat/test/IBMJson4JProvidersTest.java b/...xrs.2.0.client_fat/fat/src/com/ibm/ws/jaxrs20/client/fat/test/IBMJson4JProvidersTest.java
@@ -26,7 +26,7 @@
 import componenttest.topology.impl.LibertyServer;
 
 @RunWith(FATRunner.class)
-@SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
+@SkipForRepeat("EE9_FEATURES") // Continue to skip these tests for EE9 as JSON4JObjectProvider is not supported
 public class IBMJson4JProvidersTest extends AbstractTest {
 
     @Server("jaxrs20.client.IBMJson4JProvidersTest")

diff --git a/....client_fat/fat/src/com/ibm/ws/jaxrs20/client/fat/test/JAXRS20ClientAsyncInvokerTest.java b/....client_fat/fat/src/com/ibm/ws/jaxrs20/client/fat/test/JAXRS20ClientAsyncInvokerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 IBM Corporation and others.
+ * Copyright (c) 2018, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,7 +30,6 @@
 import componenttest.topology.impl.LibertyServer;
 
 @RunWith(FATRunner.class)
-@SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
 public class JAXRS20ClientAsyncInvokerTest extends AbstractTest {
 
     @Server("jaxrs20.client.JAXRS20ClientAsyncInvokerTest")
@@ -118,51 +117,59 @@ public void testAsyncInvoker_post4() throws Exception {
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     public void testAsyncInvoker_getReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(asyncInvokerTarget, "testAsyncInvoker_getReceiveTimeout", p, "Timeout as expected");
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     @AllowedFFDC("javax.ws.rs.ProcessingException")
     public void testAsyncInvoker_getConnectionTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(asyncInvokerTarget, "testAsyncInvoker_getConnectionTimeout", p, "Timeout as expected");
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     public void testAsyncInvoker_postReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(asyncInvokerTarget, "testAsyncInvoker_postReceiveTimeout", p, "Timeout as expected");
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     @AllowedFFDC("javax.ws.rs.ProcessingException")
     public void testAsyncInvoker_postConnectionTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(asyncInvokerTarget, "testAsyncInvoker_postConnectionTimeout", p, "Timeout as expected");
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     public void testAsyncInvoker_getReceiveTimeoutwithInvocationCallback() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(asyncInvokerTarget, "testAsyncInvoker_getReceiveTimeoutwithInvocationCallback", p, "Timeout as expected");
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     @AllowedFFDC("javax.ws.rs.ProcessingException")
     public void testAsyncInvoker_getConnectionTimeoutwithInvocationCallback() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(asyncInvokerTarget, "testAsyncInvoker_getConnectionTimeoutwithInvocationCallback", p, "Timeout as expected");
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     public void testAsyncInvoker_postReceiveTimeoutwithInvocationCallback() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(asyncInvokerTarget, "testAsyncInvoker_postReceiveTimeoutwithInvocationCallback", p, "Timeout as expected");
     }
 
     @Test
+    @SkipForRepeat("EE9_FEATURES") // Continue to skip this test for EE9 as com.ibm.ws.jaxrs.client.*.timeout is not supported 
     @AllowedFFDC("javax.ws.rs.ProcessingException")
     public void testAsyncInvoker_postConnectionTimeoutwithInvocationCallback() throws Exception {
         Map<String, String> p = new HashMap<String, String>();

diff --git a/dev/com.ibm.ws.jaxrs.2.0.client_fat/test-applications/bookstore/resources/WEB-INF/web.xml b/dev/com.ibm.ws.jaxrs.2.0.client_fat/test-applications/bookstore/resources/WEB-INF/web.xml
@@ -16,6 +16,7 @@
   		<param-name>javax.ws.rs.Application</param-name>
   		<param-value>com.ibm.ws.jaxrs20.fat.bookstore.BookApplication</param-value>
   	</init-param>
+  	<async-supported>true</async-supported>
   </servlet>
 
   <!-- SERVLET MAPPINGS -->        

diff --git a/....client_fat/fat/src/com/ibm/ws/jaxrs21/client/fat/test/JAXRS21ClientCXFRxInvokerTest.java b/....client_fat/fat/src/com/ibm/ws/jaxrs21/client/fat/test/JAXRS21ClientCXFRxInvokerTest.java
@@ -192,14 +192,12 @@ public void testFlowableRxInvokerOnError() throws Exception {
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testObservableRxInvoker_getReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(cxfRxInvokerTarget, "testObservableRxInvoker_getReceiveTimeout", p, "Timeout as expected");
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testFlowableRxInvoker_getReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(cxfRxInvokerTarget, "testFlowableRxInvoker_getReceiveTimeout", p, "Timeout as expected");
@@ -218,14 +216,12 @@ public void testFlowableRxInvoker_getConnectionTimeout() throws Exception {
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testObservableRxInvoker_postReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(cxfRxInvokerTarget, "testObservableRxInvoker_postReceiveTimeout", p, "Timeout as expected");
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testFlowableRxInvoker_postReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(cxfRxInvokerTarget, "testFlowableRxInvoker_postReceiveTimeout", p, "Timeout as expected");

diff --git a/...fat/src/com/ibm/ws/jaxrs21/client/fat/test/JAXRS21ClientCompletionStageRxInvokerTest.java b/...fat/src/com/ibm/ws/jaxrs21/client/fat/test/JAXRS21ClientCompletionStageRxInvokerTest.java
@@ -196,7 +196,6 @@ public void testCompletionStageRxInvoker_post5WithThenCombine() throws Exception
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testCompletionStageRxInvoker_getReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(completionStageRxInvokerTarget, "testCompletionStageRxInvoker_getReceiveTimeout", p, "Timeout as expected");
@@ -209,7 +208,6 @@ public void testCompletionStageRxInvoker_getConnectionTimeout() throws Exception
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testCompletionStageRxInvoker_postReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(completionStageRxInvokerTarget, "testCompletionStageRxInvoker_postReceiveTimeout", p, "Timeout as expected");

diff --git a/...ient_fat/fat/src/com/ibm/ws/jaxrs21/client/fat/test/JAXRS21ClientJerseyRxInvokerTest.java b/...ient_fat/fat/src/com/ibm/ws/jaxrs21/client/fat/test/JAXRS21ClientJerseyRxInvokerTest.java
@@ -226,14 +226,12 @@ public void testRxFlowableToObservableInvokerOnError() throws Exception {
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testRxObservableInvoker_getReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(jerseyRxInvokerTarget, "testRxObservableInvoker_getReceiveTimeout", p, "Timeout as expected");
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testRxFlowableInvoker_getReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(jerseyRxInvokerTarget, "testRxFlowableInvoker_getReceiveTimeout", p, "Timeout as expected");
@@ -252,14 +250,12 @@ public void testRxFlowableInvoker_getConnectionTimeout() throws Exception {
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testRxObservableInvoker_postReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(jerseyRxInvokerTarget, "testRxObservableInvoker_postReceiveTimeout", p, "Timeout as expected");
     }
 
     @Test
-    @SkipForRepeat("EE9_FEATURES") // currently broken due to multiple issues
     public void testRxFlowableInvoker_postReceiveTimeout() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         this.runTestOnServer(jerseyRxInvokerTarget, "testRxFlowableInvoker_postReceiveTimeout", p, "Timeout as expected");

diff --git a/...jaxrs21bookstore/src/com/ibm/ws/jaxrs21/fat/JAXRS21bookstore/CXFRxInvokerTestServlet.java b/...jaxrs21bookstore/src/com/ibm/ws/jaxrs21/fat/JAXRS21bookstore/CXFRxInvokerTestServlet.java
@@ -1088,7 +1088,8 @@ public void testObservableRxInvoker_getReceiveTimeout(Map<String, String> param,
         String serverIP = param.get("serverIP");
         String serverPort = param.get("serverPort");
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+        cb.readTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(ObservableRxInvokerProvider.class);
         WebTarget t = c.target("http://" + serverIP + ":" + serverPort + "/jaxrs21bookstore/JAXRS21bookstore2/" + SLEEP);
@@ -1135,7 +1136,8 @@ public void testFlowableRxInvoker_getReceiveTimeout(Map<String, String> param, S
         String serverIP = param.get("serverIP");
         String serverPort = param.get("serverPort");
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+        cb.readTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(FlowableRxInvokerProvider.class);
         WebTarget t = c.target("http://" + serverIP + ":" + serverPort + "/jaxrs21bookstore/JAXRS21bookstore2/" + SLEEP);
@@ -1192,7 +1194,8 @@ public void testObservableRxInvoker_getConnectionTimeout(Map<String, String> par
         }
 
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+        cb.connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(ObservableRxInvokerProvider.class);
         WebTarget t = c.target(target);
@@ -1254,7 +1257,8 @@ public void testFlowableRxInvoker_getConnectionTimeout(Map<String, String> param
         }
 
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+        cb.connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(FlowableRxInvokerProvider.class);
         WebTarget t = c.target(target);
@@ -1306,7 +1310,8 @@ public void testObservableRxInvoker_postReceiveTimeout(Map<String, String> param
         String serverIP = param.get("serverIP");
         String serverPort = param.get("serverPort");
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+        cb.readTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(ObservableRxInvokerProvider.class);
         WebTarget t = c.target("http://" + serverIP + ":" + serverPort + "/jaxrs21bookstore/JAXRS21bookstore2/post/" + SLEEP);
@@ -1353,7 +1358,8 @@ public void testFlowableRxInvoker_postReceiveTimeout(Map<String, String> param,
         String serverIP = param.get("serverIP");
         String serverPort = param.get("serverPort");
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+        cb.readTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(FlowableRxInvokerProvider.class);
         WebTarget t = c.target("http://" + serverIP + ":" + serverPort + "/jaxrs21bookstore/JAXRS21bookstore2/post/" + SLEEP);
@@ -1410,7 +1416,8 @@ public void testObservableRxInvoker_postConnectionTimeout(Map<String, String> pa
         }
 
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+        cb.connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(ObservableRxInvokerProvider.class);
         WebTarget t = c.target(target);
@@ -1472,7 +1479,8 @@ public void testFlowableRxInvoker_postConnectionTimeout(Map<String, String> para
         }
 
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+        cb.connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         c.register(FlowableRxInvokerProvider.class);
         WebTarget t = c.target(target);

diff --git a/...tore/src/com/ibm/ws/jaxrs21/fat/JAXRS21bookstore/CompletionStageRxInvokerTestServlet.java b/...tore/src/com/ibm/ws/jaxrs21/fat/JAXRS21bookstore/CompletionStageRxInvokerTestServlet.java
@@ -23,6 +23,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -581,7 +582,8 @@ public void testCompletionStageRxInvoker_getReceiveTimeout(Map<String, String> p
         String serverIP = param.get("serverIP");
         String serverPort = param.get("serverPort");
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+        cb.readTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         WebTarget t = c.target("http://" + serverIP + ":" + serverPort + "/jaxrs21bookstore/JAXRS21bookstore2/" + SLEEP);
         Builder builder = t.request();
@@ -625,7 +627,8 @@ public void testCompletionStageRxInvoker_getConnectionTimeout(Map<String, String
         }
 
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+        cb.connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         WebTarget t = c.target(target);
         Builder builder = t.request();
@@ -664,7 +667,8 @@ public void testCompletionStageRxInvoker_postReceiveTimeout(Map<String, String>
         String serverIP = param.get("serverIP");
         String serverPort = param.get("serverPort");
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.receive.timeout", TIMEOUT);
+        cb.readTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         WebTarget t = c.target("http://" + serverIP + ":" + serverPort + "/jaxrs21bookstore/JAXRS21bookstore2/post/" + SLEEP);
         Builder builder = t.request();
@@ -708,7 +712,8 @@ public void testCompletionStageRxInvoker_postConnectionTimeout(Map<String, Strin
         }
 
         ClientBuilder cb = ClientBuilder.newBuilder();
-        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+//        cb.property("com.ibm.ws.jaxrs.client.connection.timeout", TIMEOUT);
+        cb.connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS);
         Client c = cb.build();
         WebTarget t = c.target(target);
         Builder builder = t.request();