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

Refactor tets.

Browse Source
This commit is contained in:
Olga MaciaszekSharma
2021-10-28 19:00:53 +02:00
parent a59b3f6031
commit e3fc8bd782
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformerTests.java
View File

@@ -32,29 +32,29 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Tests for XForwadededHeadersTransformer.
* Tests for {@link XForwardedHeadersTransformer}.
*
* @author Gandhimathi Velusamy
* @author Olga Maciaszek-Sharma
*/
class XForwardedHeadersTransformerTests {
private final LoadBalancerProperties.XForwarded xForwarded = new LoadBalancerProperties().getxForwarded();
private final ServiceInstance serviceInstance = mock(DefaultServiceInstance.class);
private final ServiceInstance serviceInstance = new DefaultServiceInstance("test1", "test", "test.org", 8080, false);
private final HttpRequest request = mock(HttpRequest.class);
@BeforeEach
void setUp() {
when(serviceInstance.getInstanceId()).thenReturn("test1");
when(request.getMethod()).thenReturn(HttpMethod.GET);
when(request.getURI()).thenReturn(create("https://google.com"));
when(request.getHeaders()).thenReturn(new HttpHeaders());
}
@Test
void shouldAppendXforwardHeaderIfEnabledXforward() throws NullPointerException {
void shouldAppendXForwardedHeadersIfEnabled() {
XForwardedHeadersTransformer transformer = new XForwardedHeadersTransformer(xForwarded);
xForwarded.setEnabled(true);
@@ -67,7 +67,7 @@ class XForwardedHeadersTransformerTests {
}
@Test
void shouldNotAppendXforwardedHeaderIfDefault() {
void shouldNotAppendXForwardedHeadersIfDefault() {
XForwardedHeadersTransformer transformer = new XForwardedHeadersTransformer(xForwarded);
HttpRequest newRequest = transformer.transformRequest(request, serviceInstance);
assertThat(newRequest.getHeaders()).doesNotContainKey("X-Forwarded-Host");

12
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformerTests.java
View File

@@ -33,29 +33,29 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Tests for XForwadedHeadersTransformer .
* Tests for {@link XForwardedHeadersTransformer}.
*
* @author Gandhimathi Velusamy
* @author Olga Maciaszek-Sharma
*/
class XForwardedHeadersTransformerTests {
private final LoadBalancerProperties.XForwarded xForwarded = new LoadBalancerProperties().getxForwarded();
private final ServiceInstance serviceInstance = mock(DefaultServiceInstance.class);
private final ServiceInstance serviceInstance = new DefaultServiceInstance("test1", "test", "test.org", 8080, false);
private final ClientRequest request = mock(ClientRequest.class);
@BeforeEach
void setUp() {
when(serviceInstance.getInstanceId()).thenReturn("test1");
when(request.method()).thenReturn(HttpMethod.GET);
when(request.url()).thenReturn(URI.create("https://spring.io"));
when(request.headers()).thenReturn(new HttpHeaders());
}
@Test
void shouldAppendXforwardedHeaderIfEnabledXforward() throws NullPointerException {
void shouldAppendXForwardedHeadersIfEnabled() {
xForwarded.setEnabled(true);
XForwardedHeadersTransformer transformer = new XForwardedHeadersTransformer(xForwarded);
@@ -68,9 +68,11 @@ class XForwardedHeadersTransformerTests {
}
@Test
void shouldNotAppendXforwardedHeaderIfDefault() {
void shouldNotAppendXForwardedHeadersIfDefault() {
XForwardedHeadersTransformer transformer = new XForwardedHeadersTransformer(xForwarded);
ClientRequest newRequest = transformer.transformRequest(request, serviceInstance);
assertThat(newRequest.headers()).doesNotContainKey("X-Forwarded-Host");
assertThat(newRequest.headers()).doesNotContainKey("X-Forwarded-Proto");
}