This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 904fedd46fe9b4141ce4076393892ab79587c8df
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Wed Aug 14 19:51:51 2019 +0200
CAMEL-13826: Migrated camel-hbase tests to camel-test-junit5
---
components/camel-hbase/pom.xml | 14 +++++++++++++-
.../camel/component/hbase/CamelHBaseFilterTest.java | 12 +++++++-----
.../camel/component/hbase/CamelHBaseTestSupport.java | 20 ++++++++++----------
.../camel/component/hbase/HBaseComponentTest.java | 11 ++++++-----
.../camel/component/hbase/HBaseConsumerTest.java | 2 +-
.../camel/component/hbase/HBaseConvertionsTest.java | 4 +++-
.../camel/component/hbase/HBaseProducerTest.java | 9 +++++++--
.../idempotent/HBaseIdempotentRepositoryTest.java | 15 +++++++++------
.../camel-test-junit5/src/main/docs/test-junit5.adoc | 1 +
9 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index 06fdad9..370644a 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -65,6 +65,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- because hbase-client 1.1.1 use hadoop2.5.1 by default, check is
it still required by the next version update -->
@@ -179,7 +183,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -205,6 +209,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- because hbase-server 1.1.1 use hadoop2.5.1 by default, check is
it still required by the next version update -->
@@ -270,6 +278,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- because hbase-testing-util 1.1.1 use hadoop2.5.1 by default,
check is it still required by the next version update -->
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
index 9bd93ef..473126a 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
@@ -28,7 +28,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hbase.filters.ModelAwareColumnMatchingFilter;
import org.apache.hadoop.hbase.filter.Filter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelHBaseFilterTest extends CamelHBaseTestSupport {
@@ -52,10 +54,10 @@ public class CamelHBaseFilterTest extends
CamelHBaseTestSupport {
exchange.getIn().setHeader(HBaseAttribute.HBASE_VALUE.asHeader(),
body[0][0][0]);
Exchange resp = template.send(endpoint, exchange);
Message out = resp.getOut();
- assertTrue("two first keys returned",
- out.getHeaders().containsValue(body[0][0][0])
- && out.getHeaders().containsValue(body[1][0][0])
- && !out.getHeaders().containsValue(body[2][0][0]));
+ assertTrue(out.getHeaders().containsValue(body[0][0][0])
+ && out.getHeaders().containsValue(body[1][0][0])
+ && !out.getHeaders().containsValue(body[2][0][0]),
+ "two first keys returned");
}
}
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
index 83ea867..5ce1624 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -30,10 +30,10 @@ import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Table;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@ public abstract class CamelHBaseTestSupport extends
CamelTestSupport {
family[1].getBytes(),
family[2].getBytes()};
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
try {
hbaseUtil.startMiniCluster(numServers);
@@ -80,7 +80,7 @@ public abstract class CamelHBaseTestSupport extends
CamelTestSupport {
}
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
if (systemReady) {
hbaseUtil.shutdownMiniCluster();
@@ -88,7 +88,7 @@ public abstract class CamelHBaseTestSupport extends
CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
if (systemReady) {
try {
@@ -102,7 +102,7 @@ public abstract class CamelHBaseTestSupport extends
CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (systemReady) {
hbaseUtil.deleteTable(PERSON_TABLE.getBytes());
@@ -112,7 +112,7 @@ public abstract class CamelHBaseTestSupport extends
CamelTestSupport {
@Override
public CamelContext createCamelContext() throws Exception {
- CamelContext context = new DefaultCamelContext(createRegistry());
+ CamelContext context = new DefaultCamelContext(createCamelRegistry());
// configure hbase component
HBaseComponent component = context.getComponent("hbase",
HBaseComponent.class);
component.setConfiguration(hbaseUtil.getConfiguration());
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
index 24b9338..d80aec2 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
@@ -22,8 +22,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
public class HBaseComponentTest {
@@ -39,7 +40,7 @@ public class HBaseComponentTest {
component.doStop();
ClassLoader actualClassLoader =
component.getConfiguration().getClassLoader();
- Assert.assertSame(expectedClassLoader, actualClassLoader);
+ assertSame(expectedClassLoader, actualClassLoader);
}
@Test
@@ -59,7 +60,7 @@ public class HBaseComponentTest {
component.doStop();
ClassLoader actualClassLoader =
component.getConfiguration().getClassLoader();
- Assert.assertSame(expectedClassLoader, actualClassLoader);
+ assertSame(expectedClassLoader, actualClassLoader);
}
@Test
@@ -71,6 +72,6 @@ public class HBaseComponentTest {
component.doStop();
ClassLoader actualClassLoader =
component.getConfiguration().getClassLoader();
- Assert.assertSame(expectedClassLoader, actualClassLoader);
+ assertSame(expectedClassLoader, actualClassLoader);
}
}
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
index 61c684a..5b4cdcc 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class HBaseConsumerTest extends CamelHBaseTestSupport {
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
index cd99762..1154a6e 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
@@ -30,7 +30,9 @@ import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
public class HBaseConvertionsTest extends CamelHBaseTestSupport {
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
index 10537bd..cadd550 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
@@ -32,7 +32,12 @@ import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Table;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HBaseProducerTest extends CamelHBaseTestSupport {
@@ -254,7 +259,7 @@ public class HBaseProducerTest extends
CamelHBaseTestSupport {
Object result2 =
resp.getOut().getHeader(HBaseAttribute.HBASE_VALUE.asHeader(2));
// as we use maxResults=2 we only get 2 results back
Object result3 =
resp.getOut().getHeader(HBaseAttribute.HBASE_VALUE.asHeader(3));
- assertNull("Should only get 2 results back", result3);
+ assertNull(result3, "Should only get 2 results back");
List<?> bodies = Arrays.asList(body[0][0][0], body[1][0][0]);
assertTrue(bodies.contains(result1) && bodies.contains(result2));
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
index 5eb7273..cd1797e 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
@@ -24,9 +24,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.hadoop.hbase.TableExistsException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HBaseIdempotentRepositoryTest extends CamelHBaseTestSupport {
@@ -36,7 +39,7 @@ public class HBaseIdempotentRepositoryTest extends
CamelHBaseTestSupport {
private String key02 = "456";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
if (systemReady) {
try {
@@ -50,7 +53,7 @@ public class HBaseIdempotentRepositoryTest extends
CamelHBaseTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (systemReady) {
hbaseUtil.deleteTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE));
@@ -145,7 +148,7 @@ public class HBaseIdempotentRepositoryTest extends
CamelHBaseTestSupport {
@Override
public CamelContext createCamelContext() throws Exception {
- return new DefaultCamelContext(createRegistry());
+ return new DefaultCamelContext(createCamelRegistry());
}
@Override
diff --git a/components/camel-test-junit5/src/main/docs/test-junit5.adoc
b/components/camel-test-junit5/src/main/docs/test-junit5.adoc
index 63330ac..0ae295f 100644
--- a/components/camel-test-junit5/src/main/docs/test-junit5.adoc
+++ b/components/camel-test-junit5/src/main/docs/test-junit5.adoc
@@ -61,6 +61,7 @@ Projects using `camel-test` would need to use
`camel-test-junit5`. For instance,
* Imports of `org.apache.camel.test.junit4.\*` should be replaced with
`org.apache.camel.test.junit5.*`
* `TestSupport` static methods should be imported where needed, for instance
`import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf`
* Usage of the field `CamelTestSupport.log` should be replaced by another
logger, for instance `org.slf4j.LoggerFactory.getLogger(MyCamelTest.class);`
+* Usage of the method `CamelTestSupport.createRegistry` should be replaced by
`CamelTestSupport.createCamelRegistry()`
=== Typical migration steps linked to JUnit 5 itself
Once Camel related steps have been performed, there are still typical JUnit 5
migration steps to remember:
