Commit 07ca0f59 authored by haocao's avatar haocao
Browse files

Refactor sharding test cases 2th.

parent 5e722ebc

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/db/AbstractShardingDatabaseOnlyDBUnitTest.java

+3 −1
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ public abstract class AbstractShardingDatabaseOnlyDBUnitTest extends AbstractDBU 
    @AfterClass

    public static void clear() {

        isShutdown = true;

        if (null != shardingDataSource) {

            shardingDataSource.close();

        }

    }

}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/sql/AbstractDatabaseTestSQL.java

+29 −1
Original line number Diff line number Diff line
@@ -100,10 +100,18 @@ public abstract class AbstractDatabaseTestSQL implements DatabaseTestSQL { 
    private static final String SELECT_WITH_BINDING_TABLE_SQL =

            "SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id WHERE o.user_id IN (?, ?) AND o.order_id BETWEEN ? AND ?";

    

    private static final String SELECT_GROUP_BY_USER_ID_SQL = "SELECT user_id AS uid FROM t_order group by uid";

    private static final String SELECT_GROUP_BY_USER_ID_SQL = "SELECT user_id AS uid FROM t_order GROUP BY uid";

    

    private static final String SELECT_USER_ID_BY_STATUS_SQL = "SELECT user_id AS uid FROM t_order WHERE status = 'init'";

    

    private static final String SELECT_USER_ID_BY_IN_STATUS_SQL = "SELECT user_id AS uid FROM t_order WHERE status IN (? ,? ,? ,? ,?)";

    

    private static final String SELECT_USER_ID_BY_STATUS_ORDER_BY_USER_ID_SQL = "SELECT user_id AS uid FROM t_order WHERE status = 'init' ORDER BY user_id";

    

    private static final String SELECT_ALL_ORDER_SQL = "SELECT * FROM t_order";

    

    private static final String SELECT_USER_ID_WHERE_ORDER_ID_IN_SQL = "SELECT user_id AS uid FROM t_order WHERE order_id IN (%s, %s)";

    

    @Override

    public abstract String getSelectLimitWithBindingTableSql();
@@ -296,4 +304,24 @@ public abstract class AbstractDatabaseTestSQL implements DatabaseTestSQL { 
    public String getSelectUserIdByStatusSql() {

        return SELECT_USER_ID_BY_STATUS_SQL;

    }

    

    @Override

    public String getSelectUserIdByInStatusSql() {

        return SELECT_USER_ID_BY_IN_STATUS_SQL;

    }

    

    @Override

    public String getSelectUserIdByStatusOrderByUserIdSql() {

        return SELECT_USER_ID_BY_STATUS_ORDER_BY_USER_ID_SQL;

    }

    

    @Override

    public String getSelectAllOrderSql() {

        return SELECT_ALL_ORDER_SQL;

    }

    

    @Override

    public String getSelectUserIdWhereOrderIdInSql() {

        return SELECT_USER_ID_WHERE_ORDER_ID_IN_SQL;

    }

}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/sql/DatabaseTestSQL.java

+8 −0
Original line number Diff line number Diff line
@@ -96,4 +96,12 @@ public interface DatabaseTestSQL { 
    String getSelectGroupByUserIdSql();

    

    String getSelectUserIdByStatusSql();

    

    String getSelectUserIdByInStatusSql();

    

    String getSelectUserIdByStatusOrderByUserIdSql();

    

    String getSelectAllOrderSql();

    

    String getSelectUserIdWhereOrderIdInSql();

}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/sql/mysql/MySQLTestSQL.java

+29 −1
Original line number Diff line number Diff line
@@ -102,10 +102,18 @@ public final class MySQLTestSQL implements DatabaseTestSQL { 
    private static final String SELECT_WITH_BINDING_TABLE_SQL =

            "SELECT i.* FROM `t_order` o JOIN `t_order_item` i ON o.user_id = i.user_id AND o.order_id = i.order_id WHERE o.`user_id` IN (?, ?) AND o.`order_id` BETWEEN ? AND ?";

    

    private static final String SELECT_GROUP_BY_USER_ID_SQL = "SELECT user_id AS `uid` FROM `t_order` group by `uid`";

    private static final String SELECT_GROUP_BY_USER_ID_SQL = "SELECT user_id AS `uid` FROM `t_order` GROUP BY `uid`";

    

    private static final String SELECT_USER_ID_BY_STATUS_SQL = "SELECT user_id AS `uid` FROM `t_order` WHERE `status` = 'init'";

    

    private static final String SELECT_USER_ID_BY_IN_STATUS_SQL = "SELECT user_id AS `uid` FROM `t_order` WHERE `status` IN (? ,? ,? ,? ,?)";

    

    private static final String SELECT_USER_ID_BY_STATUS_ORDER_BY_USER_ID_SQL = "SELECT user_id AS `uid` FROM `t_order` WHERE `status` = 'init' ORDER BY `user_id`";

    

    private static final String SELECT_ALL_ORDER = "SELECT * FROM `t_order`";

    

    private static final String SELECT_USER_ID_WHERE_ORDER_ID_IN_SQL = "SELECT user_id AS `uid` FROM `t_order` WHERE `order_id` IN (%s, %s)";

    

    @Override

    public String getSelectCountAliasSql() {

        return SELECT_COUNT_ALIAS_SQL;
@@ -300,4 +308,24 @@ public final class MySQLTestSQL implements DatabaseTestSQL { 
    public String getSelectUserIdByStatusSql() {

        return SELECT_USER_ID_BY_STATUS_SQL;

    }

    

    @Override

    public String getSelectUserIdByInStatusSql() {

        return SELECT_USER_ID_BY_IN_STATUS_SQL;

    }

    

    @Override

    public String getSelectUserIdByStatusOrderByUserIdSql() {

        return SELECT_USER_ID_BY_STATUS_ORDER_BY_USER_ID_SQL;

    }

    

    @Override

    public String getSelectAllOrderSql() {

        return SELECT_ALL_ORDER;

    }

    

    @Override

    public String getSelectUserIdWhereOrderIdInSql() {

        return SELECT_USER_ID_WHERE_ORDER_ID_IN_SQL;

    }

}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/AllJDBCTests.java

+6 −35
Original line number Diff line number Diff line
@@ -17,46 +17,17 @@ 


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



import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.*;

import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.invocation.JdbcMethodInvocationTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.invocation.SetParameterMethodInvocationTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.connection.ShardingConnectionTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.MasterSlaveDataSourceTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.ShardingDataSourceTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.resultset.GeneratedKeysResultSetMetaDataTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.resultset.GeneratedKeysResultSetTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.statement.ShardingPreparedStatementTableOnlyTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.statement.ShardingPreparedStatementTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.statement.ShardingStatementTest;

import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.*;

import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.AllAdapterTests;

import com.dangdang.ddframe.rdb.sharding.jdbc.core.AllCoreTests;

import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.AllUnsupportedTests;

import org.junit.runner.RunWith;

import org.junit.runners.Suite;



@RunWith(Suite.class)

@Suite.SuiteClasses({

        UnsupportedOperationDataSourceTest.class, 

        UnsupportedOperationConnectionTest.class, 

        UnsupportedOperationStatementTest.class, 

        UnsupportedOperationPreparedStatementTest.class, 

        UnsupportedOperationResultSetTest.class, 

        UnsupportedUpdateOperationResultSetTest.class, 

        UnsupportedGeneratedKeysResultSetTest.class, 

        DataSourceAdapterTest.class, 

        ConnectionAdapterTest.class, 

        StatementAdapterTest.class, 

        PreparedStatementAdapterTest.class, 

        ResultSetAdapterTest.class, 

        ResultSetGetterAdapterTest.class,

        ShardingDataSourceTest.class, 

        MasterSlaveDataSourceTest.class, 

        ShardingConnectionTest.class, 

        ShardingStatementTest.class, 

        ShardingPreparedStatementTest.class, 

        ShardingPreparedStatementTableOnlyTest.class, 

        GeneratedKeysResultSetTest.class, 

        GeneratedKeysResultSetMetaDataTest.class, 

        JdbcMethodInvocationTest.class, 

        SetParameterMethodInvocationTest.class

        AllUnsupportedTests.class,

        AllAdapterTests.class,

        AllCoreTests.class

    })

public class AllJDBCTests {

}