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 2021/11/25 10:01:13 UTC

[camel] branch main updated: (chores) test-cleanups: make base test classes abstract

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 77902c8  (chores) test-cleanups: make base test classes abstract
77902c8 is described below

commit 77902c8a17cb397541475d03c3519f2b86ea94f2
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Nov 25 08:58:36 2021 +0100

    (chores) test-cleanups: make base test classes abstract
    
    This should prevent them from being misunderstood and/or directly instantiated as test classes
---
 .../aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java       | 2 +-
 .../apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java    | 2 +-
 .../apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java   | 2 +-
 .../google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java     | 2 +-
 .../component/google/functions/unit/GoogleCloudFunctionsBaseTest.java   | 2 +-
 .../camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java | 2 +-
 .../java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java  | 2 +-
 .../micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java       | 2 +-
 .../src/test/java/org/apache/camel/component/mina/BaseMinaTest.java     | 2 +-
 .../src/test/java/org/apache/camel/component/netty/BaseNettyTest.java   | 2 +-
 .../java/org/apache/camel/component/nitrite/AbstractNitriteTest.java    | 2 +-
 .../src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java | 2 +-
 .../test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java    | 2 +-
 .../java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java  | 2 +-
 .../test/java/org/apache/camel/component/undertow/BaseUndertowTest.java | 2 +-
 .../java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java     | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
index 7191ed5..2f2d911 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class AwsSecretsManagerBaseTest extends CamelTestSupport {
+public abstract class AwsSecretsManagerBaseTest extends CamelTestSupport {
     @RegisterExtension
     public static AWSService service = AWSServiceFactory.createKMSService();
 
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
index b11bb60..a585563 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class Aws2SQSBaseTest extends CamelTestSupport {
+public abstract class Aws2SQSBaseTest extends CamelTestSupport {
 
     @RegisterExtension
     public static AWSService service = AWSServiceFactory.createSQSService();
diff --git a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
index 29df5e5..e2bb86f 100644
--- a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
+++ b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class BaseBigQueryTest extends CamelTestSupport {
+public abstract class BaseBigQueryTest extends CamelTestSupport {
     protected GoogleBigQueryEndpoint endpoint = mock(GoogleBigQueryEndpoint.class);
     protected GoogleBigQueryProducer producer;
     protected Bigquery.Tabledata tabledataMock;
diff --git a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
index 0c99830..0cabc97 100644
--- a/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
+++ b/components/camel-google/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
@@ -29,7 +29,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class GoogleBigQuerySQLProducerBaseTest extends CamelTestSupport {
+public abstract class GoogleBigQuerySQLProducerBaseTest extends CamelTestSupport {
     protected GoogleBigQuerySQLEndpoint endpoint = mock(GoogleBigQuerySQLEndpoint.class);
     protected GoogleBigQuerySQLProducer producer;
     protected String sql;
diff --git a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java
index 8366f7f..4f0cef1 100644
--- a/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java
+++ b/components/camel-google/camel-google-functions/src/test/java/org/apache/camel/component/google/functions/unit/GoogleCloudFunctionsBaseTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
 
-public class GoogleCloudFunctionsBaseTest extends CamelTestSupport {
+public abstract class GoogleCloudFunctionsBaseTest extends CamelTestSupport {
 
     protected static MockServiceHelper mockServiceHelper;
     protected static MockCloudFunctionsService mockCloudFunctionsService;
diff --git a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java
index 20fc4dc..b713909 100644
--- a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java
+++ b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/GoogleCloudStorageBaseTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.component.google.storage.GoogleCloudStorageComponent;
 import org.apache.camel.component.google.storage.localstorage.LocalStorageHelper;
 import org.apache.camel.test.junit5.CamelTestSupport;
 
-public class GoogleCloudStorageBaseTest extends CamelTestSupport {
+public abstract class GoogleCloudStorageBaseTest extends CamelTestSupport {
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
index 9951a8d..6943f95 100644
--- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
+++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
@@ -23,7 +23,7 @@ import org.influxdb.impl.InfluxDBImpl;
 
 import static org.mockito.Mockito.mock;
 
-public class AbstractInfluxDbTest extends CamelTestSupport {
+public abstract class AbstractInfluxDbTest extends CamelTestSupport {
 
     InfluxDB mockedDbConnection = mock(InfluxDBImpl.class);
 
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
index 2bb55f6..1cd890c 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AbstractMicrometerRoutePolicyTest extends CamelTestSupport {
+public abstract class AbstractMicrometerRoutePolicyTest extends CamelTestSupport {
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
     protected CompositeMeterRegistry meterRegistry;
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
index aec6457..0baf33f 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.BeforeAll;
 
-public class BaseMinaTest extends CamelTestSupport {
+public abstract class BaseMinaTest extends CamelTestSupport {
 
     protected static final String KEY_STORE_PASSWORD = "changeit";
 
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java
index 7236730..f111310 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
 /**
  *
  */
-public class BaseNettyTest extends CamelTestSupport {
+public abstract class BaseNettyTest extends CamelTestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(BaseNettyTest.class);
 
diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java
index 94eb6c5..dbc18cd 100644
--- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java
+++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.util.FileUtil;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
-public class AbstractNitriteTest extends CamelTestSupport implements BeforeEachCallback {
+public abstract class AbstractNitriteTest extends CamelTestSupport implements BeforeEachCallback {
 
     protected String testMethodName;
 
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
index 6468405..a00bf76 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.quartz;
 import org.apache.camel.CamelContext;
 import org.apache.camel.test.junit5.CamelTestSupport;
 
-public class BaseQuartzTest extends CamelTestSupport {
+public abstract class BaseQuartzTest extends CamelTestSupport {
 
     @Override
     protected boolean useJmx() {
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java
index c0a9a16..33cdf11 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/NoBuilderTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class NoBuilderTest extends CamelTestSupport {
+abstract class NoBuilderTest extends CamelTestSupport {
 
     static final Logger LOG = LoggerFactory.getLogger(NoBuilderTest.class);
 
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
index b8779a4..eb50500 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.BeforeAll;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ThriftProducerBaseTest extends CamelTestSupport {
+public abstract class ThriftProducerBaseTest extends CamelTestSupport {
     protected static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
     protected static final int THRIFT_TEST_NUM1 = 12;
     protected static final int THRIFT_TEST_NUM2 = 13;
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
index 1403f0f..72066e0 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.BeforeAll;
 /**
  * Base class of tests which allocates ports
  */
-public class BaseUndertowTest extends CamelTestSupport {
+public abstract class BaseUndertowTest extends CamelTestSupport {
 
     private static volatile int port;
     private static volatile int port2;
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java
index 19cc2a2..339c192 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppBaseContainerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.support.SimpleRegistry;
 import org.apache.camel.test.infra.xmpp.services.XmppServerContainer;
 import org.apache.camel.test.junit5.CamelTestSupport;
 
-public class XmppBaseContainerTest extends CamelTestSupport {
+public abstract class XmppBaseContainerTest extends CamelTestSupport {
     protected XmppServerContainer xmppServer = new XmppServerContainer();
 
     @Override