Updated tests so that they use TestSocketUtils instead of SocketUtils

Temporarily disabled tests for remote partition sample until Spring Cloud Deployer Local is fixed
This commit is contained in:
Glenn Renfro
2022-03-09 16:49:18 -05:00
parent 300c767710
commit 270b24be8b
16 changed files with 97 additions and 55 deletions

View File

@@ -18,6 +18,7 @@
</parent>
<properties>
<test.cloud.support>4.0.0-SNAPSHOT</test.cloud.support>
<skipInstall>true</skipInstall>
</properties>
@@ -73,6 +74,12 @@
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-test-support</artifactId>
<version>${test.cloud.support}</version>
<scope>test</scope>
</dependency>
</dependencies>
<pluginRepositories>

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2020-2020 the original author or authors.
* Copyright 2020-2022 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.
@@ -34,12 +34,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.test.AssertFile;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.cloud.test.TestSocketUtils;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.util.SocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
@@ -63,7 +63,7 @@ public class BatchJobApplicationTests {
private static Server defaultServer;
static {
randomPort = SocketUtils.findAvailableTcpPort();
randomPort = TestSocketUtils.findAvailableTcpPort();
DATASOURCE_URL = "jdbc:h2:tcp://localhost:" + randomPort
+ "/mem:dataflow;DB_CLOSE_DELAY=-1;" + "DB_CLOSE_ON_EXIT=FALSE";
}