This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3ee038592dd124d40597085c5f46fb5729558632 Author: Guillaume Nodet <[email protected]> AuthorDate: Tue Jun 23 16:08:23 2020 +0200 [CAMEL-11807] Upgrade camel-cassandraql to junit5 --- components/camel-cassandraql/pom.xml | 4 +- .../component/cassandra/BaseCassandraTest.java | 27 +++---- .../component/cassandra/CassandraCQLUnit.java | 66 +++++++++++++++++ .../cassandra/CassandraComponentBeanRefTest.java | 39 ++++------ .../cassandra/CassandraComponentConsumerTest.java | 25 ++----- .../cassandra/CassandraComponentProducerTest.java | 50 +++---------- .../CassandraComponentProducerUnpreparedTest.java | 16 ++-- .../component/cassandra/CassandraUnitUtils.java | 55 +++----------- .../ResultSetConversionStrategiesTest.java | 2 +- .../CassandraAggregationRepositoryTest.java | 82 +++++---------------- .../CassandraAggregationSerializedHeadersTest.java | 35 +++------ .../cassandra/CassandraAggregationTest.java | 51 ++++--------- .../NamedCassandraAggregationRepositoryTest.java | 86 +++++----------------- .../CassandraIdempotentRepositoryTest.java | 71 +++++------------- .../cassandra/CassandraIdempotentTest.java | 34 +++------ .../NamedCassandraIdempotentRepositoryTest.java | 73 +++++------------- 16 files changed, 244 insertions(+), 472 deletions(-) diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml index d718017..4089621 100644 --- a/components/camel-cassandraql/pom.xml +++ b/components/camel-cassandraql/pom.xml @@ -59,7 +59,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java index 10e14aa..f5c9711 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java @@ -16,9 +16,8 @@ */ package org.apache.camel.component.cassandra; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.extension.ExtensionContext; public abstract class BaseCassandraTest extends CamelTestSupport { @@ -27,21 +26,13 @@ public abstract class BaseCassandraTest extends CamelTestSupport { return System.getenv("BUILD_ID") == null; } - @BeforeClass - public static void setUpClass() throws Exception { - if (canTest()) { - CassandraUnitUtils.startEmbeddedCassandra(); - } - } - - @AfterClass - public static void tearDownClass() throws Exception { - if (canTest()) { - try { - CassandraUnitUtils.cleanEmbeddedCassandra(); - } catch (Throwable e) { - // ignore shutdown errors - } + @Override + public void afterAll(ExtensionContext context) { + super.afterAll(context); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors } } diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraCQLUnit.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraCQLUnit.java new file mode 100644 index 0000000..44ab9f1 --- /dev/null +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraCQLUnit.java @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.cassandra; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; +import org.cassandraunit.CQLDataLoader; +import org.cassandraunit.dataset.CQLDataSet; +import org.cassandraunit.utils.EmbeddedCassandraServerHelper; +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +import static org.junit.jupiter.api.Assumptions.assumeTrue; + +public class CassandraCQLUnit implements BeforeAllCallback, BeforeEachCallback { + + public Session session; + public Cluster cluster; + protected CQLDataSet dataSet; + protected String configurationFileName; + protected long startupTimeoutMillis = EmbeddedCassandraServerHelper.DEFAULT_STARTUP_TIMEOUT; + + public CassandraCQLUnit(CQLDataSet dataSet, String configurationFileName) { + this.dataSet = dataSet; + this.configurationFileName = configurationFileName; + } + + @Override + public void beforeAll(ExtensionContext context) throws Exception { + assumeTrue(BaseCassandraTest.canTest(), + "Skipping test running in CI server - Fails sometimes on CI server with address already in use"); + + /* start an embedded Cassandra */ + if (configurationFileName != null) { + EmbeddedCassandraServerHelper.startEmbeddedCassandra(configurationFileName, startupTimeoutMillis); + } else { + EmbeddedCassandraServerHelper.startEmbeddedCassandra(startupTimeoutMillis); + } + + /* create structure and load data */ + cluster = EmbeddedCassandraServerHelper.getCluster(); + session = EmbeddedCassandraServerHelper.getSession(); + } + + @Override + public void beforeEach(ExtensionContext context) throws Exception { + CQLDataLoader dataLoader = new CQLDataLoader(session); + dataLoader.load(dataSet); + } + +} diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java index f14502b..aa6dfe1 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java @@ -16,36 +16,33 @@ */ package org.apache.camel.component.cassandra; -import com.datastax.driver.core.Cluster; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class CassandraComponentBeanRefTest extends BaseCassandraTest { + public static final String CQL = "insert into camel_user(login, first_name, last_name) values (?, ?, ?)"; - public static final String SESSION_URI = "cql:bean:cassandraSession?cql=#insertCql"; - public static final String CLUSTER_URI = "cql:bean:cassandraCluster/camel_ks?cql=#insertCql"; + public static final String SESSION_URI = "cql:bean:cassandraSession?cql=" + CQL; + public static final String CLUSTER_URI = "cql:bean:cassandraCluster/camel_ks?cql=" + CQL; - @Produce("direct:input") - public ProducerTemplate producerTemplate; + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); - @Rule - public CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); + @Produce("direct:input") + ProducerTemplate producerTemplate; @Override protected Registry createCamelRegistry() throws Exception { SimpleRegistry registry = new SimpleRegistry(); - if (canTest()) { - Cluster cluster = Cluster.builder().addContactPoint("localhost").build(); - registry.bind("cassandraCluster", cluster); - registry.bind("cassandraSession", cluster.connect("camel_ks")); - registry.bind("insertCql", CQL); - } + registry.bind("cassandraCluster", cassandra.cluster); + registry.bind("cassandraSession", cassandra.session); return registry; } @@ -61,23 +58,17 @@ public class CassandraComponentBeanRefTest extends BaseCassandraTest { @Test public void testSession() throws Exception { - if (!canTest()) { - return; - } CassandraEndpoint endpoint = getMandatoryEndpoint(SESSION_URI, CassandraEndpoint.class); - assertEquals("camel_ks", endpoint.getKeyspace()); + assertEquals(CassandraUnitUtils.KEYSPACE, endpoint.getKeyspace()); assertEquals(CQL, endpoint.getCql()); } @Test public void testCluster() throws Exception { - if (!canTest()) { - return; - } CassandraEndpoint endpoint = getMandatoryEndpoint(CLUSTER_URI, CassandraEndpoint.class); - assertEquals("camel_ks", endpoint.getKeyspace()); + assertEquals(CassandraUnitUtils.KEYSPACE, endpoint.getKeyspace()); assertEquals(CQL, endpoint.getCql()); } diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java index 341a37f..557afde 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java @@ -24,23 +24,20 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class CassandraComponentConsumerTest extends BaseCassandraTest { - private static final String CQL = "select login, first_name, last_name from camel_user"; + static final String CQL = "select login, first_name, last_name from camel_user"; - @Rule - public CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); @Test public void testConsumeAll() throws Exception { - if (!canTest()) { - return; - } - MockEndpoint mock = getMockEndpoint("mock:resultAll"); mock.expectedMinimumMessageCount(1); mock.whenAnyExchangeReceived(new Processor() { @@ -56,10 +53,6 @@ public class CassandraComponentConsumerTest extends BaseCassandraTest { @Test public void testConsumeUnprepared() throws Exception { - if (!canTest()) { - return; - } - MockEndpoint mock = getMockEndpoint("mock:resultUnprepared"); mock.expectedMinimumMessageCount(1); mock.whenAnyExchangeReceived(new Processor() { @@ -75,10 +68,6 @@ public class CassandraComponentConsumerTest extends BaseCassandraTest { @Test public void testConsumeOne() throws Exception { - if (!canTest()) { - return; - } - MockEndpoint mock = getMockEndpoint("mock:resultOne"); mock.expectedMinimumMessageCount(1); mock.whenAnyExchangeReceived(new Processor() { diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java index 858e87a..8c8693c 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java @@ -29,23 +29,25 @@ import com.datastax.driver.core.querybuilder.Update; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.set; import static com.datastax.driver.core.querybuilder.QueryBuilder.update; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class CassandraComponentProducerTest extends BaseCassandraTest { - private static final String CQL = "insert into camel_user(login, first_name, last_name) values (?, ?, ?)"; - private static final String NO_PARAMETER_CQL = "select login, first_name, last_name from camel_user"; - private static final String NOT_CONSISTENT_URI = "cql://localhost/camel_ks?cql=" + CQL + "&consistencyLevel=ANY"; + static final String CQL = "insert into camel_user(login, first_name, last_name) values (?, ?, ?)"; + static final String NO_PARAMETER_CQL = "select login, first_name, last_name from camel_user"; + static final String NOT_CONSISTENT_URI = "cql://localhost/camel_ks?cql=" + CQL + "&consistencyLevel=ANY"; - @Rule - public CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); @Produce("direct:input") ProducerTemplate producerTemplate; @@ -78,10 +80,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { @Test public void testRequestUriCql() throws Exception { - if (!canTest()) { - return; - } - producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem", "Jiang")); Cluster cluster = CassandraUnitUtils.cassandraCluster(); @@ -97,10 +95,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { @Test public void testRequestNoParameterNull() throws Exception { - if (!canTest()) { - return; - } - Object response = noParameterProducerTemplate.requestBody(null); assertNotNull(response); @@ -109,10 +103,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { @Test public void testRequestNoParameterEmpty() throws Exception { - if (!canTest()) { - return; - } - Object response = noParameterProducerTemplate.requestBody(Collections.emptyList()); assertNotNull(response); @@ -121,10 +111,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { @Test public void testRequestMessageCql() throws Exception { - if (!canTest()) { - return; - } - producerTemplate.requestBodyAndHeader(new Object[] {"Claus 2", "Ibsen 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, "update camel_user set first_name=?, last_name=? where login=?"); @@ -141,10 +127,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { @Test public void testLoadBalancing() throws Exception { - if (!canTest()) { - return; - } - loadBalancingPolicyTemplate.requestBodyAndHeader(new Object[] {"Claus 2", "Ibsen 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, "update camel_user set first_name=?, last_name=? where login=?"); @@ -164,10 +146,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { */ @Test public void testRequestMessageStatement() throws Exception { - if (!canTest()) { - return; - } - Update.Where update = update("camel_user").with(set("first_name", bindMarker())).and(set("last_name", bindMarker())).where(eq("login", bindMarker())); producerTemplate.requestBodyAndHeader(new Object[] {"Claus 2", "Ibsen 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, update); @@ -189,10 +167,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { */ @Test public void testEndpointNoCqlParameter() throws Exception { - if (!canTest()) { - return; - } - Update.Where updateFirstName = update("camel_user").with(set("first_name", bindMarker())).where(eq("login", bindMarker())); producerTemplateNoEndpointCql.sendBodyAndHeader(new Object[] {"Claus 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, updateFirstName); @@ -219,10 +193,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { @Test public void testRequestNotConsistent() throws Exception { - if (!canTest()) { - return; - } - CassandraEndpoint endpoint = getMandatoryEndpoint(NOT_CONSISTENT_URI, CassandraEndpoint.class); assertEquals(ConsistencyLevel.ANY, endpoint.getConsistencyLevel()); diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java index 3b1cce7..a52610a 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java @@ -27,21 +27,23 @@ import com.datastax.driver.core.querybuilder.Update; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.set; import static com.datastax.driver.core.querybuilder.QueryBuilder.update; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest { - private static final String CQL = "insert into camel_user(login, first_name, last_name) values (?, ?, ?)"; - private static final String NO_PARAMETER_CQL = "select login, first_name, last_name from camel_user"; + static final String CQL = "insert into camel_user(login, first_name, last_name) values (?, ?, ?)"; + static final String NO_PARAMETER_CQL = "select login, first_name, last_name from camel_user"; - @Rule - public CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); @Produce("direct:input") ProducerTemplate producerTemplate; diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java index 01a98d2..3e11b40 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraUnitUtils.java @@ -17,15 +17,10 @@ package org.apache.camel.component.cassandra; import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; -import org.cassandraunit.CQLDataLoader; -import org.cassandraunit.CassandraCQLUnit; import org.cassandraunit.dataset.CQLDataSet; import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; import org.cassandraunit.utils.EmbeddedCassandraServerHelper; -import static org.apache.camel.component.cassandra.BaseCassandraTest.canTest; - /** * Util methods to manage Cassandra in Unit tests */ @@ -33,8 +28,6 @@ public final class CassandraUnitUtils { public static final String HOST = "127.0.0.1"; public static final String KEYSPACE = "camel_ks"; - private static CassandraCQLUnit cassandraCQLUnit; - private CassandraUnitUtils() { } @@ -42,68 +35,40 @@ public final class CassandraUnitUtils { * Create Cassandra JUnit Rule. */ public static CassandraCQLUnit cassandraCQLUnit() { - if (canTest()) { - if (cassandraCQLUnit == null) { - cassandraCQLUnit = cassandraCQLUnit("BasicDataSet.cql"); - } - } - return cassandraCQLUnit; + return cassandraCQLUnit("BasicDataSet.cql"); } public static CassandraCQLUnit cassandraCQLUnit(String dataSetCql) { - if (canTest()) { - return cassandraCQLUnit(cqlDataSet(dataSetCql)); - } else { - return null; - } + return cassandraCQLUnit(cqlDataSet(dataSetCql)); } public static CQLDataSet cqlDataSet(String dataSetCql) { - if (canTest()) { - return new ClassPathCQLDataSet(dataSetCql, KEYSPACE); - } else { - return null; - } + return new ClassPathCQLDataSet(dataSetCql, KEYSPACE); } - public static void loadCQLDataSet(Session session, String dataSetCql) { - if (canTest()) { - CQLDataLoader loader = new CQLDataLoader(session); - loader.load(cqlDataSet(dataSetCql)); - } + public static CassandraCQLUnit cassandraCQLUnit(CQLDataSet dataset) { + return cassandraCQLUnit(dataset, "/camel-cassandra.yaml"); } - public static CassandraCQLUnit cassandraCQLUnit(CQLDataSet dataset) { - if (canTest()) { - return new CassandraCQLUnit(dataset, "/camel-cassandra.yaml"); - } else { - return null; - } + public static CassandraCQLUnit cassandraCQLUnit(CQLDataSet dataset, String configurationFileName) { + return new CassandraCQLUnit(dataset, "/camel-cassandra.yaml"); } /** * Start embedded Cassandra. */ public static void startEmbeddedCassandra() throws Exception { - if (canTest()) { - EmbeddedCassandraServerHelper.startEmbeddedCassandra("/camel-cassandra.yaml", "target/camel-cassandra", 30000); - } + EmbeddedCassandraServerHelper.startEmbeddedCassandra("/camel-cassandra.yaml", "target/camel-cassandra", 30000); } /** * Clean embedded Cassandra. */ public static void cleanEmbeddedCassandra() throws Exception { - if (canTest()) { - EmbeddedCassandraServerHelper.cleanEmbeddedCassandra(); - } + EmbeddedCassandraServerHelper.cleanEmbeddedCassandra(); } public static Cluster cassandraCluster() { - if (canTest()) { - return Cluster.builder().addContactPoint(HOST).withClusterName("camel-cluster").build(); - } else { - return null; - } + return Cluster.builder().addContactPoint(HOST).withClusterName("camel-cluster").build(); } } diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java index adb6bfd..dcff03c 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java @@ -21,7 +21,7 @@ import java.util.List; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java index 361b073..dc14dd7 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java @@ -18,58 +18,50 @@ package org.apache.camel.processor.aggregate.cassandra; import java.util.Set; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.component.cassandra.BaseCassandraTest; +import org.apache.camel.component.cassandra.CassandraCQLUnit; import org.apache.camel.component.cassandra.CassandraUnitUtils; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unite test for {@link CassandraAggregationRepository} */ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { - @Rule - public CassandraCQLUnit cassandraRule = CassandraUnitUtils.cassandraCQLUnit("AggregationDataSet.cql"); + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit("AggregationDataSet.cql"); - private Cluster cluster; - private Session session; private CassandraAggregationRepository aggregationRepository; private CamelContext camelContext; @Override - @Before - public void setUp() throws Exception { + protected void doPreSetup() throws Exception { camelContext = new DefaultCamelContext(); - - if (canTest()) { - cluster = CassandraUnitUtils.cassandraCluster(); - session = cluster.connect(CassandraUnitUtils.KEYSPACE); - aggregationRepository = new CassandraAggregationRepository(session); - aggregationRepository.start(); - } + aggregationRepository = new CassandraAggregationRepository(cassandra.cluster, CassandraUnitUtils.KEYSPACE); + aggregationRepository.start(); + super.doPreSetup(); } @Override - @After + @AfterEach public void tearDown() throws Exception { - if (canTest()) { - aggregationRepository.stop(); - session.close(); - cluster.close(); - } + aggregationRepository.stop(); } private boolean exists(String key) { - return session.execute("select KEY from CAMEL_AGGREGATION where KEY=?", key).one() != null; + return cassandra.session.execute("select KEY from CAMEL_AGGREGATION where KEY=?", key).one() != null; } @Test @@ -86,10 +78,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testGetExists() { - if (!canTest()) { - return; - } - // Given String key = "Get_Exists"; Exchange exchange = new DefaultExchange(camelContext); @@ -104,10 +92,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testGetNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Get_NotExists"; assertFalse(exists(key)); @@ -119,10 +103,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testRemoveExists() { - if (!canTest()) { - return; - } - // Given String key = "Remove_Exists"; Exchange exchange = new DefaultExchange(camelContext); @@ -136,10 +116,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testRemoveNotExists() { - if (!canTest()) { - return; - } - // Given String key = "RemoveNotExists"; Exchange exchange = new DefaultExchange(camelContext); @@ -152,10 +128,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testGetKeys() { - if (!canTest()) { - return; - } - // Given String[] keys = {"GetKeys1", "GetKeys2"}; addExchanges(keys); @@ -169,10 +141,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testConfirmExist() { - if (!canTest()) { - return; - } - // Given for (int i = 1; i < 4; i++) { String key = "Confirm_" + i; @@ -191,10 +159,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testConfirmNotExist() { - if (!canTest()) { - return; - } - // Given String[] keys = new String[3]; for (int i = 1; i < 4; i++) { @@ -222,10 +186,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testScan() { - if (!canTest()) { - return; - } - // Given String[] keys = {"Scan1", "Scan2"}; addExchanges(keys); @@ -239,10 +199,6 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testRecover() { - if (!canTest()) { - return; - } - // Given String[] keys = {"Recover1", "Recover2"}; addExchanges(keys); diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java index e98d973..0129e81 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java @@ -16,36 +16,31 @@ */ package org.apache.camel.processor.aggregate.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.camel.AggregationStrategy; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.cassandra.BaseCassandraTest; +import org.apache.camel.component.cassandra.CassandraCQLUnit; import org.apache.camel.component.cassandra.CassandraUnitUtils; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.aggregate.util.HeaderDto; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.After; -import org.junit.Test; - -import static org.junit.Assume.assumeTrue; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; /** * Unite test for {@link CassandraAggregationRepository} */ -public class CassandraAggregationSerializedHeadersTest extends CamelTestSupport { - private Cluster cluster; +public class CassandraAggregationSerializedHeadersTest extends BaseCassandraTest { + + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit("NamedAggregationDataSet.cql"); + private CassandraAggregationRepository aggregationRepository; @Override protected void doPreSetup() throws Exception { - assumeTrue("Skipping test running in CI server - Fails sometimes on CI server with address already in use", System.getenv("BUILD_ID") == null); - CassandraUnitUtils.startEmbeddedCassandra(); - cluster = CassandraUnitUtils.cassandraCluster(); - Session rootSession = cluster.connect(); - CassandraUnitUtils.loadCQLDataSet(rootSession, "NamedAggregationDataSet.cql"); - rootSession.close(); - aggregationRepository = new NamedCassandraAggregationRepository(cluster, CassandraUnitUtils.KEYSPACE, "ID"); + aggregationRepository = new NamedCassandraAggregationRepository(cassandra.cluster, CassandraUnitUtils.KEYSPACE, "ID"); aggregationRepository.setTable("NAMED_CAMEL_AGGREGATION"); aggregationRepository.setAllowSerializedHeaders(true); aggregationRepository.start(); @@ -53,16 +48,10 @@ public class CassandraAggregationSerializedHeadersTest extends CamelTestSupport } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); aggregationRepository.stop(); - cluster.close(); - try { - CassandraUnitUtils.cleanEmbeddedCassandra(); - } catch (Throwable e) { - // ignore shutdown errors - } } @Override diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java index 9003013..5f90153 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java @@ -16,57 +16,40 @@ */ package org.apache.camel.processor.aggregate.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.camel.AggregationStrategy; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.cassandra.BaseCassandraTest; +import org.apache.camel.component.cassandra.CassandraCQLUnit; import org.apache.camel.component.cassandra.CassandraUnitUtils; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; /** * Unite test for {@link CassandraAggregationRepository} */ -public class CassandraAggregationTest extends CamelTestSupport { - private Cluster cluster; - private CassandraAggregationRepository aggregationRepository; +public class CassandraAggregationTest extends BaseCassandraTest { - public static boolean canTest() { - // we cannot test on CI - return System.getenv("BUILD_ID") == null; - } + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit("NamedAggregationDataSet.cql"); + + private CassandraAggregationRepository aggregationRepository; @Override protected void doPreSetup() throws Exception { - if (canTest()) { - CassandraUnitUtils.startEmbeddedCassandra(); - cluster = CassandraUnitUtils.cassandraCluster(); - Session rootSession = cluster.connect(); - CassandraUnitUtils.loadCQLDataSet(rootSession, "NamedAggregationDataSet.cql"); - rootSession.close(); - aggregationRepository = new NamedCassandraAggregationRepository(cluster, CassandraUnitUtils.KEYSPACE, "ID"); - aggregationRepository.setTable("NAMED_CAMEL_AGGREGATION"); - aggregationRepository.start(); - } + aggregationRepository = new NamedCassandraAggregationRepository(cassandra.cluster, CassandraUnitUtils.KEYSPACE, "ID"); + aggregationRepository.setTable("NAMED_CAMEL_AGGREGATION"); + aggregationRepository.start(); super.doPreSetup(); } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); - if (canTest()) { - aggregationRepository.stop(); - cluster.close(); - try { - CassandraUnitUtils.cleanEmbeddedCassandra(); - } catch (Throwable e) { - // ignore shutdown errors - } - } + aggregationRepository.stop(); } @Override @@ -98,10 +81,6 @@ public class CassandraAggregationTest extends CamelTestSupport { @Test public void testAggregationRoute() throws Exception { - if (!canTest()) { - return; - } - // Given MockEndpoint mockOutput = getMockEndpoint("mock:output"); mockOutput.expectedMessageCount(2); diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java index b6358f4..cf58242 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java @@ -18,66 +18,56 @@ package org.apache.camel.processor.aggregate.cassandra; import java.util.Set; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.component.cassandra.BaseCassandraTest; +import org.apache.camel.component.cassandra.CassandraCQLUnit; import org.apache.camel.component.cassandra.CassandraUnitUtils; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unite test for {@link CassandraAggregationRepository} */ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { - @Rule - public CassandraCQLUnit cassandraRule = CassandraUnitUtils.cassandraCQLUnit("NamedAggregationDataSet.cql"); + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit("NamedAggregationDataSet.cql"); - private Cluster cluster; - private Session session; private CassandraAggregationRepository aggregationRepository; private CamelContext camelContext; @Override - @Before + @BeforeEach public void setUp() throws Exception { camelContext = new DefaultCamelContext(); - if (canTest()) { - cluster = CassandraUnitUtils.cassandraCluster(); - session = cluster.connect(CassandraUnitUtils.KEYSPACE); - aggregationRepository = new NamedCassandraAggregationRepository(session, "ID"); - aggregationRepository.setTable("NAMED_CAMEL_AGGREGATION"); - aggregationRepository.start(); - } + aggregationRepository = new NamedCassandraAggregationRepository(cassandra.cluster, CassandraUnitUtils.KEYSPACE, "ID"); + aggregationRepository.setTable("NAMED_CAMEL_AGGREGATION"); + aggregationRepository.start(); } @Override - @After + @AfterEach public void tearDown() throws Exception { - if (canTest()) { - aggregationRepository.stop(); - session.close(); - cluster.close(); - } + aggregationRepository.stop(); } private boolean exists(String key) { - return session.execute("select KEY from NAMED_CAMEL_AGGREGATION where NAME=? and KEY=?", "ID", key).one() != null; + return cassandra.session.execute("select KEY from NAMED_CAMEL_AGGREGATION where NAME=? and KEY=?", "ID", key).one() != null; } @Test public void testAdd() { - if (!canTest()) { - return; - } - // Given String key = "Add"; assertFalse(exists(key)); @@ -90,10 +80,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testGetExists() { - if (!canTest()) { - return; - } - // Given String key = "Get_Exists"; Exchange exchange = new DefaultExchange(camelContext); @@ -108,10 +94,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testGetNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Get_NotExists"; assertFalse(exists(key)); @@ -123,10 +105,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testRemoveExists() { - if (!canTest()) { - return; - } - // Given String key = "Remove_Exists"; Exchange exchange = new DefaultExchange(camelContext); @@ -140,10 +118,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testRemoveNotExists() { - if (!canTest()) { - return; - } - // Given String key = "RemoveNotExists"; Exchange exchange = new DefaultExchange(camelContext); @@ -156,10 +130,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testGetKeys() { - if (!canTest()) { - return; - } - // Given String[] keys = {"GetKeys1", "GetKeys2"}; addExchanges(keys); @@ -173,10 +143,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testConfirmExist() { - if (!canTest()) { - return; - } - // Given for (int i = 1; i < 4; i++) { String key = "Confirm_" + i; @@ -195,10 +161,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testConfirmNotExist() { - if (!canTest()) { - return; - } - // Given String[] keys = new String[3]; for (int i = 1; i < 4; i++) { @@ -226,10 +188,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testScan() { - if (!canTest()) { - return; - } - // Given String[] keys = {"Scan1", "Scan2"}; addExchanges(keys); @@ -243,10 +201,6 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest { @Test public void testRecover() { - if (!canTest()) { - return; - } - // Given String[] keys = {"Recover1", "Recover2"}; addExchanges(keys); diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java index a80bbab..5af2140c 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java @@ -16,59 +16,48 @@ */ package org.apache.camel.processor.idempotent.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.camel.component.cassandra.BaseCassandraTest; +import org.apache.camel.component.cassandra.CassandraCQLUnit; import org.apache.camel.component.cassandra.CassandraUnitUtils; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for {@link CassandraIdempotentRepository} */ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest { - @Rule - public CassandraCQLUnit cassandraRule = CassandraUnitUtils.cassandraCQLUnit("IdempotentDataSet.cql"); + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit("IdempotentDataSet.cql"); - private Cluster cluster; - private Session session; private CassandraIdempotentRepository idempotentRepository; @Override - @Before + @BeforeEach public void setUp() throws Exception { - if (canTest()) { - cluster = CassandraUnitUtils.cassandraCluster(); - session = cluster.connect(CassandraUnitUtils.KEYSPACE); - idempotentRepository = new CassandraIdempotentRepository(session); - idempotentRepository.start(); - } + idempotentRepository = new CassandraIdempotentRepository(cassandra.cluster, CassandraUnitUtils.KEYSPACE); + idempotentRepository.start(); + super.setUp(); } @Override - @After + @AfterEach public void tearDown() throws Exception { - if (canTest()) { - idempotentRepository.stop(); - session.close(); - cluster.close(); - } + idempotentRepository.stop(); + super.tearDown(); } private boolean exists(String key) { - return session.execute("select KEY from CAMEL_IDEMPOTENT where KEY=?", key).one() != null; + return cassandra.session.execute("select KEY from CAMEL_IDEMPOTENT where KEY=?", key).one() != null; } @Test public void testAddNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Add_NotExists"; assertFalse(exists(key)); @@ -81,10 +70,6 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testAddExists() { - if (!canTest()) { - return; - } - // Given String key = "Add_Exists"; assertTrue(exists(key)); @@ -97,10 +82,6 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testContainsNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Contains_NotExists"; assertFalse(exists(key)); @@ -112,10 +93,6 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testContainsExists() { - if (!canTest()) { - return; - } - // Given String key = "Contains_Exists"; assertTrue(exists(key)); @@ -127,10 +104,6 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testRemoveNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Remove_NotExists"; assertFalse(exists(key)); @@ -142,10 +115,6 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testRemoveExists() { - if (!canTest()) { - return; - } - // Given String key = "Remove_Exists"; assertTrue(exists(key)); @@ -157,10 +126,6 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testClear() { - if (!canTest()) { - return; - } - // Given String key = "Remove_Exists"; assertTrue(exists(key)); diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java index a56dba4..53a0277 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java @@ -16,44 +16,38 @@ */ package org.apache.camel.processor.idempotent.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cassandra.BaseCassandraTest; +import org.apache.camel.component.cassandra.CassandraCQLUnit; import org.apache.camel.component.cassandra.CassandraUnitUtils; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; /** * Unite test for {@link CassandraIdempotentRepository} */ public class CassandraIdempotentTest extends BaseCassandraTest { - private Cluster cluster; + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit("NamedIdempotentDataSet.cql"); + private CassandraIdempotentRepository idempotentRepository; @Override protected void doPreSetup() throws Exception { - if (canTest()) { - cluster = CassandraUnitUtils.cassandraCluster(); - Session rootSession = cluster.connect(); - CassandraUnitUtils.loadCQLDataSet(rootSession, "NamedIdempotentDataSet.cql"); - rootSession.close(); - idempotentRepository = new NamedCassandraIdempotentRepository(cluster, CassandraUnitUtils.KEYSPACE, "ID"); - idempotentRepository.setTable("NAMED_CAMEL_IDEMPOTENT"); - idempotentRepository.start(); - } + idempotentRepository = new NamedCassandraIdempotentRepository(cassandra.cluster, CassandraUnitUtils.KEYSPACE, "ID"); + idempotentRepository.setTable("NAMED_CAMEL_IDEMPOTENT"); + idempotentRepository.start(); super.doPreSetup(); } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); - if (canTest()) { - idempotentRepository.stop(); - } + idempotentRepository.stop(); } @Override @@ -72,10 +66,6 @@ public class CassandraIdempotentTest extends BaseCassandraTest { @Test public void testIdempotentRoute() throws Exception { - if (!canTest()) { - return; - } - // Given MockEndpoint mockOutput = getMockEndpoint("mock:output"); mockOutput.expectedMessageCount(2); diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java index af3da59..a21ece8 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java @@ -16,60 +16,49 @@ */ package org.apache.camel.processor.idempotent.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.camel.component.cassandra.BaseCassandraTest; +import org.apache.camel.component.cassandra.CassandraCQLUnit; import org.apache.camel.component.cassandra.CassandraUnitUtils; -import org.cassandraunit.CassandraCQLUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for {@link CassandraIdempotentRepository} */ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { - @Rule - public CassandraCQLUnit cassandraRule = CassandraUnitUtils.cassandraCQLUnit("NamedIdempotentDataSet.cql"); + @RegisterExtension + static CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit("NamedIdempotentDataSet.cql"); - private Cluster cluster; - private Session session; private CassandraIdempotentRepository idempotentRepository; @Override - @Before + @BeforeEach public void setUp() throws Exception { - if (canTest()) { - cluster = CassandraUnitUtils.cassandraCluster(); - session = cluster.connect(CassandraUnitUtils.KEYSPACE); - idempotentRepository = new NamedCassandraIdempotentRepository(session, "ID"); - idempotentRepository.setTable("NAMED_CAMEL_IDEMPOTENT"); - idempotentRepository.start(); - } + idempotentRepository = new NamedCassandraIdempotentRepository(cassandra.cluster, CassandraUnitUtils.KEYSPACE, "ID"); + idempotentRepository.setTable("NAMED_CAMEL_IDEMPOTENT"); + idempotentRepository.start(); + super.setUp(); } @Override - @After + @AfterEach public void tearDown() throws Exception { - if (canTest()) { - idempotentRepository.stop(); - session.close(); - cluster.close(); - } + idempotentRepository.stop(); + super.tearDown(); } private boolean exists(String key) { - return session.execute("select KEY from NAMED_CAMEL_IDEMPOTENT where NAME=? and KEY=?", "ID", key).one() != null; + return cassandra.session.execute("select KEY from NAMED_CAMEL_IDEMPOTENT where NAME=? and KEY=?", "ID", key).one() != null; } @Test public void testAddNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Add_NotExists"; assertFalse(exists(key)); @@ -82,10 +71,6 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testAddExists() { - if (!canTest()) { - return; - } - // Given String key = "Add_Exists"; assertTrue(exists(key)); @@ -98,10 +83,6 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testContainsNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Contains_NotExists"; assertFalse(exists(key)); @@ -113,10 +94,6 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testContainsExists() { - if (!canTest()) { - return; - } - // Given String key = "Contains_Exists"; assertTrue(exists(key)); @@ -128,10 +105,6 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testRemoveNotExists() { - if (!canTest()) { - return; - } - // Given String key = "Remove_NotExists"; assertFalse(exists(key)); @@ -143,10 +116,6 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testRemoveExists() { - if (!canTest()) { - return; - } - // Given String key = "Remove_Exists"; assertTrue(exists(key)); @@ -158,10 +127,6 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { @Test public void testClear() { - if (!canTest()) { - return; - } - // Given String key = "Remove_Exists"; assertTrue(exists(key));
