This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 7a3d04ee637 Refactor @Test(expected) to assert assertThrows on test
modules (#24464)
7a3d04ee637 is described below
commit 7a3d04ee63746c3a8a037e70ecb6ef817401a003
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 5 14:06:43 2023 +0800
Refactor @Test(expected) to assert assertThrows on test modules (#24464)
---
.../core/database/visitor/SQLVisitorRuleTest.java | 5 +++--
.../datasource/AbstractDataSourceCheckerTest.java | 10 ++++++----
.../pipeline/core/importer/DataRecordMergerTest.java | 19 ++++++++++---------
.../core/ingest/channel/memory/ManualBitSetTest.java | 5 +++--
.../StandardPipelineTableMetaDataLoaderTest.java | 6 ------
.../metadata/model/PipelineTableMetaDataTest.java | 7 ++++---
.../it/data/pipeline/core/task/InventoryTaskTest.java | 7 ++++---
7 files changed, 30 insertions(+), 29 deletions(-)
diff --git
a/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRuleTest.java
b/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRuleTest.java
index 1b70af9f9ba..1ebc9807ca6 100644
---
a/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRuleTest.java
+++
b/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRuleTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
public final class SQLVisitorRuleTest {
@@ -31,8 +32,8 @@ public final class SQLVisitorRuleTest {
assertThat(SQLVisitorRule.valueOf(SelectContext.class),
is(SQLVisitorRule.SELECT));
}
- @Test(expected = SQLASTVisitorException.class)
+ @Test
public void assertValueOfParseTreeClassFailure() {
- SQLVisitorRule.valueOf(ParseTree.class);
+ assertThrows(SQLASTVisitorException.class, () ->
SQLVisitorRule.valueOf(ParseTree.class));
}
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/check/datasource/AbstractDataSourceCheckerTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/check/datasource/AbstractDataSourceCheckerTest.java
index dbf37f4e909..606d9e7f8c5 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/check/datasource/AbstractDataSourceCheckerTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/check/datasource/AbstractDataSourceCheckerTest.java
@@ -36,6 +36,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -86,10 +87,10 @@ public final class AbstractDataSourceCheckerTest {
verify(dataSource).getConnection();
}
- @Test(expected = PrepareJobWithInvalidConnectionException.class)
+ @Test
public void assertCheckConnectionFailed() throws SQLException {
when(dataSource.getConnection()).thenThrow(new SQLException("error"));
- dataSourceChecker.checkConnection(dataSources);
+ assertThrows(PrepareJobWithInvalidConnectionException.class, () ->
dataSourceChecker.checkConnection(dataSources));
}
@Test
@@ -100,12 +101,13 @@ public final class AbstractDataSourceCheckerTest {
dataSourceChecker.checkTargetTable(dataSources, new
TableNameSchemaNameMapping(Collections.emptyMap()),
Collections.singletonList("t_order"));
}
- @Test(expected = PrepareJobWithTargetTableNotEmptyException.class)
+ @Test
public void assertCheckTargetTableFailed() throws SQLException {
when(dataSource.getConnection()).thenReturn(connection);
when(connection.prepareStatement("SELECT * FROM t_order LIMIT
1")).thenReturn(preparedStatement);
when(preparedStatement.executeQuery()).thenReturn(resultSet);
when(resultSet.next()).thenReturn(true);
- dataSourceChecker.checkTargetTable(dataSources, new
TableNameSchemaNameMapping(Collections.emptyMap()),
Collections.singletonList("t_order"));
+ assertThrows(PrepareJobWithTargetTableNotEmptyException.class,
+ () -> dataSourceChecker.checkTargetTable(dataSources, new
TableNameSchemaNameMapping(Collections.emptyMap()),
Collections.singletonList("t_order")));
}
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/DataRecordMergerTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/DataRecordMergerTest.java
index 785511ed60f..9311d489589 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/DataRecordMergerTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/DataRecordMergerTest.java
@@ -33,8 +33,9 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertNull;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
public final class DataRecordMergerTest {
@@ -46,18 +47,18 @@ public final class DataRecordMergerTest {
private Collection<DataRecord> actual;
- @Test(expected = PipelineUnexpectedDataRecordOrderException.class)
+ @Test
public void assertInsertBeforeInsert() {
beforeDataRecord = mockInsertDataRecord(1, 1, 1);
afterDataRecord = mockInsertDataRecord(1, 1, 1);
- actual = dataRecordMerger.merge(Arrays.asList(beforeDataRecord,
afterDataRecord));
+ assertThrows(PipelineUnexpectedDataRecordOrderException.class, () ->
dataRecordMerger.merge(Arrays.asList(beforeDataRecord, afterDataRecord)));
}
- @Test(expected = PipelineUnexpectedDataRecordOrderException.class)
+ @Test
public void assertUpdateBeforeInsert() {
beforeDataRecord = mockUpdateDataRecord(1, 2, 2);
afterDataRecord = mockInsertDataRecord(1, 1, 1);
- actual = dataRecordMerger.merge(Arrays.asList(beforeDataRecord,
afterDataRecord));
+ assertThrows(PipelineUnexpectedDataRecordOrderException.class, () ->
dataRecordMerger.merge(Arrays.asList(beforeDataRecord, afterDataRecord)));
}
@Test
@@ -159,11 +160,11 @@ public final class DataRecordMergerTest {
assertThat(dataRecord.getColumn(2).getValue(), is(2));
}
- @Test(expected = UnsupportedSQLOperationException.class)
+ @Test
public void assertDeleteBeforeUpdate() {
beforeDataRecord = mockDeleteDataRecord(1, 1, 1);
afterDataRecord = mockUpdateDataRecord(1, 2, 2);
- actual = dataRecordMerger.merge(Arrays.asList(beforeDataRecord,
afterDataRecord));
+ assertThrows(UnsupportedSQLOperationException.class, () ->
dataRecordMerger.merge(Arrays.asList(beforeDataRecord, afterDataRecord)));
}
@Test
@@ -199,11 +200,11 @@ public final class DataRecordMergerTest {
assertThat(dataRecord.getColumn(2).getValue(), is(1));
}
- @Test(expected = PipelineUnexpectedDataRecordOrderException.class)
+ @Test
public void assertDeleteBeforeDelete() {
beforeDataRecord = mockDeleteDataRecord(1, 1, 1);
afterDataRecord = mockDeleteDataRecord(1, 1, 1);
- actual = dataRecordMerger.merge(Arrays.asList(beforeDataRecord,
afterDataRecord));
+ assertThrows(PipelineUnexpectedDataRecordOrderException.class, () ->
dataRecordMerger.merge(Arrays.asList(beforeDataRecord, afterDataRecord)));
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/ingest/channel/memory/ManualBitSetTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/ingest/channel/memory/ManualBitSetTest.java
index da9da54c3ad..7585d200f63 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/ingest/channel/memory/ManualBitSetTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/ingest/channel/memory/ManualBitSetTest.java
@@ -30,6 +30,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
public final class ManualBitSetTest {
@@ -53,11 +54,11 @@ public final class ManualBitSetTest {
assertThat(bitSet.getEndIndex(0L, 5), is(1034L));
}
- @Test(expected = IndexOutOfBoundsException.class)
+ @Test
public void assertGetEndIndexFailure() {
ManualBitSet bitSet = new ManualBitSet();
IntStream.range(0, 10).filter(each -> each % 2 ==
1).forEach(bitSet::set);
- bitSet.getEndIndex(0L, 10);
+ assertThrows(IndexOutOfBoundsException.class, () ->
bitSet.getEndIndex(0L, 10));
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
index 9ea953e2050..0a749947a35 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoaderTest.java
@@ -157,10 +157,4 @@ public final class StandardPipelineTableMetaDataLoaderTest
{
assertThat(actualIndexMetaData.getColumns().get(0).getName(),
is("id"));
assertThat(actualIndexMetaData.getColumns().get(1).getName(),
is("name"));
}
-
- @Test(expected = RuntimeException.class)
- public void assertGetTableMetaDataFailure() throws SQLException {
- when(dataSource.getConnection()).thenThrow(new SQLException(""));
- new
StandardPipelineTableMetaDataLoader(dataSource).getTableMetaData(null,
TEST_TABLE);
- }
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/model/PipelineTableMetaDataTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/model/PipelineTableMetaDataTest.java
index 6f5713ea3ba..053a8fa44b3 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/model/PipelineTableMetaDataTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/model/PipelineTableMetaDataTest.java
@@ -26,8 +26,9 @@ import java.sql.Types;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
public final class PipelineTableMetaDataTest {
@@ -64,8 +65,8 @@ public final class PipelineTableMetaDataTest {
assertTrue(pipelineTableMetaData.getColumnMetaData(1).isUniqueKey());
}
- @Test(expected = IndexOutOfBoundsException.class)
+ @Test
public void assertIndexOutOfBoundsException() {
- pipelineTableMetaData.getColumnMetaData(2);
+ assertThrows(IndexOutOfBoundsException.class, () ->
pipelineTableMetaData.getColumnMetaData(2));
}
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
index 29db981d435..85c3d9be7e3 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
@@ -47,6 +47,7 @@ import java.util.concurrent.TimeoutException;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
public final class InventoryTaskTest {
@@ -69,8 +70,8 @@ public final class InventoryTaskTest {
taskConfig =
PipelineContextUtil.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration()).getTaskConfig();
}
- @Test(expected = ExecutionException.class)
- public void assertStartWithGetEstimatedRowsFailure() throws
ExecutionException, InterruptedException, TimeoutException {
+ @Test
+ public void assertStartWithGetEstimatedRowsFailure() {
InventoryDumperConfiguration inventoryDumperConfig =
createInventoryDumperConfiguration("t_non_exist", "t_non_exist");
PipelineDataSourceWrapper dataSource =
DATA_SOURCE_MANAGER.getDataSource(inventoryDumperConfig.getDataSourceConfig());
PipelineTableMetaDataLoader metaDataLoader = new
StandardPipelineTableMetaDataLoader(dataSource);
@@ -78,7 +79,7 @@ public final class InventoryTaskTest {
InventoryTask inventoryTask = new
InventoryTask(inventoryDumperConfig, taskConfig.getImporterConfig(),
PipelineContextUtil.getPipelineChannelCreator(), new
FixtureImporterConnector(), dataSource,
metaDataLoader,
PipelineContextUtil.getExecuteEngine(), PipelineContextUtil.getExecuteEngine(),
new FixtureInventoryIncrementalJobItemContext())) {
- CompletableFuture.allOf(inventoryTask.start().toArray(new
CompletableFuture[0])).get(10L, TimeUnit.SECONDS);
+ assertThrows(ExecutionException.class, () ->
CompletableFuture.allOf(inventoryTask.start().toArray(new
CompletableFuture[0])).get(10L, TimeUnit.SECONDS));
}
}
