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

Updates to use TestSocketUtils from spring-cloud-test-support

Browse Source
This commit is contained in:
spencergibb
2022-03-09 12:42:20 -05:00
parent 474cb1365d
commit 68babb4bb1
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config-retry/pom.xml
View File

@@ -69,6 +69,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-test-support</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-server</artifactId>

14
config-retry/src/test/java/demo/ConfigClientRetryApplicationTests.java
View File

@@ -1,24 +1,22 @@
package demo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.lang.reflect.Method;
import java.util.Map;
import java.util.concurrent.Executors;
import apps.ConfigServer;
import org.aopalliance.intercept.MethodInterceptor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
import org.springframework.cloud.test.TestSocketUtils;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.retry.annotation.AnnotationAwareRetryOperationsInterceptor;
import org.springframework.retry.backoff.ExponentialBackOffPolicy;
@@ -27,9 +25,9 @@ import org.springframework.retry.support.RetryTemplate;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.util.SocketUtils;
import apps.ConfigServer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@RunWith(SpringRunner.class)
// Explicitly enable config client because test classpath has config server on it
@@ -45,7 +43,7 @@ public class ConfigClientRetryApplicationTests {
@BeforeClass
public static void delayConfigServer() {
int port = SocketUtils.findAvailableTcpPort();
int port = TestSocketUtils.findAvailableTcpPort();
System.setProperty("spring.cloud.config.uri", "http://localhost:" + port);
Executors.newSingleThreadExecutor().execute(new Runnable() {
@Override