Skip to content

Commit f4dce65

Browse files
committed
Fix compile error
1 parent 90eb735 commit f4dce65

File tree

3 files changed

+22
-30
lines changed

3 files changed

+22
-30
lines changed

doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.seasar.doma.message.Message;
2727
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
2828
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
29-
import org.springframework.boot.test.EnvironmentTestUtils;
29+
import org.springframework.boot.test.util.EnvironmentTestUtils;
3030
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
3131
import org.springframework.context.annotation.Bean;
3232
import org.springframework.context.annotation.Configuration;

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,26 @@
1515
*/
1616
package org.seasar.doma.boot;
1717

18+
import static org.hamcrest.CoreMatchers.*;
19+
import static org.junit.Assert.*;
20+
import java.time.LocalDate;
21+
import java.util.List;
1822
import org.junit.Test;
1923
import org.junit.runner.RunWith;
2024
import org.springframework.beans.factory.annotation.Value;
21-
import org.springframework.boot.test.SpringApplicationConfiguration;
22-
import org.springframework.boot.test.TestRestTemplate;
23-
import org.springframework.boot.test.WebIntegrationTest;
25+
import org.springframework.boot.test.context.SpringBootTest;
26+
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
27+
import org.springframework.boot.test.web.client.TestRestTemplate;
2428
import org.springframework.core.ParameterizedTypeReference;
2529
import org.springframework.http.HttpEntity;
2630
import org.springframework.http.HttpMethod;
27-
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
28-
import org.springframework.web.client.RestTemplate;
31+
import org.springframework.test.context.junit4.SpringRunner;
2932
import org.springframework.web.util.UriComponentsBuilder;
3033

31-
import java.time.LocalDate;
32-
import java.util.List;
33-
34-
import static org.hamcrest.CoreMatchers.is;
35-
import static org.junit.Assert.assertThat;
36-
37-
@RunWith(SpringJUnit4ClassRunner.class)
38-
@SpringApplicationConfiguration(classes = DomaBootSampleSimpleApplication.class)
39-
@WebIntegrationTest(randomPort = true)
34+
@RunWith(SpringRunner.class)
35+
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
4036
public class DomaBootSampleSimpleApplicationTest {
41-
RestTemplate restTemplate = new TestRestTemplate();
37+
TestRestTemplate restTemplate = new TestRestTemplate();
4238
ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
4339
};
4440
@Value("${local.server.port}")

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,25 @@
1515
*/
1616
package org.seasar.doma.boot;
1717

18+
import static org.hamcrest.CoreMatchers.*;
19+
import static org.junit.Assert.*;
20+
import java.util.List;
1821
import org.junit.Test;
1922
import org.junit.runner.RunWith;
2023
import org.springframework.beans.factory.annotation.Value;
21-
import org.springframework.boot.test.SpringApplicationConfiguration;
22-
import org.springframework.boot.test.TestRestTemplate;
23-
import org.springframework.boot.test.WebIntegrationTest;
24+
import org.springframework.boot.test.context.SpringBootTest;
25+
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
26+
import org.springframework.boot.test.web.client.TestRestTemplate;
2427
import org.springframework.core.ParameterizedTypeReference;
2528
import org.springframework.http.HttpEntity;
2629
import org.springframework.http.HttpMethod;
27-
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
28-
import org.springframework.web.client.RestTemplate;
30+
import org.springframework.test.context.junit4.SpringRunner;
2931
import org.springframework.web.util.UriComponentsBuilder;
3032

31-
import java.util.List;
32-
33-
import static org.hamcrest.CoreMatchers.is;
34-
import static org.junit.Assert.assertThat;
35-
36-
@RunWith(SpringJUnit4ClassRunner.class)
37-
@SpringApplicationConfiguration(classes = DomaBootSampleSimpleApplication.class)
38-
@WebIntegrationTest(randomPort = true)
33+
@RunWith(SpringRunner.class)
34+
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
3935
public class DomaBootSampleSimpleApplicationTest {
40-
RestTemplate restTemplate = new TestRestTemplate();
36+
TestRestTemplate restTemplate = new TestRestTemplate();
4137
ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
4238
};
4339
@Value("${local.server.port}")

0 commit comments

Comments
 (0)