You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/08/03 16:13:20 UTC
[camel] branch main updated: (chores) camel-google-pubsub: fix test log output to stdout (#10985)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6bf482d1be5 (chores) camel-google-pubsub: fix test log output to stdout (#10985)
6bf482d1be5 is described below
commit 6bf482d1be5de3bee4399f0d7aaafd8c191f5995
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Thu Aug 3 18:13:14 2023 +0200
(chores) camel-google-pubsub: fix test log output to stdout (#10985)
---
components/camel-google/camel-google-pubsub/pom.xml | 7 +++++++
.../camel/component/google/pubsub/PubsubTestSupport.java | 13 +++++++++++++
.../google/pubsub/integration/AcknowledgementIT.java | 9 ++++++---
.../src/test/resources/logging.properties | 2 +-
4 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml
index 3c07936b4a7..a51410326e0 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -79,6 +79,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java
index 62055bcba98..0ae5fdb0720 100644
--- a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java
+++ b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/PubsubTestSupport.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.google.pubsub;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
+import java.util.logging.LogManager;
import com.google.api.gax.core.CredentialsProvider;
import com.google.api.gax.core.NoCredentialsProvider;
@@ -41,6 +42,8 @@ import org.apache.camel.test.infra.google.pubsub.services.GooglePubSubService;
import org.apache.camel.test.infra.google.pubsub.services.GooglePubSubServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PubsubTestSupport extends CamelTestSupport {
@RegisterExtension
@@ -51,6 +54,16 @@ public class PubsubTestSupport extends CamelTestSupport {
static {
Properties testProperties = loadProperties();
PROJECT_ID = testProperties.getProperty("project.id");
+
+ try (InputStream is = PubsubTestSupport.class.getClassLoader().getResourceAsStream("logging.properties")) {
+ LogManager.getLogManager().readConfiguration(is);
+ } catch (IOException e) {
+ Logger logger = LoggerFactory.getLogger(PubsubTestSupport.class);
+
+ logger.warn(
+ "Unable to setup JUL-to-slf4j logging bridge. The test execution should result in a log of bogus output. Error: {}",
+ e.getMessage(), e);
+ }
}
private static Properties loadProperties() {
diff --git a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
index 6fd0ba265f1..4f00d6b2862 100644
--- a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
+++ b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
@@ -27,8 +27,11 @@ import org.apache.camel.component.google.pubsub.PubsubTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AcknowledgementIT extends PubsubTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(AcknowledgementIT.class);
private static final String TOPIC_NAME = "failureSingle";
private static final String SUBSCRIPTION_NAME = "failureSub";
@@ -93,7 +96,7 @@ public class AcknowledgementIT extends PubsubTestSupport {
secondExchange.getIn().setBody("fail : " + secondExchange.getExchangeId());
// Check 1 : Successful roundtrip.
- System.out.println("Acknowledgement Test : Stage 1");
+ LOG.debug("Acknowledgement Test : Stage 1");
receiveResult.reset();
fail = false;
receiveResult.expectedMessageCount(1);
@@ -102,7 +105,7 @@ public class AcknowledgementIT extends PubsubTestSupport {
receiveResult.assertIsSatisfied(3000);
// Check 2 : Failure for the second message.
- System.out.println("Acknowledgement Test : Stage 2");
+ LOG.debug("Acknowledgement Test : Stage 2");
receiveResult.reset();
fail = true;
receiveResult.expectedMessageCount(0);
@@ -110,7 +113,7 @@ public class AcknowledgementIT extends PubsubTestSupport {
receiveResult.assertIsSatisfied(3000);
// Check 3 : Success for the second message.
- System.out.println("Acknowledgement Test : Stage 3");
+ LOG.debug("Acknowledgement Test : Stage 3");
receiveResult.reset();
fail = false;
receiveResult.expectedMessageCount(1);
diff --git a/components/camel-google/camel-google-pubsub/src/test/resources/logging.properties b/components/camel-google/camel-google-pubsub/src/test/resources/logging.properties
index 0cc82a53fa8..945ac508610 100644
--- a/components/camel-google/camel-google-pubsub/src/test/resources/logging.properties
+++ b/components/camel-google/camel-google-pubsub/src/test/resources/logging.properties
@@ -16,6 +16,6 @@
## ---------------------------------------------------------------------------
.level=SEVERE
-handlers= java.util.logging.ConsoleHandler
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
java.util.logging.ConsoleHandler.level = SEVERE
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter