Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify MSSQL Server testcontainer setup for integration tests #25108

Merged
merged 3 commits into from
Feb 7, 2024
Merged

Simplify MSSQL Server testcontainer setup for integration tests #25108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
323dbe1
Explicitly accept MSSQL Server container license during setup
yhao3 Feb 6, 2024
1e6cd86
Remove unnecessary comments in test configuration file
yhao3 Feb 6, 2024
9a7632d
Update license acceptance to provide guidance without automatic accep…
yhao3 Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ring-data-relational/templates/src/test/java/_package_/config/MsSqlTestContainer.java.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ public class MsSqlTestContainer implements SqlTestContainer {
public void afterPropertiesSet() {
if (null == mSSQLServerContainer) {
mSSQLServerContainer = new MSSQLServerContainer<>("<%- dockerContainers.mssql %>")
// You are required to accept EULA license for SQL server containers
// Refer to https://java.testcontainers.org/modules/databases/mssqlserver/
//.acceptLicense()
.withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
.withLogConsumer(new Slf4jLogConsumer(log))
.withReuse(true);
Expand Down
5 changes: 0 additions & 5 deletions ...rs/spring-data-relational/templates/src/test/resources/config/application-testdev.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
# To activate this configuration launch integration tests with the 'testcontainers' profile
#
# More information on database containers: https://www.testcontainers.org/modules/databases/
<%_ if (devDatabaseTypeMssql) { _%>
#
# You are required to accept EULA license for SQL server containers.
# Follow the instructions at https://www.testcontainers.org/modules/databases/mssqlserver/
<%_ } _%>
<%_ if (devDatabaseTypeOracle) { _%>
#
# You have to specify an Oracle image name in a classpath file named testcontainers.properties.
Expand Down
Loading