提交 aee7517f 编写于 作者: G gaohongtao 提交者: gaohongtao

test case refactor

上级 d8227795
......@@ -68,6 +68,7 @@ public final class ShardingRuleBuilderTest {
shardingRuleConfig.setDefaultDatabaseStrategy(getDatabaseStrategyConfig("xxx.Algorithm"));
new ShardingRuleBuilder(shardingRuleConfig).build();
}
@Test(expected = IllegalArgumentException.class)
public void assertBuildFailureWhenAutoIncrementClassNotExisted() {
ShardingRuleConfig shardingRuleConfig = new ShardingRuleConfig();
......
......@@ -18,12 +18,15 @@
package com.dangdang.ddframe.rdb.sharding.config.common.fixture;
import com.dangdang.ddframe.rdb.sharding.id.generator.IdGenerator;
import lombok.AccessLevel;
import lombok.Getter;
import java.util.concurrent.atomic.AtomicInteger;
abstract class AbstractNumberIdGenerator implements IdGenerator{
abstract class AbstractNumberIdGenerator implements IdGenerator {
final AtomicInteger sequence = new AtomicInteger(100);
@Getter(AccessLevel.PACKAGE)
private final AtomicInteger sequence = new AtomicInteger(100);
@Override
public void initContext(final String tableName, final String columnName) {
......
......@@ -17,10 +17,10 @@
package com.dangdang.ddframe.rdb.sharding.config.common.fixture;
public class DecrementIdGenerator extends AbstractNumberIdGenerator{
public class DecrementIdGenerator extends AbstractNumberIdGenerator {
@Override
public Object generateId() {
return sequence.decrementAndGet();
return getSequence().decrementAndGet();
}
}
......@@ -17,10 +17,10 @@
package com.dangdang.ddframe.rdb.sharding.config.common.fixture;
public class IncrementIdGenerator extends AbstractNumberIdGenerator{
public class IncrementIdGenerator extends AbstractNumberIdGenerator {
@Override
public Object generateId() {
return sequence.incrementAndGet();
return getSequence().incrementAndGet();
}
}
......@@ -47,7 +47,7 @@ import org.junit.runners.Suite.SuiteClasses;
WithNamespaceDifferentTablesTest.class,
WithNamespaceForIndicatedDataSourceNamesTest.class,
WithNamespaceForMasterSlaveTest.class,
AutoIncrementDBUnitTest.class,
AutoIncrementDBUnitTest.class
})
public class AllSpringTests {
}
......@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@ContextConfiguration(locations = "classpath:META-INF/rdb/namespace/withNamespaceAutoIncrementColumns.xml")
public class AutoIncrementDBUnitTest extends AbstractSpringDBUnitTest{
public class AutoIncrementDBUnitTest extends AbstractSpringDBUnitTest {
@Test
public void test() throws SQLException {
......
......@@ -18,12 +18,15 @@
package com.dangdang.ddframe.rdb.sharding.spring.fixture;
import com.dangdang.ddframe.rdb.sharding.id.generator.IdGenerator;
import lombok.AccessLevel;
import lombok.Getter;
import java.util.concurrent.atomic.AtomicInteger;
abstract class AbstractNumberIdGenerator implements IdGenerator{
abstract class AbstractNumberIdGenerator implements IdGenerator {
final AtomicInteger sequence = new AtomicInteger(100);
@Getter(AccessLevel.PACKAGE)
private final AtomicInteger sequence = new AtomicInteger(100);
@Override
public void initContext(final String tableName, final String columnName) {
......
......@@ -17,10 +17,10 @@
package com.dangdang.ddframe.rdb.sharding.spring.fixture;
public class DecrementIdGenerator extends AbstractNumberIdGenerator{
public class DecrementIdGenerator extends AbstractNumberIdGenerator {
@Override
public Object generateId() {
return sequence.decrementAndGet();
return getSequence().decrementAndGet();
}
}
......@@ -17,10 +17,10 @@
package com.dangdang.ddframe.rdb.sharding.spring.fixture;
public class IncrementIdGenerator extends AbstractNumberIdGenerator{
public class IncrementIdGenerator extends AbstractNumberIdGenerator {
@Override
public Object generateId() {
return sequence.incrementAndGet();
return getSequence().incrementAndGet();
}
}
......@@ -18,12 +18,15 @@
package com.dangdang.ddframe.rdb.sharding.config.yaml.fixture;
import com.dangdang.ddframe.rdb.sharding.id.generator.IdGenerator;
import lombok.AccessLevel;
import lombok.Getter;
import java.util.concurrent.atomic.AtomicInteger;
abstract class AbstractNumberIdGenerator implements IdGenerator{
abstract class AbstractNumberIdGenerator implements IdGenerator {
final AtomicInteger sequence = new AtomicInteger(100);
@Getter(AccessLevel.PACKAGE)
private final AtomicInteger sequence = new AtomicInteger(100);
@Override
public void initContext(final String tableName, final String columnName) {
......
......@@ -17,10 +17,10 @@
package com.dangdang.ddframe.rdb.sharding.config.yaml.fixture;
public class DecrementIdGenerator extends AbstractNumberIdGenerator{
public class DecrementIdGenerator extends AbstractNumberIdGenerator {
@Override
public Object generateId() {
return sequence.decrementAndGet();
return getSequence().decrementAndGet();
}
}
......@@ -17,10 +17,10 @@
package com.dangdang.ddframe.rdb.sharding.config.yaml.fixture;
public class IncrementIdGenerator extends AbstractNumberIdGenerator{
public class IncrementIdGenerator extends AbstractNumberIdGenerator {
@Override
public Object generateId() {
return sequence.incrementAndGet();
return getSequence().incrementAndGet();
}
}
......@@ -34,5 +34,5 @@ public interface SlaveLoadBalanceStrategy {
* @param slaveDataSources 从库数据源列表
* @return 选中的从库数据源
*/
DataSource getDataSource(final String name, final List<DataSource> slaveDataSources);
DataSource getDataSource(String name, List<DataSource> slaveDataSources);
}
......@@ -34,7 +34,7 @@ import java.util.Collection;
* 消息投递员.
* 负责SQL执行消息的投递
*
* @author gaohongtao.
* @author gaohongtao
*/
@RequiredArgsConstructor
class EventPostman {
......
......@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* 事件总线.
*
* @author gaohongtao.
* @author gaohongtao
*/
public class ExecutionEventBus {
......
......@@ -33,7 +33,7 @@ import java.util.Map;
/**
* 生成键结果集.
*
* @author gaohongtao.
* @author gaohongtao
*/
@RequiredArgsConstructor
public class GeneratedKeysResultSet extends AbstractUnsupportedGeneratedKeysResultSet {
......
......@@ -28,7 +28,7 @@ import java.util.ArrayList;
* 参数列表.
* 对外提供参数值统一访问方式
*
* @author gaohongtao.
* @author gaohongtao
*/
@RequiredArgsConstructor
public class ParameterList extends AbstractList<Object> {
......
......@@ -31,7 +31,7 @@ import java.util.Map;
/**
* 自动生成键上下文.
*
* @author gaohongtao.
* @author gaohongtao
*/
@ToString
public class GeneratedKeyContext {
......
......@@ -25,7 +25,7 @@ import lombok.ToString;
/**
* 可排序列.
*
* @author gaohongtao.
* @author gaohongtao
*/
@ToString
@Getter
......
......@@ -25,7 +25,7 @@ import java.util.Map;
/**
* MySQL变量中提取参数值与编号.
*
* @author gaohongtao.
* @author gaohongtao
*/
public class MySQLEvalVisitor extends MySqlEvalVisitorImpl {
......
......@@ -48,7 +48,7 @@ import org.junit.runners.Suite.SuiteClasses;
AllUtilTests.class,
AllMetricsTests.class,
AllIntegrateTests.class,
AllIdGeneratorTest.class,
AllIdGeneratorTest.class
})
public class AllTests {
}
......@@ -60,7 +60,7 @@ public final class ShardingDataBasesOnlyForPStatementWithDMLTest extends Abstrac
String sql = "INSERT INTO `t_order` (`order_id`, `status`) VALUES (?, ?)";
try (Connection connection = shardingDataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
for (int i = 1; i <= 10; i++) {
for (int i = 1; i <= 10; i++) {
preparedStatement.setInt(1, i);
preparedStatement.setString(2, "insert");
preparedStatement.executeUpdate();
......
......@@ -25,6 +25,7 @@ import com.dangdang.ddframe.rdb.sharding.id.generator.IdGenerator;
import com.dangdang.ddframe.rdb.sharding.id.generator.fixture.IncrementIdGenerator;
import com.google.common.collect.Sets;
import org.junit.Test;
import org.mockito.Mockito;
import javax.sql.DataSource;
import java.util.Arrays;
......@@ -204,22 +205,9 @@ public final class TableRuleTest {
@Test
public void assertAutoIncrementColumn() {
TableRule actual = TableRule.builder("logicTable").dataSourceRule(createDataSourceRule()).autoIncrementColumns("col_1", IncrementIdGenerator.class)
.autoIncrementColumns("col_2").tableIdGenerator(MockIdGenerator.class).build();
.autoIncrementColumns("col_2").tableIdGenerator(Mockito.mock(IdGenerator.class).getClass()).build();
assertThat(actual.getAutoIncrementColumnMap().get("col_1"), instanceOf(IncrementIdGenerator.class));
assertThat(actual.getAutoIncrementColumnMap().get("col_2"), instanceOf(MockIdGenerator.class));
}
public static class MockIdGenerator implements IdGenerator {
@Override
public void initContext(final String tableName, final String columnName) {
}
@Override
public Object generateId() {
return null;
}
assertThat(actual.getAutoIncrementColumnMap().get("col_2"), instanceOf(Mockito.mock(IdGenerator.class).getClass()));
}
private DataSourceRule createDataSourceRule() {
......
......@@ -109,7 +109,6 @@ public final class StatementExecutorTest {
@Test
public void assertExecuteQueryForMultipleStatementsSuccess() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
ResultSet resultSet1 = mock(ResultSet.class);
ResultSet resultSet2 = mock(ResultSet.class);
......@@ -118,6 +117,7 @@ public final class StatementExecutorTest {
when(statement2.executeQuery(SELECT_FROM_DUAL)).thenReturn(resultSet2);
when(statement2.getConnection()).thenReturn(mock(Connection.class));
StatementExecutor actual = new StatementExecutor(executorEngine);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_1");
actual.addStatement(wrapper2);
......@@ -158,7 +158,6 @@ public final class StatementExecutorTest {
@Test
public void assertExecuteQueryForMultipleStatementsFailure() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
SQLException exp = new SQLException();
when(statement1.executeQuery(SELECT_FROM_DUAL)).thenThrow(exp);
......@@ -166,6 +165,7 @@ public final class StatementExecutorTest {
when(statement1.getConnection()).thenReturn(mock(Connection.class));
when(statement2.getConnection()).thenReturn(mock(Connection.class));
StatementExecutor actual = new StatementExecutor(executorEngine);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_1");
actual.addStatement(wrapper2);
......@@ -204,13 +204,13 @@ public final class StatementExecutorTest {
@Test
public void assertExecuteUpdateForMultipleStatementsSuccess() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
when(statement1.executeUpdate(DELETE_FROM_DUAL)).thenReturn(10);
when(statement2.executeUpdate(DELETE_FROM_DUAL)).thenReturn(20);
when(statement1.getConnection()).thenReturn(mock(Connection.class));
when(statement2.getConnection()).thenReturn(mock(Connection.class));
StatementExecutor actual = new StatementExecutor(executorEngine);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
......@@ -249,7 +249,6 @@ public final class StatementExecutorTest {
@Test
public void assertExecuteUpdateForMultipleStatementsFailure() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
SQLException exp = new SQLException();
when(statement1.executeUpdate(DELETE_FROM_DUAL)).thenThrow(exp);
......@@ -257,6 +256,7 @@ public final class StatementExecutorTest {
when(statement1.getConnection()).thenReturn(mock(Connection.class));
when(statement2.getConnection()).thenReturn(mock(Connection.class));
StatementExecutor actual = new StatementExecutor(executorEngine);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
......@@ -345,13 +345,13 @@ public final class StatementExecutorTest {
@Test
public void assertExecuteForMultipleStatementsSuccessWithDML() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
when(statement1.execute(DELETE_FROM_DUAL)).thenReturn(false);
when(statement2.execute(DELETE_FROM_DUAL)).thenReturn(false);
when(statement1.getConnection()).thenReturn(mock(Connection.class));
when(statement2.getConnection()).thenReturn(mock(Connection.class));
StatementExecutor actual = new StatementExecutor(executorEngine);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
......@@ -390,7 +390,6 @@ public final class StatementExecutorTest {
@Test
public void assertExecuteForMultipleStatementsFailureWithDML() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
SQLException exp = new SQLException();
when(statement1.execute(DELETE_FROM_DUAL)).thenThrow(exp);
......@@ -398,6 +397,7 @@ public final class StatementExecutorTest {
when(statement1.getConnection()).thenReturn(mock(Connection.class));
when(statement2.getConnection()).thenReturn(mock(Connection.class));
StatementExecutor actual = new StatementExecutor(executorEngine);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
......@@ -435,13 +435,13 @@ public final class StatementExecutorTest {
@Test
public void assertExecuteForMultipleStatements() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
when(statement1.execute(SELECT_FROM_DUAL)).thenReturn(true);
when(statement2.execute(SELECT_FROM_DUAL)).thenReturn(true);
when(statement1.getConnection()).thenReturn(mock(Connection.class));
when(statement2.getConnection()).thenReturn(mock(Connection.class));
StatementExecutor actual = new StatementExecutor(executorEngine);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_0");
actual.addStatement(wrapper2);
......
......@@ -21,7 +21,7 @@ import com.dangdang.ddframe.rdb.sharding.id.generator.IdGenerator;
import java.util.concurrent.atomic.AtomicInteger;
public class IncrementIdGenerator implements IdGenerator{
public class IncrementIdGenerator implements IdGenerator {
private final AtomicInteger i = new AtomicInteger();
......@@ -34,4 +34,4 @@ public class IncrementIdGenerator implements IdGenerator{
public Object generateId() {
return i.incrementAndGet();
}
}
\ No newline at end of file
}
......@@ -17,14 +17,14 @@
package com.dangdang.ddframe.rdb.sharding.jdbc;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.AbstractPreparedStatementAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.ConnectionAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.DataSourceAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.ParameterizedAbstractPreparedStatementAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.PreparedStatementAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.ResultSetAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.ResultSetGetterAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.StatementAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.AbstractUnsupportedGeneratedKeysResultSetTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedGeneratedKeysResultSetTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationConnectionTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationDataSourceTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationPreparedStatementTest;
......@@ -47,7 +47,7 @@ import org.junit.runners.Suite;
UnsupportedOperationPreparedStatementTest.class,
UnsupportedOperationResultSetTest.class,
UnsupportedUpdateOperationResultSetTest.class,
AbstractUnsupportedGeneratedKeysResultSetTest.class,
UnsupportedGeneratedKeysResultSetTest.class,
DataSourceAdapterTest.class,
ConnectionAdapterTest.class,
StatementAdapterTest.class,
......@@ -57,11 +57,11 @@ import org.junit.runners.Suite;
JdbcMethodInvocationTest.class,
MasterSlaveDataSourceTest.class,
ParameterListTest.class,
AbstractPreparedStatementAdapterTest.class,
ParameterizedAbstractPreparedStatementAdapterTest.class,
ShardingConnectionTest.class,
ShardingPreparedStatementTableOnlyTest.class,
GeneratedKeysResultSetTest.class,
GeneratedKeysResultSetMetaDataTest.class,
GeneratedKeysResultSetMetaDataTest.class
})
public class AllJDBCTests {
}
......@@ -33,151 +33,151 @@ import static org.junit.Assert.assertTrue;
public class GeneratedKeysResultSetMetaDataTest {
private ResultSetMetaData acutalMetaData;
private ResultSetMetaData actualMetaData;
@Before
public void init() throws SQLException {
acutalMetaData = GeneratedKeysResultSetTest.createMock().getMetaData();
actualMetaData = GeneratedKeysResultSetTest.createMock().getMetaData();
}
@Test
public void getColumnCount() throws Exception {
assertThat(acutalMetaData.getColumnCount(), is(2));
assertThat(actualMetaData.getColumnCount(), is(2));
}
@Test
public void isAutoIncrement() throws Exception {
assertTrue(acutalMetaData.isAutoIncrement(1));
assertTrue(acutalMetaData.isAutoIncrement(2));
assertTrue(actualMetaData.isAutoIncrement(1));
assertTrue(actualMetaData.isAutoIncrement(2));
}
@Test
public void isCaseSensitive() throws Exception {
assertTrue(acutalMetaData.isCaseSensitive(1));
assertTrue(acutalMetaData.isCaseSensitive(2));
assertTrue(actualMetaData.isCaseSensitive(1));
assertTrue(actualMetaData.isCaseSensitive(2));
}
@Test
public void isSearchable() throws Exception {
assertFalse(acutalMetaData.isSearchable(1));
assertFalse(acutalMetaData.isSearchable(2));
assertFalse(actualMetaData.isSearchable(1));
assertFalse(actualMetaData.isSearchable(2));
}
@Test
public void isCurrency() throws Exception {
assertFalse(acutalMetaData.isCurrency(1));
assertFalse(acutalMetaData.isCurrency(2));
assertFalse(actualMetaData.isCurrency(1));
assertFalse(actualMetaData.isCurrency(2));
}
@Test
public void isNullable() throws Exception {
assertEquals(acutalMetaData.isNullable(1), ResultSetMetaData.columnNoNulls);
assertEquals(acutalMetaData.isNullable(2), ResultSetMetaData.columnNoNulls);
assertEquals(actualMetaData.isNullable(1), ResultSetMetaData.columnNoNulls);
assertEquals(actualMetaData.isNullable(2), ResultSetMetaData.columnNoNulls);
}
@Test
public void isSigned() throws Exception {
assertTrue(acutalMetaData.isSigned(1));
assertTrue(acutalMetaData.isSigned(2));
assertTrue(actualMetaData.isSigned(1));
assertTrue(actualMetaData.isSigned(2));
}
@Test
public void getColumnDisplaySize() throws Exception {
assertEquals(acutalMetaData.getColumnDisplaySize(1), 0);
assertEquals(acutalMetaData.getColumnDisplaySize(2), 0);
assertEquals(actualMetaData.getColumnDisplaySize(1), 0);
assertEquals(actualMetaData.getColumnDisplaySize(2), 0);
}
@Test
public void getColumnLabel() throws Exception {
assertThat(acutalMetaData.getColumnLabel(1), is("order_id"));
assertThat(acutalMetaData.getColumnLabel(2), is("order_no"));
assertThat(actualMetaData.getColumnLabel(1), is("order_id"));
assertThat(actualMetaData.getColumnLabel(2), is("order_no"));
}
@Test
public void getColumnName() throws Exception {
assertThat(acutalMetaData.getColumnName(1), is("order_id"));
assertThat(acutalMetaData.getColumnName(2), is("order_no"));
assertThat(actualMetaData.getColumnName(1), is("order_id"));
assertThat(actualMetaData.getColumnName(2), is("order_no"));
}
@Test
public void getSchemaName() throws Exception {
assertThat(acutalMetaData.getSchemaName(1), is(""));
assertThat(acutalMetaData.getSchemaName(2), is(""));
assertThat(actualMetaData.getSchemaName(1), is(""));
assertThat(actualMetaData.getSchemaName(2), is(""));
}
@Test
public void getPrecision() throws Exception {
assertEquals(acutalMetaData.getPrecision(1), 0);
assertEquals(acutalMetaData.getPrecision(2), 0);
assertEquals(actualMetaData.getPrecision(1), 0);
assertEquals(actualMetaData.getPrecision(2), 0);
}
@Test
public void getScale() throws Exception {
assertEquals(acutalMetaData.getScale(1), 0);
assertEquals(acutalMetaData.getScale(2), 0);
assertEquals(actualMetaData.getScale(1), 0);
assertEquals(actualMetaData.getScale(2), 0);
}
@Test
public void getTableName() throws Exception {
assertThat(acutalMetaData.getTableName(1), is(""));
assertThat(acutalMetaData.getTableName(2), is(""));
assertThat(actualMetaData.getTableName(1), is(""));
assertThat(actualMetaData.getTableName(2), is(""));
}
@Test
public void getCatalogName() throws Exception {
assertThat(acutalMetaData.getCatalogName(1), is(""));
assertThat(acutalMetaData.getCatalogName(2), is(""));
assertThat(actualMetaData.getCatalogName(1), is(""));
assertThat(actualMetaData.getCatalogName(2), is(""));
}
@Test
public void getColumnType() throws Exception {
assertEquals(acutalMetaData.getColumnType(1), Types.BIGINT);
assertEquals(acutalMetaData.getColumnType(2), Types.VARCHAR);
assertEquals(actualMetaData.getColumnType(1), Types.BIGINT);
assertEquals(actualMetaData.getColumnType(2), Types.VARCHAR);
}
@Test
public void getColumnTypeName() throws Exception {
assertThat(acutalMetaData.getColumnTypeName(1), is(""));
assertThat(acutalMetaData.getColumnTypeName(2), is(""));
assertThat(actualMetaData.getColumnTypeName(1), is(""));
assertThat(actualMetaData.getColumnTypeName(2), is(""));
}
@Test
public void isReadOnly() throws Exception {
assertTrue(acutalMetaData.isReadOnly(1));
assertTrue(acutalMetaData.isReadOnly(2));
assertTrue(actualMetaData.isReadOnly(1));
assertTrue(actualMetaData.isReadOnly(2));
}
@Test
public void isWritable() throws Exception {
assertFalse(acutalMetaData.isWritable(1));
assertFalse(acutalMetaData.isWritable(2));
assertFalse(actualMetaData.isWritable(1));
assertFalse(actualMetaData.isWritable(2));
}
@Test
public void isDefinitelyWritable() throws Exception {
assertFalse(acutalMetaData.isDefinitelyWritable(1));
assertFalse(acutalMetaData.isDefinitelyWritable(2));
assertFalse(actualMetaData.isDefinitelyWritable(1));
assertFalse(actualMetaData.isDefinitelyWritable(2));
}
@Test
public void getColumnClassName() throws Exception {
assertThat(acutalMetaData.getColumnClassName(1), is("java.lang.Long"));
assertThat(acutalMetaData.getColumnClassName(2), is("java.lang.String"));
assertThat(actualMetaData.getColumnClassName(1), is("java.lang.Long"));
assertThat(actualMetaData.getColumnClassName(2), is("java.lang.String"));
}
@Test
public void unwrap() throws Exception {
assertThat(acutalMetaData.unwrap(GeneratedKeysResultSetMetaData.class), is(((GeneratedKeysResultSetMetaData) acutalMetaData)));
assertThat(actualMetaData.unwrap(GeneratedKeysResultSetMetaData.class), is((GeneratedKeysResultSetMetaData) actualMetaData));
}
@Test(expected = SQLException.class)
public void unwrapError() throws Exception {
acutalMetaData.unwrap(RowSetMetaDataImpl.class);
actualMetaData.unwrap(RowSetMetaDataImpl.class);
}
@Test
public void isWrapperFor() throws Exception {
assertTrue(acutalMetaData.isWrapperFor(GeneratedKeysResultSetMetaData.class));
assertTrue(actualMetaData.isWrapperFor(GeneratedKeysResultSetMetaData.class));
}
}
\ No newline at end of file
}
......@@ -37,11 +37,11 @@ import static org.junit.Assert.assertTrue;
public class GeneratedKeysResultSetTest {
private GeneratedKeysResultSet actualResultSet;
private static final Statement STATEMENT = Mockito.mock(Statement.class);
private static final Statement statement = Mockito.mock(Statement.class);
private GeneratedKeysResultSet actualResultSet;
public static GeneratedKeysResultSet createMock() {
static GeneratedKeysResultSet createMock() {
Map<String, Integer> columnMap = new HashMap<>();
columnMap.put("order_id", 0);
columnMap.put("order_no", 1);
......@@ -50,7 +50,7 @@ public class GeneratedKeysResultSetTest {
valueTable.put(0, 1, "OL_1");
valueTable.put(1, 0, 2L);
valueTable.put(1, 1, "OL_2");
return new GeneratedKeysResultSet(valueTable, columnMap, statement);
return new GeneratedKeysResultSet(valueTable, columnMap, STATEMENT);
}
@Before
......@@ -96,18 +96,18 @@ public class GeneratedKeysResultSetTest {
@Test
public void getByte() throws Exception {
assertTrue(actualResultSet.next());
assertThat(actualResultSet.getByte(1), is((byte)1L));
assertThat(actualResultSet.getByte(1), is((byte) 1L));
assertTrue(actualResultSet.next());
assertThat(actualResultSet.getByte("order_id"), is((byte)2L));
assertThat(actualResultSet.getByte("order_id"), is((byte) 2L));
assertFalse(actualResultSet.next());
}
@Test
public void getShort() throws Exception {
assertTrue(actualResultSet.next());
assertThat(actualResultSet.getShort(1), is((short)1L));
assertThat(actualResultSet.getShort(1), is((short) 1L));
assertTrue(actualResultSet.next());
assertThat(actualResultSet.getShort("order_id"), is((short)2L));
assertThat(actualResultSet.getShort("order_id"), is((short) 2L));
assertFalse(actualResultSet.next());
}
......@@ -170,9 +170,9 @@ public class GeneratedKeysResultSetTest {
@Test
public void getObject() throws Exception {
assertTrue(actualResultSet.next());
assertThat(actualResultSet.getObject(2), is((Object)"OL_1"));
assertThat(actualResultSet.getObject(2), is((Object) "OL_1"));
assertTrue(actualResultSet.next());
assertThat(actualResultSet.getObject("order_no"), is((Object)"OL_2"));
assertThat(actualResultSet.getObject("order_no"), is((Object) "OL_2"));
assertFalse(actualResultSet.next());
}
......@@ -188,7 +188,7 @@ public class GeneratedKeysResultSetTest {
@Test
public void getStatement() throws Exception {
assertThat(actualResultSet.getStatement(), is(statement));
assertThat(actualResultSet.getStatement(), is(STATEMENT));
}
}
\ No newline at end of file
}
......@@ -60,7 +60,8 @@ public class ShardingConnectionTest {
Map<String, DataSource> dataSourceMap = new HashMap<>(1);
dataSourceMap.put(DS_NAME, MASTER_SLAVE_DATA_SOURCE);
DataSourceRule dataSourceRule = new DataSourceRule(dataSourceMap);
ShardingRule rule = new ShardingRule.ShardingRuleBuilder().dataSourceRule(dataSourceRule).tableRules(Collections.singleton(new TableRule.TableRuleBuilder("test").dataSourceRule(dataSourceRule).build())).build();
ShardingRule rule = new ShardingRule.ShardingRuleBuilder().dataSourceRule(dataSourceRule)
.tableRules(Collections.singleton(new TableRule.TableRuleBuilder("test").dataSourceRule(dataSourceRule).build())).build();
ShardingContext sc = new ShardingContext(rule, null, null);
connection = new ShardingConnection(sc);
}
......@@ -69,7 +70,7 @@ public class ShardingConnectionTest {
public void clear() {
try {
connection.close();
} catch (SQLException ignored) {
} catch (final SQLException ignored) {
}
}
......@@ -110,4 +111,4 @@ public class ShardingConnectionTest {
connection.releaseBrokenConnection(conn);
assertNotSame(conn, connection.getConnection(DS_NAME, SQLStatementType.UPDATE));
}
}
\ No newline at end of file
}
......@@ -281,22 +281,22 @@ public final class ShardingPreparedStatementTest extends AbstractShardingDataBas
assertEquals(preparedStatement.getGeneratedKeys().getLong(1), 4);
assertFalse(preparedStatement.getGeneratedKeys().next());
try(ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 1")) {
try (ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 1")) {
assertThat(rs.next(), is(true));
assertThat(rs.getInt(1), is(11));
assertThat(rs.next(), is(false));
}
try(ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 2")) {
try (ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 2")) {
assertThat(rs.next(), is(true));
assertThat(rs.getInt(1), is(12));
assertThat(rs.next(), is(false));
}
try(ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 3")) {
try (ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 3")) {
assertThat(rs.next(), is(true));
assertThat(rs.getInt(1), is(21));
assertThat(rs.next(), is(false));
}
try(ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 4")) {
try (ResultSet rs = queryStatement.executeQuery("SELECT `order_id` from `t_order` where `user_id` = 4")) {
assertThat(rs.next(), is(true));
assertThat(rs.getInt(1), is(22));
assertThat(rs.next(), is(false));
......
......@@ -53,7 +53,7 @@ import static org.mockito.Mockito.CALLS_REAL_METHODS;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
public class AbstractPreparedStatementAdapterTest {
public class ParameterizedAbstractPreparedStatementAdapterTest {
private final String methodName;
......@@ -67,8 +67,8 @@ public class AbstractPreparedStatementAdapterTest {
{"setNull", new Class[]{int.class, int.class}, new Object[] {1, Types.CHAR}},
{"setNull", new Class[]{int.class, int.class, String.class}, new Object[] {1, Types.CHAR, "USER_DEFINE"}},
{"setBoolean", new Class[]{int.class, boolean.class}, new Object[] {1, true}},
{"setByte", new Class[]{int.class, byte.class}, new Object[] {1, (byte)1}},
{"setShort", new Class[]{int.class, short.class}, new Object[] {1, (short)1}},
{"setByte", new Class[]{int.class, byte.class}, new Object[] {1, (byte) 1}},
{"setShort", new Class[]{int.class, short.class}, new Object[] {1, (short) 1}},
{"setInt", new Class[]{int.class, int.class}, new Object[] {1, 1}},
{"setLong", new Class[]{int.class, long.class}, new Object[] {1, 12121212332L}},
{"setFloat", new Class[]{int.class, float.class}, new Object[] {1, 1F}},
......@@ -132,6 +132,6 @@ public class AbstractPreparedStatementAdapterTest {
assertThat(method.getParameterTypes(), is(parameterClasses));
Field argumentsField = JdbcMethodInvocation.class.getDeclaredField("arguments");
argumentsField.setAccessible(true);
assertThat((Object[])argumentsField.get(invocation), is(parameters));
assertThat((Object[]) argumentsField.get(invocation), is(parameters));
}
}
\ No newline at end of file
}
......@@ -167,22 +167,12 @@ public final class StatementAdapterTest extends AbstractShardingDataBasesOnlyDBU
public ResultSet executeQuery(final String sql) throws SQLException {
return null;
}
@Override
public int executeUpdate(final String sql) throws SQLException {
return 0;
}
@Override
public boolean execute(final String sql) throws SQLException {
return false;
}
@Override
public ResultSet getResultSet() throws SQLException {
return null;
}
@Override
public int getResultSetConcurrency() throws SQLException {
return 0;
......@@ -198,6 +188,11 @@ public final class StatementAdapterTest extends AbstractShardingDataBasesOnlyDBU
return null;
}
@Override
public int executeUpdate(final String sql) throws SQLException {
return 0;
}
@Override
public int executeUpdate(final String sql, final int autoGeneratedKeys) throws SQLException {
return 0;
......@@ -213,6 +208,11 @@ public final class StatementAdapterTest extends AbstractShardingDataBasesOnlyDBU
return 0;
}
@Override
public boolean execute(final String sql) throws SQLException {
return false;
}
@Override
public boolean execute(final String sql, final int autoGeneratedKeys) throws SQLException {
return false;
......
......@@ -23,7 +23,7 @@ import org.junit.Test;
import java.sql.SQLFeatureNotSupportedException;
import java.util.HashMap;
public class AbstractUnsupportedGeneratedKeysResultSetTest {
public class UnsupportedGeneratedKeysResultSetTest {
@Test(expected = SQLFeatureNotSupportedException.class)
public void getBoolean() throws Exception {
......@@ -215,4 +215,4 @@ public class AbstractUnsupportedGeneratedKeysResultSetTest {
new GeneratedKeysResultSet().getSQLXML("");
}
}
\ No newline at end of file
}
......@@ -28,7 +28,7 @@ public class ParameterListTest {
@Test(expected = ShardingJdbcException.class)
public void recordMethodInvocation() throws Exception {
ParameterList list = new ParameterList(PreparedStatement.class);
list.recordMethodInvocation(1, "noThatMethod", null , null);
list.recordMethodInvocation(1, "noThatMethod", null, null);
}
}
\ No newline at end of file
}
......@@ -80,7 +80,7 @@ TableRule.builder("t_order_item").autoIncrementColumns("order_item_id", com.x.x.
## 时间位(41bit)
从2016年11月1日零点到现在的毫秒数
从2016年11月1日零点到现在的毫秒数,时间可以使用到2156年,满足大部分系统的要求。
## 工作进程位(10bit)
......
......@@ -44,7 +44,7 @@ import java.util.Date;
* 工作进程Id获取优先级: 系统变量{@code sjdbc.self.id.generator.worker.id} > 环境变量{@code SJDBC_SELF_ID_GENERATOR_WORKER_ID}
* ,另外可以调用@{@code CommonSelfIdGenerator.setWorkerId}进行设置
*
* @author gaohongtao.
* @author gaohongtao
*/
@Getter
@Slf4j
......
......@@ -47,7 +47,7 @@ public abstract class AbstractWorkerIdTest {
CommonSelfIdGenerator idGenerator = new CommonSelfIdGenerator();
idGenerator.initContext("order", "id");
assertThat((Long)idGenerator.generateId(), is(getWorkerId() << 12L));
assertThat((Long) idGenerator.generateId(), is(getWorkerId() << 12L));
assertThat(idGenerator.getTableName(), is("order"));
assertThat(idGenerator.getColumnName(), is("id"));
assertThat(idGenerator.getLastTime(), is(CommonSelfIdGenerator.SJDBC_EPOCH));
......
......@@ -25,7 +25,7 @@ import org.junit.runners.Suite;
ApiWorkerIdTest.class,
SystemPropertyWorkerIdTest.class,
SystemEnvWorkerIdTest.class,
CommonSelfIdGeneratorTest.class,
})
CommonSelfIdGeneratorTest.class
})
public class AllTest {
}
......@@ -19,7 +19,7 @@ package com.dangdang.ddframe.rdb.sharding.id.generator.self;
import org.junit.Before;
public class ApiWorkerIdTest extends AbstractWorkerIdTest{
public class ApiWorkerIdTest extends AbstractWorkerIdTest {
@Before
public void init() {
......
......@@ -63,7 +63,7 @@ public class CommonSelfIdGeneratorTest {
assertThat(maxId((1 << 12) - 1), is((1L << 12L) - 2));
assertThat(maxId(1 << 12), is((1L << 12L) - 1));
assertThat(maxId((1 << 12) + 1), is((1L << 12L) - 1));
assertThat(maxId((1 << 13)), is((1L << 12L) - 1));
assertThat(maxId(1 << 13), is((1L << 12L) - 1));
assertThat(maxId((1 << 13) + 1), is((1L << 12L) - 1));
}
......@@ -78,4 +78,4 @@ public class CommonSelfIdGeneratorTest {
}
return preId;
}
}
\ No newline at end of file
}
......@@ -21,14 +21,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
public class SystemEnvWorkerIdTest extends AbstractWorkerIdTest{
public class SystemEnvWorkerIdTest extends AbstractWorkerIdTest {
@Rule
public final EnvironmentVariables ENVIRONMENT_VARIABLES = new EnvironmentVariables();
public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
@Before
public void setup() {
ENVIRONMENT_VARIABLES.set("SJDBC_SELF_ID_GENERATOR_WORKER_ID", "13");
environmentVariables.set("SJDBC_SELF_ID_GENERATOR_WORKER_ID", "13");
super.setup();
}
......
......@@ -20,10 +20,10 @@ package com.dangdang.ddframe.rdb.sharding.id.generator.self;
import org.junit.Rule;
import org.junit.contrib.java.lang.system.ProvideSystemProperty;
public class SystemPropertyWorkerIdTest extends AbstractWorkerIdTest{
public class SystemPropertyWorkerIdTest extends AbstractWorkerIdTest {
@Rule
public final ProvideSystemProperty PROVIDE_SYSTEM_PROPERTY = new ProvideSystemProperty("sjdbc.self.id.generator.worker.id", "12");
public final ProvideSystemProperty provideSystemProperty = new ProvideSystemProperty("sjdbc.self.id.generator.worker.id", "12");
@Override
protected long getWorkerId() {
......
......@@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor;
import java.util.concurrent.atomic.AtomicInteger;
@RequiredArgsConstructor
public class FixClock extends AbstractClock{
public class FixClock extends AbstractClock {
private final int expectedInvokedTimes;
......
......@@ -51,7 +51,7 @@ public abstract class AbstractBestEffortsDeliveryJobFactory<T extends AbstractBe
jobScheduler.init();
}
protected abstract ZookeeperConfiguration createZookeeperConfiguration(final T config);
protected abstract ZookeeperConfiguration createZookeeperConfiguration(T config);
private JobConfiguration createBedJobConfiguration(final T bedJobConfig) {
JobConfiguration result = new JobConfiguration(bedJobConfig.getJobName(), NestedBestEffortsDeliveryJob.class, 1, bedJobConfig.getCron());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册