Spring/spring-session
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update integration tests

Browse Source
This commit is contained in:
Vedran Pavic
2018-06-08 16:48:31 +02:00
parent a8c4f65903
commit f4704293a1
7 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle/dependency-management.gradle
View File

@@ -5,7 +5,7 @@ dependencyManagement {
mavenBom 'org.springframework:spring-framework-bom:5.0.6.RELEASE'
mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-SR7'
mavenBom 'org.springframework.security:spring-security-bom:5.0.5.RELEASE'
mavenBom 'org.testcontainers:testcontainers-bom:1.7.2'
mavenBom 'org.testcontainers:testcontainers-bom:1.7.3'
}
dependencies {
@@ -23,8 +23,8 @@ dependencyManagement {
dependency 'mysql:mysql-connector-java:8.0.11'
dependency 'org.apache.derby:derby:10.14.2.0'
dependency 'org.assertj:assertj-core:3.9.1'
dependency 'org.hsqldb:hsqldb:2.4.0'
dependency 'org.mariadb.jdbc:mariadb-java-client:2.2.3'
dependency 'org.hsqldb:hsqldb:2.4.1'
dependency 'org.mariadb.jdbc:mariadb-java-client:2.2.5'
dependency 'org.mockito:mockito-core:2.18.3'
dependency 'org.postgresql:postgresql:42.2.2'
}

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java
View File

@@ -86,7 +86,7 @@ public class MariaDb10JdbcOperationsSessionRepositoryITests
private static class MariaDb10Container extends MariaDBContainer<MariaDb10Container> {
MariaDb10Container() {
super("mariadb:10.2.14");
super("mariadb:10.3.7");
}
@Override

6
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.session.jdbc;
import javax.sql.DataSource;
import com.mysql.cj.jdbc.Driver;
import com.mysql.cj.jdbc.MysqlDataSource;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -94,6 +95,11 @@ public class MySql5JdbcOperationsSessionRepositoryITests
"--collation-server=utf8mb4_unicode_ci");
}
@Override
public String getDriverClassName() {
return Driver.class.getName();
}
}
}

11
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java
View File

@@ -18,10 +18,10 @@ package org.springframework.session.jdbc;
import javax.sql.DataSource;
import com.mysql.cj.jdbc.Driver;
import com.mysql.cj.jdbc.MysqlDataSource;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.testcontainers.containers.MySQLContainer;
@@ -39,7 +39,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
*
* @author Vedran Pavic
*/
@Ignore
@RunWith(SpringRunner.class)
@WebAppConfiguration
@ContextConfiguration
@@ -92,8 +91,12 @@ public class MySql8JdbcOperationsSessionRepositoryITests
@Override
protected void configure() {
super.configure();
setCommand("mysqld", "--character-set-server=utf8mb4",
"--collation-server=utf8mb4_unicode_ci");
setCommand("mysqld", "--default-authentication-plugin=mysql_native_password");
}
@Override
public String getDriverClassName() {
return Driver.class.getName();
}
}

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java
View File

@@ -86,7 +86,7 @@ public class PostgreSql10JdbcOperationsSessionRepositoryITests
extends PostgreSQLContainer<PostgreSql10Container> {
PostgreSql10Container() {
super("postgres:10.3");
super("postgres:10.4");
}
}

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java
View File

@@ -86,7 +86,7 @@ public class PostgreSql9JdbcOperationsSessionRepositoryITests
extends PostgreSQLContainer<PostgreSql9Container> {
PostgreSql9Container() {
super("postgres:9.6.8");
super("postgres:9.6.9");
}
}

7
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java
View File

@@ -88,7 +88,12 @@ public class SqlServerJdbcOperationsSessionRepositoryITests
extends MSSQLServerContainer<SqlServer2007Container> {
SqlServer2007Container() {
super("microsoft/mssql-server-linux:2017-CU6");
super("microsoft/mssql-server-linux:2017-CU7");
}
@Override
protected int getStartupTimeoutSeconds() {
return 240;
}
}