Refactor integrate test case packages.

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/base/AbstractSQLAssertTest.java

@@ -19,10 +19,10 @@ package com.dangdang.ddframe.rdb.common.sql.base;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlAssertData;
 import com.dangdang.ddframe.rdb.common.jaxb.SqlShardingRule;
-import com.dangdang.ddframe.rdb.common.sql.common.SQLAssertUtil;
+import com.dangdang.ddframe.rdb.common.util.SQLAssertUtil;
 import com.dangdang.ddframe.rdb.common.sql.common.ShardingTestStrategy;
-import com.dangdang.ddframe.rdb.integrate.util.DBUnitUtil;
-import com.dangdang.ddframe.rdb.integrate.util.DataBaseEnvironment;
+import com.dangdang.ddframe.rdb.common.util.DBUnitUtil;
+import com.dangdang.ddframe.rdb.common.util.DataBaseEnvironment;
 import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
 import com.dangdang.ddframe.rdb.sharding.constant.SQLType;
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.ShardingDataSource;
@@ -49,8 +49,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static com.dangdang.ddframe.rdb.integrate.util.SqlPlaceholderUtil.replacePreparedStatement;
-import static com.dangdang.ddframe.rdb.integrate.util.SqlPlaceholderUtil.replaceStatement;
+import static com.dangdang.ddframe.rdb.common.util.SqlPlaceholderUtil.replacePreparedStatement;
+import static com.dangdang.ddframe.rdb.common.util.SqlPlaceholderUtil.replaceStatement;
 import static org.dbunit.Assertion.assertEquals;
 
 public abstract class AbstractSQLAssertTest extends AbstractSQLTest {

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/base/AbstractSQLTest.java

@@ -18,8 +18,8 @@
 package com.dangdang.ddframe.rdb.common.sql.base;
 
 import com.dangdang.ddframe.rdb.common.sql.common.DatabaseTestMode;
-import com.dangdang.ddframe.rdb.integrate.util.DataBaseEnvironment;
-import com.dangdang.ddframe.rdb.integrate.util.ShardingJdbcDatabaseTester;
+import com.dangdang.ddframe.rdb.common.util.DataBaseEnvironment;
+import com.dangdang.ddframe.rdb.common.util.ShardingJdbcDatabaseTester;
 import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
 import org.apache.commons.dbcp.BasicDataSource;
 import org.dbunit.IDatabaseTester;
@@ -53,7 +53,7 @@ public abstract class AbstractSQLTest {
         createSchema();
     }
     
-    public static synchronized void createSchema() {
+    private static synchronized void createSchema() {
         if (!initialized) {
             for (DatabaseType each : CURRENT_TEST_MODE.databaseTypes()) {
                 if (DatabaseType.H2 == each) {

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/util/DBUnitUtil.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/util/DBUnitUtil.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.util;
+package com.dangdang.ddframe.rdb.common.util;
 
 import org.dbunit.DatabaseUnitException;
 import org.dbunit.database.DatabaseConnection;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/util/DataBaseEnvironment.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/util/DataBaseEnvironment.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.util;
+package com.dangdang.ddframe.rdb.common.util;
 
 import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
 import lombok.Getter;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/common/SQLAssertUtil.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/util/SQLAssertUtil.java

-package com.dangdang.ddframe.rdb.common.sql.common;
+package com.dangdang.ddframe.rdb.common.util;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlAssert;
 import com.dangdang.ddframe.rdb.common.jaxb.SqlAsserts;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/util/ShardingJdbcDatabaseTester.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/util/ShardingJdbcDatabaseTester.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.util;
+package com.dangdang.ddframe.rdb.common.util;
 
 import org.dbunit.JdbcDatabaseTester;
 import org.dbunit.database.DatabaseConfig;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/util/SqlPlaceholderUtil.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/util/SqlPlaceholderUtil.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.util;
+package com.dangdang.ddframe.rdb.common.util;
 
 public class SqlPlaceholderUtil {
     

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

@@ -17,12 +17,12 @@
 
 package com.dangdang.ddframe.rdb.integrate;
 
-import com.dangdang.ddframe.rdb.common.sql.strategy.NullableShardingTableOnlyTest;
-import com.dangdang.ddframe.rdb.common.sql.strategy.ShardingDatabaseAndTableDynamicTest;
-import com.dangdang.ddframe.rdb.common.sql.strategy.ShardingDatabaseAndTableTest;
-import com.dangdang.ddframe.rdb.common.sql.strategy.ShardingDatabaseOnlyTest;
-import com.dangdang.ddframe.rdb.common.sql.strategy.ShardingMasterSlaveTest;
-import com.dangdang.ddframe.rdb.common.sql.strategy.ShardingTableOnlyTest;
+import com.dangdang.ddframe.rdb.integrate.strategy.NullableShardingTableOnlyTest;
+import com.dangdang.ddframe.rdb.integrate.strategy.ShardingDatabaseAndTableDynamicTest;
+import com.dangdang.ddframe.rdb.integrate.strategy.ShardingDatabaseAndTableTest;
+import com.dangdang.ddframe.rdb.integrate.strategy.ShardingDatabaseOnlyTest;
+import com.dangdang.ddframe.rdb.integrate.strategy.ShardingMasterSlaveTest;
+import com.dangdang.ddframe.rdb.integrate.strategy.ShardingTableOnlyTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/strategy/NullableShardingTableOnlyTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/NullableShardingTableOnlyTest.java

@@ -15,11 +15,11 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.common.sql.strategy;
+package com.dangdang.ddframe.rdb.integrate.strategy;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlShardingRule;
 import com.dangdang.ddframe.rdb.common.sql.base.AbstractSQLAssertTest;
-import com.dangdang.ddframe.rdb.common.sql.common.SQLAssertUtil;
+import com.dangdang.ddframe.rdb.common.util.SQLAssertUtil;
 import com.dangdang.ddframe.rdb.common.sql.common.ShardingTestStrategy;
 import com.dangdang.ddframe.rdb.integrate.fixture.MultipleKeysModuloDatabaseShardingAlgorithm;
 import com.dangdang.ddframe.rdb.sharding.api.rule.BindingTableRule;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/strategy/ShardingDatabaseAndTableDynamicTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/ShardingDatabaseAndTableDynamicTest.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.common.sql.strategy;
+package com.dangdang.ddframe.rdb.integrate.strategy;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlShardingRule;
 import com.dangdang.ddframe.rdb.common.sql.base.AbstractSQLAssertTest;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/strategy/ShardingDatabaseAndTableTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/ShardingDatabaseAndTableTest.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.common.sql.strategy;
+package com.dangdang.ddframe.rdb.integrate.strategy;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlShardingRule;
 import com.dangdang.ddframe.rdb.common.sql.base.AbstractSQLAssertTest;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/strategy/ShardingDatabaseOnlyTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/ShardingDatabaseOnlyTest.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.common.sql.strategy;
+package com.dangdang.ddframe.rdb.integrate.strategy;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlShardingRule;
 import com.dangdang.ddframe.rdb.common.sql.base.AbstractSQLAssertTest;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/strategy/ShardingMasterSlaveTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/ShardingMasterSlaveTest.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.common.sql.strategy;
+package com.dangdang.ddframe.rdb.integrate.strategy;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlShardingRule;
 import com.dangdang.ddframe.rdb.common.sql.base.AbstractSQLAssertTest;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/sql/strategy/ShardingTableOnlyTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/ShardingTableOnlyTest.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.common.sql.strategy;
+package com.dangdang.ddframe.rdb.integrate.strategy;
 
 import com.dangdang.ddframe.rdb.common.jaxb.SqlShardingRule;
 import com.dangdang.ddframe.rdb.common.sql.base.AbstractSQLAssertTest;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/AbstractRoutingDatabaseOnlyTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/AbstractRoutingDatabaseOnlyTest.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.hint;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint;
 
 import com.dangdang.ddframe.rdb.integrate.fixture.NoneKeyModuloDatabaseShardingAlgorithm;
 import com.dangdang.ddframe.rdb.sharding.api.rule.DataSourceRule;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/AbstractShardingDatabaseOnlyHintDBUnitTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/AbstractShardingDatabaseOnlyHintDBUnitTest.java

@@ -15,13 +15,13 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.hint;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint;
 
 import com.dangdang.ddframe.rdb.common.sql.base.AbstractSQLTest;
 import com.dangdang.ddframe.rdb.integrate.fixture.MultipleKeysModuloDatabaseShardingAlgorithm;
-import com.dangdang.ddframe.rdb.integrate.hint.helper.DynamicShardingValueHelper;
-import com.dangdang.ddframe.rdb.integrate.util.DBUnitUtil;
-import com.dangdang.ddframe.rdb.integrate.util.DataBaseEnvironment;
+import com.dangdang.ddframe.rdb.integrate.strategy.hint.helper.DynamicShardingValueHelper;
+import com.dangdang.ddframe.rdb.common.util.DBUnitUtil;
+import com.dangdang.ddframe.rdb.common.util.DataBaseEnvironment;
 import com.dangdang.ddframe.rdb.sharding.api.rule.BindingTableRule;
 import com.dangdang.ddframe.rdb.sharding.api.rule.DataSourceRule;
 import com.dangdang.ddframe.rdb.sharding.api.rule.ShardingRule;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/AllHintDatabaseOnlyTests.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/AllHintDatabaseOnlyTests.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.hint;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/RoutingDatabaseOnlyWithHintForDMLTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/RoutingDatabaseOnlyWithHintForDMLTest.java

@@ -15,10 +15,10 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.hint;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint;
 
-import com.dangdang.ddframe.rdb.integrate.hint.helper.DynamicDatabaseShardingValueHelper;
-import com.dangdang.ddframe.rdb.integrate.hint.helper.DynamicShardingValueHelper;
+import com.dangdang.ddframe.rdb.integrate.strategy.hint.helper.DynamicDatabaseShardingValueHelper;
+import com.dangdang.ddframe.rdb.integrate.strategy.hint.helper.DynamicShardingValueHelper;
 import com.dangdang.ddframe.rdb.integrate.sql.DatabaseTestSQL;
 import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
 import com.dangdang.ddframe.rdb.sharding.constant.SQLType;
@@ -33,7 +33,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Map;
 
-import static com.dangdang.ddframe.rdb.integrate.util.SqlPlaceholderUtil.replacePreparedStatement;
+import static com.dangdang.ddframe.rdb.common.util.SqlPlaceholderUtil.replacePreparedStatement;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/RoutingDatabaseOnlyWithHintForSelectTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/RoutingDatabaseOnlyWithHintForSelectTest.java

@@ -15,9 +15,9 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.hint;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint;
 
-import com.dangdang.ddframe.rdb.integrate.hint.helper.DynamicDatabaseShardingValueHelper;
+import com.dangdang.ddframe.rdb.integrate.strategy.hint.helper.DynamicDatabaseShardingValueHelper;
 import com.dangdang.ddframe.rdb.integrate.sql.DatabaseTestSQL;
 import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.ShardingDataSource;
@@ -28,7 +28,7 @@ import org.junit.Test;
 import java.sql.SQLException;
 import java.util.Map;
 
-import static com.dangdang.ddframe.rdb.integrate.util.SqlPlaceholderUtil.replacePreparedStatement;
+import static com.dangdang.ddframe.rdb.common.util.SqlPlaceholderUtil.replacePreparedStatement;
 
 public class RoutingDatabaseOnlyWithHintForSelectTest extends AbstractRoutingDatabaseOnlyTest {
     

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/ShardingDatabaseOnlyWithHintForDMLTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/ShardingDatabaseOnlyWithHintForDMLTest.java

@@ -15,9 +15,9 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.hint;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint;
 
-import com.dangdang.ddframe.rdb.integrate.hint.helper.DynamicShardingValueHelper;
+import com.dangdang.ddframe.rdb.integrate.strategy.hint.helper.DynamicShardingValueHelper;
 import com.dangdang.ddframe.rdb.integrate.sql.DatabaseTestSQL;
 import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
 import com.dangdang.ddframe.rdb.sharding.constant.SQLType;
@@ -32,7 +32,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Map;
 
-import static com.dangdang.ddframe.rdb.integrate.util.SqlPlaceholderUtil.replacePreparedStatement;
+import static com.dangdang.ddframe.rdb.common.util.SqlPlaceholderUtil.replacePreparedStatement;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/ShardingDatabaseOnlyWithHintForSelectTest.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/ShardingDatabaseOnlyWithHintForSelectTest.java

@@ -15,9 +15,9 @@
  * </p>
  */
 
-package com.dangdang.ddframe.rdb.integrate.hint;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint;
 
-import com.dangdang.ddframe.rdb.integrate.hint.helper.DynamicShardingValueHelper;
+import com.dangdang.ddframe.rdb.integrate.strategy.hint.helper.DynamicShardingValueHelper;
 import com.dangdang.ddframe.rdb.integrate.sql.DatabaseTestSQL;
 import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
 import com.dangdang.ddframe.rdb.sharding.constant.ShardingOperator;
@@ -30,7 +30,7 @@ import org.junit.Test;
 import java.sql.SQLException;
 import java.util.Map;
 
-import static com.dangdang.ddframe.rdb.integrate.util.SqlPlaceholderUtil.replacePreparedStatement;
+import static com.dangdang.ddframe.rdb.common.util.SqlPlaceholderUtil.replacePreparedStatement;
 
 public final class ShardingDatabaseOnlyWithHintForSelectTest extends AbstractShardingDatabaseOnlyHintDBUnitTest {
     

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/helper/DynamicDatabaseShardingValueHelper.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/helper/DynamicDatabaseShardingValueHelper.java

-package com.dangdang.ddframe.rdb.integrate.hint.helper;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint.helper;
 
 public class DynamicDatabaseShardingValueHelper extends DynamicShardingValueHelper {
     

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/hint/helper/DynamicShardingValueHelper.java → sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/strategy/hint/helper/DynamicShardingValueHelper.java

-package com.dangdang.ddframe.rdb.integrate.hint.helper;
+package com.dangdang.ddframe.rdb.integrate.strategy.hint.helper;
 
 import com.dangdang.ddframe.rdb.sharding.api.HintManager;
 import com.dangdang.ddframe.rdb.sharding.constant.ShardingOperator;

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

@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.dangdang.ddframe.rdb.integrate.util.SqlPlaceholderUtil.replacePreparedStatement;
+import static com.dangdang.ddframe.rdb.common.util.SqlPlaceholderUtil.replacePreparedStatement;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;