Commit e2b01186 authored by terrymanu's avatar terrymanu
Browse files

For #647: move integrate yaml test case's schema to api package

parent a1e620ff

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

+3 −4
Original line number Diff line number Diff line
@@ -55,9 +55,8 @@ public abstract class AbstractYamlDataSourceTest { 
    }

    

    private static List<String> getSchemaFiles() {

        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");

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

                "integrate/api/schema/ms/db_slave_0.sql", "integrate/api/schema/ms/db_slave_1.sql", "integrate/api/schema/sharding_ms/db0_master.sql", 

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

    }

}

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

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 


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



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;

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

+1 −2
Original line number Diff line number Diff line
@@ -15,14 +15,13 @@ 
 * </p>

 */



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

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



import com.google.common.base.Function;

import com.google.common.collect.Maps;

import com.google.common.collect.Sets;

import io.shardingjdbc.core.api.ConfigMapContext;

import io.shardingjdbc.core.api.MasterSlaveDataSourceFactory;

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

import lombok.RequiredArgsConstructor;

import org.junit.Test;

import org.junit.runner.RunWith;

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

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

 */



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

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



import com.google.common.base.Function;

import com.google.common.collect.Maps;
@@ -24,7 +24,6 @@ import io.shardingjdbc.core.api.ConfigMapContext; 
import io.shardingjdbc.core.api.ShardingDataSourceFactory;

import io.shardingjdbc.core.constant.ShardingProperties;

import io.shardingjdbc.core.constant.ShardingPropertiesConstant;

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

import lombok.RequiredArgsConstructor;

import org.junit.Test;

import org.junit.runner.RunWith;

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

+1 −2
Original line number Diff line number Diff line
@@ -15,13 +15,12 @@ 
 * </p>

 */



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

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



import com.google.common.base.Function;

import com.google.common.collect.Maps;

import com.google.common.collect.Sets;

import io.shardingjdbc.core.api.ShardingDataSourceFactory;

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

import lombok.RequiredArgsConstructor;

import org.junit.Test;

import org.junit.runner.RunWith;