Skip to content

Commit e999d84

Browse files
backpaper0backpaper0
committed
Revert "Changed to not use LocalServerPort"
This reverts commit 4a24a8b.
1 parent 4a24a8b commit e999d84

File tree

3 files changed

+23
-18
lines changed
  • doma-spring-boot-samples

3 files changed

+23
-18
lines changed

‎doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,35 @@
66
import java.util.List;
77

88
import org.junit.jupiter.api.Test;
9-
import org.springframework.beans.factory.annotation.Autowired;
109
import org.springframework.boot.test.context.SpringBootTest;
1110
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
1211
import org.springframework.boot.test.web.client.TestRestTemplate;
12+
import org.springframework.boot.web.server.LocalServerPort;
1313
import org.springframework.core.ParameterizedTypeReference;
1414
import org.springframework.http.HttpEntity;
1515
import org.springframework.http.HttpMethod;
1616
import org.springframework.web.util.UriComponentsBuilder;
1717

1818
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
1919
public class ApplicationTest {
20-
@Autowired
21-
private TestRestTemplate restTemplate;
20+
private final TestRestTemplate restTemplate = new TestRestTemplate();
2221
private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
2322
};
23+
@LocalServerPort
24+
private int port;
2425

2526
@Test
2627
public void test() {
2728
LocalDate now = LocalDate.now();
2829
Message message1 = restTemplate.getForObject(
29-
UriComponentsBuilder.fromPath("/")
30+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
3031
.queryParam("text", "hello").build().toUri(),
3132
Message.class);
3233
assertEquals(1, message1.id);
3334
assertEquals("hello", message1.text);
3435
assertEquals(now, message1.createdAt);
3536
Message message2 = restTemplate.getForObject(
36-
UriComponentsBuilder.fromPath("/")
37+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
3738
.queryParam("text", "world").build().toUri(),
3839
Message.class);
3940
assertEquals(2, message2.id);
@@ -42,7 +43,7 @@ public void test() {
4243

4344
{
4445
List<Message> messages = restTemplate.exchange(
45-
UriComponentsBuilder.fromPath("/")
46+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
4647
.build().toUri(),
4748
HttpMethod.GET, HttpEntity.EMPTY,
4849
typedReference).getBody();
@@ -55,7 +56,7 @@ public void test() {
5556

5657
{
5758
List<Message> messages = restTemplate.exchange(
58-
UriComponentsBuilder.fromPath("/")
59+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
5960
.queryParam("page", "1").queryParam("size", "1").build()
6061
.toUri(),
6162
HttpMethod.GET, HttpEntity.EMPTY, typedReference)

‎doma-spring-boot-samples/doma-spring-boot-sample-event-handler/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,35 @@
66
import java.util.List;
77

88
import org.junit.jupiter.api.Test;
9-
import org.springframework.beans.factory.annotation.Autowired;
109
import org.springframework.boot.test.context.SpringBootTest;
1110
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
1211
import org.springframework.boot.test.web.client.TestRestTemplate;
12+
import org.springframework.boot.web.server.LocalServerPort;
1313
import org.springframework.core.ParameterizedTypeReference;
1414
import org.springframework.http.HttpEntity;
1515
import org.springframework.http.HttpMethod;
1616
import org.springframework.web.util.UriComponentsBuilder;
1717

1818
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
1919
public class ApplicationTest {
20-
@Autowired
21-
private TestRestTemplate restTemplate;
20+
private final TestRestTemplate restTemplate = new TestRestTemplate();
2221
private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
2322
};
23+
@LocalServerPort
24+
private int port;
2425

2526
@Test
2627
public void test() {
2728
LocalDate now = LocalDate.now();
2829
Message message1 = restTemplate.getForObject(
29-
UriComponentsBuilder.fromPath("/")
30+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
3031
.queryParam("text", "hello").build().toUri(),
3132
Message.class);
3233
assertEquals(1, message1.id);
3334
assertEquals("hello", message1.text);
3435
assertEquals(now, message1.createdAt);
3536
Message message2 = restTemplate.getForObject(
36-
UriComponentsBuilder.fromPath("/")
37+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
3738
.queryParam("text", "world").build().toUri(),
3839
Message.class);
3940
assertEquals(2, message2.id);
@@ -42,7 +43,7 @@ public void test() {
4243

4344
{
4445
List<Message> messages = restTemplate.exchange(
45-
UriComponentsBuilder.fromPath("/")
46+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
4647
.build().toUri(),
4748
HttpMethod.GET, HttpEntity.EMPTY,
4849
typedReference).getBody();
@@ -55,7 +56,7 @@ public void test() {
5556

5657
{
5758
List<Message> messages = restTemplate.exchange(
58-
UriComponentsBuilder.fromPath("/")
59+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
5960
.queryParam("page", "1").queryParam("size", "1").build()
6061
.toUri(),
6162
HttpMethod.GET, HttpEntity.EMPTY, typedReference)

‎doma-spring-boot-samples/doma-spring-boot-sample-simple/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.springframework.boot.test.context.SpringBootTest;
1010
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
1111
import org.springframework.boot.test.web.client.TestRestTemplate;
12+
import org.springframework.boot.web.server.LocalServerPort;
1213
import org.springframework.core.ParameterizedTypeReference;
1314
import org.springframework.http.HttpEntity;
1415
import org.springframework.http.HttpMethod;
@@ -20,25 +21,27 @@ public class ApplicationTest {
2021
private TestRestTemplate restTemplate;
2122
private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
2223
};
24+
@LocalServerPort
25+
private int port;
2326

2427
@Test
2528
public void test() {
2629
Message message1 = restTemplate.getForObject(
27-
UriComponentsBuilder.fromPath("/")
30+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
2831
.queryParam("text", "hello").build().toUri(),
2932
Message.class);
3033
assertEquals(1, message1.id);
3134
assertEquals("hello", message1.text);
3235
Message message2 = restTemplate.getForObject(
33-
UriComponentsBuilder.fromPath("/")
36+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
3437
.queryParam("text", "world").build().toUri(),
3538
Message.class);
3639
assertEquals(2, message2.id);
3740
assertEquals("world", message2.text);
3841

3942
{
4043
List<Message> messages = restTemplate.exchange(
41-
UriComponentsBuilder.fromPath("/")
44+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
4245
.build().toUri(),
4346
HttpMethod.GET, HttpEntity.EMPTY,
4447
typedReference).getBody();
@@ -51,7 +54,7 @@ public void test() {
5154

5255
{
5356
List<Message> messages = restTemplate.exchange(
54-
UriComponentsBuilder.fromPath("/")
57+
UriComponentsBuilder.fromUriString("http://localhost").port(port)
5558
.queryParam("page", "1").queryParam("size", "1").build()
5659
.toUri(),
5760
HttpMethod.GET, HttpEntity.EMPTY, typedReference)

0 commit comments

Comments
 (0)