From 11ad1db6e78ea937a7b02073b05986e31845c1a8 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Thu, 1 Nov 2018 17:50:35 +0100
Subject: [PATCH] Update integration tests

---
 .../session/jdbc/DatabaseContainers.java      | 21 +++++--
 ...JdbcOperationsSessionRepositoryITests.java | 58 +++++++++++++++++++
 .../container-license-acceptance.txt          |  2 +-
 3 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql11JdbcOperationsSessionRepositoryITests.java

diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java
index c62fba8a..7c66f205 100644
--- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java
+++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java
@@ -61,6 +61,10 @@ final class DatabaseContainers {
 		return new PostgreSql10Container();
 	}
 
+	static PostgreSQLContainer postgreSql11() {
+		return new PostgreSql11Container();
+	}
+
 	static MSSQLServerContainer sqlServer2017() {
 		return new SqlServer2017Container();
 	}
@@ -68,7 +72,7 @@ final class DatabaseContainers {
 	private static class MariaDb5Container extends MariaDBContainer<MariaDb5Container> {
 
 		MariaDb5Container() {
-			super("mariadb:5.5.61");
+			super("mariadb:5.5.62");
 		}
 
 		@Override
@@ -99,7 +103,7 @@ final class DatabaseContainers {
 	private static class MySql5Container extends MySQLContainer<MySql5Container> {
 
 		MySql5Container() {
-			super("mysql:5.7.23");
+			super("mysql:5.7.24");
 		}
 
 		@Override
@@ -119,7 +123,7 @@ final class DatabaseContainers {
 	private static class MySql8Container extends MySQLContainer<MySql8Container> {
 
 		MySql8Container() {
-			super("mysql:8.0.12");
+			super("mysql:8.0.13");
 		}
 
 		@Override
@@ -153,11 +157,20 @@ final class DatabaseContainers {
 
 	}
 
+	private static class PostgreSql11Container
+			extends PostgreSQLContainer<PostgreSql11Container> {
+
+		PostgreSql11Container() {
+			super("postgres:11.0");
+		}
+
+	}
+
 	private static class SqlServer2017Container
 			extends MSSQLServerContainer<SqlServer2017Container> {
 
 		SqlServer2017Container() {
-			super("microsoft/mssql-server-linux:2017-CU11");
+			super("mcr.microsoft.com/mssql/server:2017-CU12");
 		}
 
 		@Override
diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql11JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql11JdbcOperationsSessionRepositoryITests.java
new file mode 100644
index 00000000..99172865
--- /dev/null
+++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql11JdbcOperationsSessionRepositoryITests.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.springframework.session.jdbc;
+
+import org.junit.runner.RunWith;
+import org.testcontainers.containers.PostgreSQLContainer;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+/**
+ * Integration tests for {@link JdbcOperationsSessionRepository} using PostgreSQL 11.x
+ * database.
+ *
+ * @author Vedran Pavic
+ */
+@RunWith(SpringRunner.class)
+@WebAppConfiguration
+@ContextConfiguration
+public class PostgreSql11JdbcOperationsSessionRepositoryITests
+		extends AbstractContainerJdbcOperationsSessionRepositoryITests {
+
+	@Configuration
+	static class Config extends BaseContainerConfig {
+
+		@Bean
+		public PostgreSQLContainer databaseContainer() {
+			PostgreSQLContainer databaseContainer = DatabaseContainers.postgreSql11();
+			databaseContainer.start();
+			return databaseContainer;
+		}
+
+		@Bean
+		public ResourceDatabasePopulator databasePopulator() {
+			return DatabasePopulators.postgreSql();
+		}
+
+	}
+
+}
diff --git a/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt b/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt
index 7e2f658a..8a704b9c 100644
--- a/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt
+++ b/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt
@@ -1 +1 @@
-microsoft/mssql-server-linux:2017-CU11
+mcr.microsoft.com/mssql/server:2017-CU12