SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Boot 1.4 SR1.

Browse Source 
Upgrade to 1.4.1.RELEASE. Migrate to SpringBootTest annotation usage.

Fixes gh-38.
This commit is contained in:
Mark Paluch
2016-09-21 21:29:23 +02:00
parent ff1540e71c
commit b95e8d90eb
16 changed files with 45 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java
View File

@@ -31,8 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -51,8 +50,8 @@ import com.datastax.driver.core.Session;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigCassandraTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.cassandra.enabled=true",
@SpringBootTest(classes = VaultConfigCassandraTests.TestApplication.class, properties = {
"spring.cloud.vault.cassandra.enabled=true",
"spring.cloud.vault.cassandra.role=readonly" })
public class VaultConfigCassandraTests {

8
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java
View File

@@ -31,8 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,9 +46,8 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigMySqlTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.mysql.enabled=true",
"spring.cloud.vault.mysql.role=readonly",
@SpringBootTest(classes = VaultConfigMySqlTests.TestApplication.class, properties = {
"spring.cloud.vault.mysql.enabled=true", "spring.cloud.vault.mysql.role=readonly",
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false" })
public class VaultConfigMySqlTests {

7
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java
View File

@@ -34,8 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -50,8 +49,8 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigPostgreSqlTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.postgresql.enabled=true",
@SpringBootTest(classes = VaultConfigPostgreSqlTests.TestApplication.class, properties = {
"spring.cloud.vault.postgresql.enabled=true",
"spring.cloud.vault.postgresql.role=readonly",
"spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?ssl=false" })
public class VaultConfigPostgreSqlTests {