Commit d61283cb authored by haocao's avatar haocao
Browse files

Merge remote-tracking branch 'origin/2.0.0.M1' into 2.0.0.M1 

# Conflicts:
#	sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io.shardingjdbc.spring.boot/SpringBootMain.java
parents d327185d de59c4ec

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io.shardingjdbc.spring.boot/SpringBootMain.java

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
package io.shardingjdbc.spring.boot;



import org.springframework.boot.SpringApplication;

import org.springframework.boot.autoconfigure.SpringBootApplication;



@SpringBootApplication

public class SpringBootMain {

    

    public static void main(final String[] args) {

        SpringApplication.run(SpringBootMain.class, args);

    }

}

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io.shardingjdbc.spring.boot/type/SpringBootMasterSlaveTest.java

+3 −2
Original line number Diff line number Diff line 
package io.shardingjdbc.spring.boot.type;



import io.shardingjdbc.core.jdbc.core.datasource.MasterSlaveDataSource;

import io.shardingjdbc.spring.boot.SpringBootMain;

import org.apache.commons.dbcp.BasicDataSource;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -17,7 +17,8 @@ import static org.junit.Assert.assertThat; 
import static org.junit.Assert.assertTrue;



@RunWith(SpringJUnit4ClassRunner.class)

@SpringBootTest(classes = SpringBootMain.class)

@SpringBootTest(classes = SpringBootMasterSlaveTest.class)

@SpringBootApplication

@ActiveProfiles("masterslave")

public class SpringBootMasterSlaveTest {

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io.shardingjdbc.spring.boot/type/SpringBootShardingTest.java

+3 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ package io.shardingjdbc.spring.boot.type; 


import io.shardingjdbc.core.jdbc.core.ShardingContext;

import io.shardingjdbc.core.jdbc.core.datasource.ShardingDataSource;

import io.shardingjdbc.spring.boot.SpringBootMain;

import org.apache.commons.dbcp.BasicDataSource;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -19,7 +19,8 @@ import static org.junit.Assert.assertThat; 
import static org.junit.Assert.assertTrue;



@RunWith(SpringJUnit4ClassRunner.class)

@SpringBootTest(classes = SpringBootMain.class)

@SpringBootTest(classes = SpringBootShardingTest.class)

@SpringBootApplication

@ActiveProfiles("sharding")

public class SpringBootShardingTest {