From f0e30818309b7c96b7b4322ff2d019372c6f5539 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Tue, 10 May 2016 15:51:40 +0800 Subject: [PATCH] refactor test case --- .../rdb/sharding/jdbc/AllJDBCTests.java | 4 +- .../jdbc/adapter/ConnectionAdapterTest.java | 25 ++++++----- ...t.java => RowSetResultSetAdapterTest.java} | 2 +- .../jdbc/adapter/StatementAdapterTest.java | 1 + .../resources/integrate/schema/all_schema.sql | 43 +++++++++++++++++++ .../integrate/schema/nullable/nullable_1.sql | 1 - .../integrate/schema/nullable/nullable_2.sql | 1 - .../integrate/schema/nullable/nullable_3.sql | 1 - .../integrate/schema/nullable/nullable_4.sql | 1 - .../integrate/schema/nullable/nullable_5.sql | 1 - .../integrate/schema/nullable/nullable_6.sql | 1 - .../integrate/schema/nullable/nullable_7.sql | 1 - .../integrate/schema/nullable/nullable_8.sql | 1 - .../integrate/schema/nullable/nullable_9.sql | 1 - 14 files changed, 59 insertions(+), 25 deletions(-) rename sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/{AbstractRowSetResultSetAdapterTest.java => RowSetResultSetAdapterTest.java} (99%) diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/AllJDBCTests.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/AllJDBCTests.java index f961640b15afd..2ab1151fbdcab 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/AllJDBCTests.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/AllJDBCTests.java @@ -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; @@ -54,7 +54,7 @@ ResultSetGetterAdapterTest.class, ResultSetAdapterTest.class, JdbcMethodInvocationTest.class, - AbstractRowSetResultSetAdapterTest.class + RowSetResultSetAdapterTest.class }) public class AllJDBCTests { } diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/ConnectionAdapterTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/ConnectionAdapterTest.java index a3ed70ecfc02a..837306c5c3e4a 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/ConnectionAdapterTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/ConnectionAdapterTest.java @@ -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 { diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractRowSetResultSetAdapterTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/RowSetResultSetAdapterTest.java similarity index 99% rename from sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractRowSetResultSetAdapterTest.java rename to sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/RowSetResultSetAdapterTest.java index 40220488568b5..584cbf5590c5f 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractRowSetResultSetAdapterTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/RowSetResultSetAdapterTest.java @@ -43,7 +43,7 @@ @RunWith(Parameterized.class) @RequiredArgsConstructor -public class AbstractRowSetResultSetAdapterTest { +public final class RowSetResultSetAdapterTest { private final Object input; diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/StatementAdapterTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/StatementAdapterTest.java index da9508c4704c2..db78806b5f6b3 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/StatementAdapterTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/StatementAdapterTest.java @@ -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(); } diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/all_schema.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/all_schema.sql index 952d794a7bf47..9404fb846727e 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/all_schema.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/all_schema.sql @@ -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`)); diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_1.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_1.sql index 3579a79e68586..745782e11dd91 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_1.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_1.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_2.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_2.sql index e631ee21f4a05..9d16692b5e620 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_2.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_2.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_3.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_3.sql index 67c051a711033..ac8738a2a91fb 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_3.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_3.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_4.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_4.sql index cf917b69e6157..e01bf6e18ab62 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_4.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_4.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_5.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_5.sql index d5e4b18094a95..f7284ea613f75 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_5.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_5.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_6.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_6.sql index 9876e6490a4cc..213031a9aa674 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_6.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_6.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_7.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_7.sql index 7c1b7984613f0..8078f23182394 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_7.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_7.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_8.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_8.sql index 08828d9ae8ad1..fc4c291e9f1df 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_8.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_8.sql @@ -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`)); - diff --git a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_9.sql b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_9.sql index 92f9c9eba4d11..29d79dc1886df 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_9.sql +++ b/sharding-jdbc-core/src/test/resources/integrate/schema/nullable/nullable_9.sql @@ -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`)); -