Skip to content

Commit

Permalink
refactor test case
Browse files Browse the repository at this point in the history
  • Loading branch information
terrymanu committed May 10, 2016
1 parent 60ff7dd commit f0e3081
Show file tree
Hide file tree
Showing 14 changed files with 59 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package com.dangdang.ddframe.rdb.sharding.jdbc;

import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.AbstractRowSetResultSetAdapterTest;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.RowSetResultSetAdapterTest;
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.PreparedStatementAdapterTest;
Expand Down Expand Up @@ -54,7 +54,7 @@
ResultSetGetterAdapterTest.class,
ResultSetAdapterTest.class,
JdbcMethodInvocationTest.class,
AbstractRowSetResultSetAdapterTest.class
RowSetResultSetAdapterTest.class
})
public class AllJDBCTests {
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,23 @@

package com.dangdang.ddframe.rdb.sharding.jdbc.adapter;

import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import com.dangdang.ddframe.rdb.integrate.AbstractDBUnitTest;
import com.dangdang.ddframe.rdb.integrate.db.AbstractShardingDataBasesOnlyDBUnitTest;
import com.dangdang.ddframe.rdb.sharding.constants.DatabaseType;
import com.dangdang.ddframe.rdb.sharding.jdbc.ShardingConnection;
import com.dangdang.ddframe.rdb.sharding.jdbc.ShardingDataSource;
import org.junit.Before;
import org.junit.Test;

import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;

import org.junit.Before;
import org.junit.Test;

import com.dangdang.ddframe.rdb.integrate.AbstractDBUnitTest;
import com.dangdang.ddframe.rdb.integrate.db.AbstractShardingDataBasesOnlyDBUnitTest;
import com.dangdang.ddframe.rdb.sharding.constants.DatabaseType;
import com.dangdang.ddframe.rdb.sharding.jdbc.ShardingDataSource;
import com.dangdang.ddframe.rdb.sharding.jdbc.ShardingConnection;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

public final class ConnectionAdapterTest extends AbstractShardingDataBasesOnlyDBUnitTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

@RunWith(Parameterized.class)
@RequiredArgsConstructor
public class AbstractRowSetResultSetAdapterTest {
public final class RowSetResultSetAdapterTest {

private final Object input;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public final class StatementAdapterTest extends AbstractShardingDataBasesOnlyDBU
public void init() throws SQLException {
shardingDataSource = getShardingDataSource();
shardingConnection = shardingDataSource.getConnection();
shardingConnection.setReadOnly(false);
actual = shardingConnection.createStatement();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,46 @@ CREATE TABLE IF NOT EXISTS `db_single`.`t_order_item_7` (`item_id` INT NOT NULL,
CREATE TABLE IF NOT EXISTS `db_single`.`t_order_item_8` (`item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`item_id`));
CREATE TABLE IF NOT EXISTS `db_single`.`t_order_item_9` (`item_id` INT NOT NULL, `order_id` INT NOT NULL, `user_id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`item_id`));
CREATE TABLE IF NOT EXISTS `db_single`.`t_config` (`id` INT NOT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`id`));

/**
* nullable测试.
*/
CREATE SCHEMA IF NOT EXISTS `nullable_0`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_1`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_2`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_3`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_4`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_5`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_6`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_7`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_8`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

CREATE SCHEMA IF NOT EXISTS `nullable_9`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_1`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_2`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_3`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_4`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_5`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_6`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_7`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_8`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CREATE SCHEMA IF NOT EXISTS `nullable_9`;

CREATE TABLE IF NOT EXISTS `t_order` (`order_id` INT NOT NULL, `user_id` INT NULL, `status` VARCHAR(45) NULL, PRIMARY KEY (`order_id`));

0 comments on commit f0e3081

Please sign in to comment.