6374 Fix RC in JMS error test (helidon-io#6376)

barchetta · Mar 7, 2023 · a6130ed · a6130ed
1 parent 166b9da
commit a6130ed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/...integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AbstractSampleBean.java b/...integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AbstractSampleBean.java
@@ -150,15 +150,19 @@ public CompletionStage<Void> channel31(Message<String> msg) {
     @ApplicationScoped
     public static class ChannelError extends AbstractSampleBean {
         @Incoming("test-channel-error")
-        @Acknowledgment(Acknowledgment.Strategy.MANUAL)
-        public CompletionStage<Void> error(Message<String> msg) {
-            try {
-                LOGGER.fine(() -> String.format("Received possible error %s", msg.getPayload()));
-                consumed().add(Integer.toString(Integer.parseInt(msg.getPayload())));
-            } finally {
-                msg.ack().whenComplete((a, b) -> countDown("error()"));
-            }
-            return CompletableFuture.completedFuture(null);
+        @Outgoing("test-channel-error-2")
+        @Acknowledgment(Acknowledgment.Strategy.POST_PROCESSING)
+        public String error(String msg) {
+            LOGGER.fine(() -> String.format("Received possible error %s", msg));
+            consumed().add(Integer.toString(Integer.parseInt(msg)));
+            return msg;
+        }
+
+        @Incoming("test-channel-error-2")
+        public SubscriberBuilder<String, Void> consume() {
+            return ReactiveStreams.<String>builder()
+                    .onError(t -> countDown("error()"))
+                    .ignore();
         }
     }
 

diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsMpTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsMpTest.java
@@ -222,7 +222,7 @@ void error() {
         AbstractSampleBean bean = CDI.current().select(AbstractSampleBean.ChannelError.class).get();
         // This is correctly processed
         List<String> testData = Collections.singletonList("10");
-        produceAndCheck(bean, testData, TEST_TOPIC_ERROR, testData);
+        produce(TEST_TOPIC_ERROR, testData, textMessage -> {});
         // This will throw a run time error in TestBean#error
         testData = Collections.singletonList("error");
         produceAndCheck(bean, testData, TEST_TOPIC_ERROR, Collections.singletonList("10"));