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 cb1107c9cf39991461ea4e2723d26932b3387fbd
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jun 25 09:57:24 2020 +0200
[CAMEL-11807] Upgrade camel-google-bigquery to junit5
---
components/camel-google-bigquery/pom.xml | 4 ++--
.../google/bigquery/integration/AsyncTest.java | 6 +++---
.../bigquery/integration/BigQueryTestSupport.java | 12 ++++++++---
.../bigquery/integration/DynamicTableIdTest.java | 6 +++---
.../google/bigquery/integration/InsertIdTest.java | 6 +++---
.../google/bigquery/integration/SingleRowTest.java | 6 +++---
.../integration/sql/SqlQueryFromResourceTest.java | 6 +++---
.../bigquery/integration/sql/SqlQueryTest.java | 6 +++---
.../google/bigquery/unit/BaseBigQueryTest.java | 6 +++---
.../bigquery/unit/GoogleBigQueryProducerTest.java | 4 +++-
.../unit/sql/GoogleBigQuerySQLComponentTest.java | 4 ++--
.../sql/GoogleBigQuerySQLProducerBaseTest.java | 2 +-
.../GoogleBigQuerySQLProducerWithParamersTest.java | 13 +++++++-----
.../GoogleBigQuerySQLProducerWithPatternTest.java | 7 ++++---
.../google/bigquery/unit/sql/SqlHelperTest.java | 23 +++++++++++-----------
15 files changed, 61 insertions(+), 50 deletions(-)
diff --git a/components/camel-google-bigquery/pom.xml
b/components/camel-google-bigquery/pom.xml
index 3daf711..1f922ae 100644
--- a/components/camel-google-bigquery/pom.xml
+++ b/components/camel-google-bigquery/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/AsyncTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/AsyncTest.java
index b259bd5..1990d2c 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/AsyncTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/AsyncTest.java
@@ -31,8 +31,8 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class AsyncTest extends BigQueryTestSupport {
private static final String TABLE_ID = "asynctest";
@@ -49,7 +49,7 @@ public class AsyncTest extends BigQueryTestSupport {
@Produce("direct:in")
private ProducerTemplate producer;
- @Before
+ @BeforeEach
public void init() throws Exception {
createBqTable(TABLE_ID);
}
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryTestSupport.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryTestSupport.java
index 417dd09..4cd67da 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryTestSupport.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/BigQueryTestSupport.java
@@ -35,7 +35,11 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.google.bigquery.GoogleBigQueryComponent;
import
org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class BigQueryTestSupport extends CamelTestSupport {
public static final String SERVICE_KEY;
@@ -45,6 +49,8 @@ public class BigQueryTestSupport extends CamelTestSupport {
public static final String SERVICE_URL;
public static final String CREDENTIALS_FILE_LOCATION;
+ private static final Logger LOGGER =
LoggerFactory.getLogger(BigQueryTestSupport.class);
+
private GoogleBigQueryConnectionFactory connectionFactory;
static {
@@ -106,7 +112,7 @@ public class BigQueryTestSupport extends CamelTestSupport {
+ row.entrySet().stream()
.map(e -> e.getKey() + " = '" + e.getValue() + "'")
.collect(Collectors.joining(" AND "));
- log.debug("Query: {}", query);
+ LOGGER.debug("Query: {}", query);
queryRequest.setQuery(query);
QueryResponse queryResponse = getConnectionFactory()
.getDefaultClient()
@@ -132,7 +138,7 @@ public class BigQueryTestSupport extends CamelTestSupport {
.execute();
} catch (GoogleJsonResponseException e) {
if (e.getDetails().getCode() == 409) {
- log.info("Table {} already exist");
+ LOGGER.info("Table {} already exist");
} else {
throw e;
}
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/DynamicTableIdTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/DynamicTableIdTest.java
index da6883a..9825572 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/DynamicTableIdTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/DynamicTableIdTest.java
@@ -29,8 +29,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.bigquery.GoogleBigQueryConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class DynamicTableIdTest extends BigQueryTestSupport {
private static final String TABLE_ID_1 = "dynamic_table_1";
@@ -48,7 +48,7 @@ public class DynamicTableIdTest extends BigQueryTestSupport {
@Produce("direct:in")
private ProducerTemplate producer;
- @Before
+ @BeforeEach
public void init() throws Exception {
createBqTable(TABLE_ID_1);
createBqTable(TABLE_ID_2);
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/InsertIdTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/InsertIdTest.java
index 8aff413..7d49cad 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/InsertIdTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/InsertIdTest.java
@@ -29,8 +29,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.bigquery.GoogleBigQueryConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InsertIdTest extends BigQueryTestSupport {
private static final String TABLE_ID = "insertId";
@@ -61,7 +61,7 @@ public class InsertIdTest extends BigQueryTestSupport {
@Produce("direct:in")
private ProducerTemplate producer;
- @Before
+ @BeforeEach
public void init() throws Exception {
createBqTable(TABLE_ID);
}
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/SingleRowTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/SingleRowTest.java
index 64f479d..4786cb4 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/SingleRowTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/SingleRowTest.java
@@ -28,8 +28,8 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class SingleRowTest extends BigQueryTestSupport {
private static final String TABLE_ID = "singlerow";
@@ -46,7 +46,7 @@ public class SingleRowTest extends BigQueryTestSupport {
@Produce("direct:in")
private ProducerTemplate producer;
- @Before
+ @BeforeEach
public void init() throws Exception {
createBqTable(TABLE_ID);
}
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
index 62d284c..f0af94a 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
@@ -29,8 +29,8 @@ import org.apache.camel.builder.RouteBuilder;
import
org.apache.camel.component.google.bigquery.integration.BigQueryTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class SqlQueryFromResourceTest extends BigQueryTestSupport {
private static final String TABLE_ID = "test_sql_table";
@@ -47,7 +47,7 @@ public class SqlQueryFromResourceTest extends
BigQueryTestSupport {
@Produce("direct:in")
private ProducerTemplate producer;
- @Before
+ @BeforeEach
public void init() throws Exception {
createBqTable(TABLE_ID);
}
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
index 9628661..b16521c 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
@@ -29,8 +29,8 @@ import org.apache.camel.builder.RouteBuilder;
import
org.apache.camel.component.google.bigquery.integration.BigQueryTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class SqlQueryTest extends BigQueryTestSupport {
private static final String TABLE_ID = "test_sql_table";
@@ -47,7 +47,7 @@ public class SqlQueryTest extends BigQueryTestSupport {
@Produce("direct:in")
private ProducerTemplate producer;
- @Before
+ @BeforeEach
public void init() throws Exception {
createBqTable(TABLE_ID);
}
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
index 93e84c7..6bfd7b6 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
@@ -21,8 +21,8 @@ import
com.google.api.services.bigquery.model.TableDataInsertAllResponse;
import org.apache.camel.component.google.bigquery.GoogleBigQueryConfiguration;
import org.apache.camel.component.google.bigquery.GoogleBigQueryEndpoint;
import org.apache.camel.component.google.bigquery.GoogleBigQueryProducer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
@@ -40,7 +40,7 @@ public class BaseBigQueryTest extends CamelTestSupport {
protected GoogleBigQueryConfiguration configuration = new
GoogleBigQueryConfiguration();
protected Bigquery bigquery;
- @Before
+ @BeforeEach
public void init() throws Exception {
setupBigqueryMock();
producer = createProducer();
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java
index 7248fa6..e9cc465 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java
@@ -24,9 +24,11 @@ import java.util.Map;
import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
import org.apache.camel.Exchange;
import org.apache.camel.component.google.bigquery.GoogleBigQueryConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
index b1f1cb6..059f8bb 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.google.bigquery.unit.sql;
import org.apache.camel.CamelContext;
import
org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLComponent;
import
org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class GoogleBigQuerySQLComponentTest {
private CamelContext context = Mockito.mock(CamelContext.class);
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
index 540a8ed..c9139bb 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
@@ -21,7 +21,7 @@ import com.google.api.services.bigquery.model.QueryResponse;
import
org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLConfiguration;
import
org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpoint;
import
org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLProducer;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
index a2a0591..4f83ad4 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
@@ -22,16 +22,18 @@ import java.util.Map;
import com.google.api.services.bigquery.model.QueryRequest;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeExchangeException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
public class GoogleBigQuerySQLProducerWithParamersTest extends
GoogleBigQuerySQLProducerBaseTest {
- @Before
+ @BeforeEach
public void init() throws Exception {
sql = "insert into testDatasetId.testTableId(id, data) values(@id,
@data)";
setupBigqueryMock();
@@ -84,8 +86,9 @@ public class GoogleBigQuerySQLProducerWithParamersTest
extends GoogleBigQuerySQL
assertEquals("some data",
request.getQueryParameters().get(0).getParameterValue().getValue());
}
- @Test(expected = RuntimeExchangeException.class)
+ @Test
public void sendMessageWithoutParameters() throws Exception {
- producer.process(createExchangeWithBody(new HashMap<>()));
+ assertThrows(RuntimeExchangeException.class,
+ () -> producer.process(createExchangeWithBody(new HashMap<>())));
}
}
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
index 082027f..a721e15 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
@@ -20,16 +20,17 @@ import java.util.List;
import com.google.api.services.bigquery.model.QueryRequest;
import org.apache.camel.Exchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
public class GoogleBigQuerySQLProducerWithPatternTest extends
GoogleBigQuerySQLProducerBaseTest {
- @Before
+ @BeforeEach
public void init() throws Exception {
sql = "insert into ${testDatasetId}.testTableId(id, data) values(1,
'test')";
setupBigqueryMock();
diff --git
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
index 32cde67..dbb49a0 100644
---
a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
+++
b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
@@ -23,13 +23,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.component.google.bigquery.sql.SqlHelper;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
@@ -53,7 +53,7 @@ public class SqlHelperTest {
}
@Test
- @Ignore
+ @Disabled
public void testResolveClasspathQuery() throws Exception {
String answer = SqlHelper.resolveQuery(context,
"classpath:sql/delete.sql", ":");
assertEquals("delete from test.test_sql_table where id = @id", answer);
@@ -79,20 +79,19 @@ public class SqlHelperTest {
assertEquals(expected, answer);
}
- @Test(expected = RuntimeExchangeException.class)
+ @Test
public void testTranslateQueryWithoutParam() {
when(exchange.getMessage()).thenReturn(message);
when(message.getHeader(eq("report"),
eq(String.class))).thenReturn("report_data");
-
- SqlHelper.translateQuery(query, exchange);
- fail("Should have thrown exception");
+ assertThrows(RuntimeExchangeException.class,
+ () -> SqlHelper.translateQuery(query, exchange));
}
@Test
public void testExtractParameterNames() {
Set<String> answer = SqlHelper.extractParameterNames(query);
assertEquals(2, answer.size());
- assertTrue("Parameter 'date' not found", answer.contains("date"));
- assertTrue("Parameter 'id' not found", answer.contains("id"));
+ assertTrue(answer.contains("date"), "Parameter 'date' not found");
+ assertTrue(answer.contains("id"), "Parameter 'id' not found");
}
}
