Commit a1e620ff authored by terrymanu's avatar terrymanu
Browse files

For #647: move integrate yaml test case to integrate.api.yaml package

parent 5ebcbbd1

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/AllUnitTests.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import io.shardingjdbc.core.api.AllApiTests; 
import io.shardingjdbc.core.executor.AllExecutorTests;

import io.shardingjdbc.core.jdbc.AllJDBCTests;

import io.shardingjdbc.core.util.AllUtilTests;

import io.shardingjdbc.core.yaml.AllYamlTests;

import io.shardingjdbc.core.integrate.api.yaml.AllYamlTests;

import org.junit.runner.RunWith;

import org.junit.runners.Suite;

import org.junit.runners.Suite.SuiteClasses;

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/AllIntegrateTests.java

+15 −13
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


package io.shardingjdbc.core.integrate;



import io.shardingjdbc.core.integrate.api.AllAPIIntegrateTests;

import io.shardingjdbc.core.integrate.type.ms.MasterSlaveOnlyDMLAndDDLTest;

import io.shardingjdbc.core.integrate.type.ms.MasterSlaveOnlyDQLTest;

import io.shardingjdbc.core.integrate.type.sharding.NullableShardingTableOnlyDMLAndDDLTest;
@@ -48,7 +49,8 @@ import org.junit.runners.Suite.SuiteClasses; 
        ShardingDatabaseAndTableDMLAndDDLTest.class, 

        NullableShardingTableOnlyDQLTest.class, 

        NullableShardingTableOnlyDMLAndDDLTest.class, 

        AllHintDatabaseOnlyTests.class

        AllHintDatabaseOnlyTests.class, 

        AllAPIIntegrateTests.class

    })

public class AllIntegrateTests {

}

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/api/AllAPIIntegrateTests.java

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright 1999-2015 dangdang.com.

 * <p>

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * </p>

 */



package io.shardingjdbc.core.integrate.api;



import io.shardingjdbc.core.integrate.api.yaml.AllYamlTests;

import org.junit.runner.RunWith;

import org.junit.runners.Suite;



@RunWith(Suite.class)

@Suite.SuiteClasses(AllYamlTests.class)

public class AllAPIIntegrateTests {

}

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/yaml/AbstractYamlDataSourceTest.java→sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/api/yaml/AbstractYamlDataSourceTest.java

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingjdbc.core.yaml;

package io.shardingjdbc.core.integrate.api.yaml;



import org.apache.commons.dbcp2.BasicDataSource;

import org.h2.tools.RunScript;
@@ -55,9 +55,9 @@ public abstract class AbstractYamlDataSourceTest { 
    }

    

    private static List<String> getSchemaFiles() {

        return Arrays.asList("yaml/schema/sharding/db0.sql", "yaml/schema/sharding/db1.sql",

                "yaml/schema/ms/db_master.sql", "yaml/schema/ms/db_slave_0.sql", "yaml/schema/ms/db_slave_1.sql",

                "yaml/schema/sharding_ms/db0_master.sql", "yaml/schema/sharding_ms/db1_master.sql",

                "yaml/schema/sharding_ms/db0_slave.sql", "yaml/schema/sharding_ms/db1_slave.sql");

        return Arrays.asList("integrate/api/yaml/schema/sharding/db0.sql", "integrate/api/yaml/schema/sharding/db1.sql",

                "integrate/api/yaml/schema/ms/db_master.sql", "integrate/api/yaml/schema/ms/db_slave_0.sql", "integrate/api/yaml/schema/ms/db_slave_1.sql",

                "integrate/api/yaml/schema/sharding_ms/db0_master.sql", "integrate/api/yaml/schema/sharding_ms/db1_master.sql",

                "integrate/api/yaml/schema/sharding_ms/db0_slave.sql", "integrate/api/yaml/schema/sharding_ms/db1_slave.sql");

    }

}

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/yaml/AllYamlTests.java→sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/api/yaml/AllYamlTests.java

+4 −6
Original line number Diff line number Diff line
@@ -15,18 +15,16 @@ 
 * </p>

 */



package io.shardingjdbc.core.yaml;

package io.shardingjdbc.core.integrate.api.yaml;



import io.shardingjdbc.core.yaml.masterslave.YamlMasterSlaveIntegrateTest;

import io.shardingjdbc.core.yaml.sharding.YamlShardingIntegrateTest;

import io.shardingjdbc.core.yaml.sharding.YamlShardingWithMasterSlaveIntegrateTest;

import io.shardingjdbc.core.yaml.sharding.YamlShardingDataSourceTest;

import io.shardingjdbc.core.integrate.api.yaml.masterslave.YamlMasterSlaveIntegrateTest;

import io.shardingjdbc.core.integrate.api.yaml.sharding.YamlShardingIntegrateTest;

import io.shardingjdbc.core.integrate.api.yaml.sharding.YamlShardingWithMasterSlaveIntegrateTest;

import org.junit.runner.RunWith;

import org.junit.runners.Suite;



@RunWith(Suite.class)

@Suite.SuiteClasses({

        YamlShardingDataSourceTest.class,

        YamlShardingIntegrateTest.class,

        YamlMasterSlaveIntegrateTest.class,

        YamlShardingWithMasterSlaveIntegrateTest.class