Skip to content

Commit 4a24a8b

Browse files
backpaper0backpaper0
committed
Changed to not use LocalServerPort
1 parent 50ebf7a commit 4a24a8b

File tree

3 files changed

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

3 files changed

+18
-23
lines changed

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

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

88
import org.junit.jupiter.api.Test;
9+
import org.springframework.beans.factory.annotation.Autowired;
910
import org.springframework.boot.test.context.SpringBootTest;
1011
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
1112
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-
private final TestRestTemplate restTemplate = new TestRestTemplate();
20+
@Autowired
21+
private TestRestTemplate restTemplate;
2122
private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
2223
};
23-
@LocalServerPort
24-
private int port;
2524

2625
@Test
2726
public void test() {
2827
LocalDate now = LocalDate.now();
2928
Message message1 = restTemplate.getForObject(
30-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
29+
UriComponentsBuilder.fromPath("/")
3130
.queryParam("text", "hello").build().toUri(),
3231
Message.class);
3332
assertEquals(1, message1.id);
3433
assertEquals("hello", message1.text);
3534
assertEquals(now, message1.createdAt);
3635
Message message2 = restTemplate.getForObject(
37-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
36+
UriComponentsBuilder.fromPath("/")
3837
.queryParam("text", "world").build().toUri(),
3938
Message.class);
4039
assertEquals(2, message2.id);
@@ -43,7 +42,7 @@ public void test() {
4342

4443
{
4544
List<Message> messages = restTemplate.exchange(
46-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
45+
UriComponentsBuilder.fromPath("/")
4746
.build().toUri(),
4847
HttpMethod.GET, HttpEntity.EMPTY,
4948
typedReference).getBody();
@@ -56,7 +55,7 @@ public void test() {
5655

5756
{
5857
List<Message> messages = restTemplate.exchange(
59-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
58+
UriComponentsBuilder.fromPath("/")
6059
.queryParam("page", "1").queryParam("size", "1").build()
6160
.toUri(),
6261
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: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,34 @@
66
import java.util.List;
77

88
import org.junit.jupiter.api.Test;
9+
import org.springframework.beans.factory.annotation.Autowired;
910
import org.springframework.boot.test.context.SpringBootTest;
1011
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
1112
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-
private final TestRestTemplate restTemplate = new TestRestTemplate();
20+
@Autowired
21+
private TestRestTemplate restTemplate;
2122
private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
2223
};
23-
@LocalServerPort
24-
private int port;
2524

2625
@Test
2726
public void test() {
2827
LocalDate now = LocalDate.now();
2928
Message message1 = restTemplate.getForObject(
30-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
29+
UriComponentsBuilder.fromPath("/")
3130
.queryParam("text", "hello").build().toUri(),
3231
Message.class);
3332
assertEquals(1, message1.id);
3433
assertEquals("hello", message1.text);
3534
assertEquals(now, message1.createdAt);
3635
Message message2 = restTemplate.getForObject(
37-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
36+
UriComponentsBuilder.fromPath("/")
3837
.queryParam("text", "world").build().toUri(),
3938
Message.class);
4039
assertEquals(2, message2.id);
@@ -43,7 +42,7 @@ public void test() {
4342

4443
{
4544
List<Message> messages = restTemplate.exchange(
46-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
45+
UriComponentsBuilder.fromPath("/")
4746
.build().toUri(),
4847
HttpMethod.GET, HttpEntity.EMPTY,
4948
typedReference).getBody();
@@ -56,7 +55,7 @@ public void test() {
5655

5756
{
5857
List<Message> messages = restTemplate.exchange(
59-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
58+
UriComponentsBuilder.fromPath("/")
6059
.queryParam("page", "1").queryParam("size", "1").build()
6160
.toUri(),
6261
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: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
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;
1312
import org.springframework.core.ParameterizedTypeReference;
1413
import org.springframework.http.HttpEntity;
1514
import org.springframework.http.HttpMethod;
@@ -21,27 +20,25 @@ public class ApplicationTest {
2120
private TestRestTemplate restTemplate;
2221
private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
2322
};
24-
@LocalServerPort
25-
private int port;
2623

2724
@Test
2825
public void test() {
2926
Message message1 = restTemplate.getForObject(
30-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
27+
UriComponentsBuilder.fromPath("/")
3128
.queryParam("text", "hello").build().toUri(),
3229
Message.class);
3330
assertEquals(1, message1.id);
3431
assertEquals("hello", message1.text);
3532
Message message2 = restTemplate.getForObject(
36-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
33+
UriComponentsBuilder.fromPath("/")
3734
.queryParam("text", "world").build().toUri(),
3835
Message.class);
3936
assertEquals(2, message2.id);
4037
assertEquals("world", message2.text);
4138

4239
{
4340
List<Message> messages = restTemplate.exchange(
44-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
41+
UriComponentsBuilder.fromPath("/")
4542
.build().toUri(),
4643
HttpMethod.GET, HttpEntity.EMPTY,
4744
typedReference).getBody();
@@ -54,7 +51,7 @@ public void test() {
5451

5552
{
5653
List<Message> messages = restTemplate.exchange(
57-
UriComponentsBuilder.fromUriString("http://localhost").port(port)
54+
UriComponentsBuilder.fromPath("/")
5855
.queryParam("page", "1").queryParam("size", "1").build()
5956
.toUri(),
6057
HttpMethod.GET, HttpEntity.EMPTY, typedReference)

0 commit comments

Comments
 (0)