Skip to content

Commit c08efd8

Browse files
test: optimize trpc-spring-boot-starter test
* feat: optimize trpc-spring-boot-starter test
1 parent dbe0e5e commit c08efd8

12 files changed

Lines changed: 147 additions & 160 deletions

File tree

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/java/com/tencent/trpc/spring/boot/starters/annotation/DemoServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.tencent.trpc.spring.boot.starters.test.GreeterService;
1717
import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloRequest;
1818
import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloResponse;
19-
import javax.annotation.Resource;
19+
import jakarta.annotation.Resource;
2020
import org.springframework.beans.factory.annotation.Autowired;
2121
import org.springframework.beans.factory.annotation.Qualifier;
2222
import org.springframework.stereotype.Service;

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/java/com/tencent/trpc/spring/boot/starters/annotation/EnableAnnotationTest.java

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,16 @@
1818
import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloRequest;
1919
import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloResponse;
2020
import com.tencent.trpc.spring.boot.starters.test.SpringBootTestApplication;
21-
import javax.annotation.Resource;
22-
import org.junit.Assert;
23-
import org.junit.Test;
24-
import org.junit.runner.RunWith;
21+
import jakarta.annotation.Resource;
22+
import org.junit.jupiter.api.Assertions;
23+
import org.junit.jupiter.api.Test;
2524
import org.springframework.beans.factory.annotation.Autowired;
2625
import org.springframework.boot.test.context.SpringBootTest;
2726
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2827
import org.springframework.context.annotation.ComponentScan;
2928
import org.springframework.context.annotation.Configuration;
3029
import org.springframework.test.context.ContextConfiguration;
31-
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3230

33-
@RunWith(SpringJUnit4ClassRunner.class)
3431
@SpringBootTest(classes = SpringBootTestApplication.class, webEnvironment = WebEnvironment.NONE)
3532
@ContextConfiguration(classes = EnableAnnotationTestConfiguration.class)
3633
public class EnableAnnotationTest {
@@ -45,25 +42,25 @@ public void contextLoad() {
4542

4643
HelloResponse hello = demoService.sayHello(HelloRequest.newBuilder().setMessage("hello").build());
4744

48-
Assert.assertEquals("hello", hello.getMessage());
49-
Assert.assertNotNull(demoService.getGreeterService1Bean());
50-
Assert.assertNotNull(demoService.getGreeterService2Bean());
51-
Assert.assertNotNull(demoService.getMyTestServer());
52-
Assert.assertSame(demoService.getGreeterService(), demoService.getGreeterService1Bean());
53-
Assert.assertSame(demoService.getGreeterService2(), demoService.getGreeterService2Bean());
54-
Assert.assertSame(demoService.getMyTestServerClient(), demoService.getMyTestServer());
45+
Assertions.assertEquals("hello", hello.getMessage());
46+
Assertions.assertNotNull(demoService.getGreeterService1Bean());
47+
Assertions.assertNotNull(demoService.getGreeterService2Bean());
48+
Assertions.assertNotNull(demoService.getMyTestServer());
49+
Assertions.assertSame(demoService.getGreeterService(), demoService.getGreeterService1Bean());
50+
Assertions.assertSame(demoService.getGreeterService2(), demoService.getGreeterService2Bean());
51+
Assertions.assertSame(demoService.getMyTestServerClient(), demoService.getMyTestServer());
5552
}
5653

5754
@Test
5855
public void testFilterInject() {
5956
AutoInjectTestFilter filter = (AutoInjectTestFilter) FilterManager.get("auto_inject_test_filter");
60-
Assert.assertSame(filter, autoInjectTestFilter);
61-
Assert.assertNotNull(filter.getGreeterService());
62-
Assert.assertNotNull(filter.getGreeterService2());
63-
Assert.assertNotNull(filter.getMyTestServer());
64-
Assert.assertSame(filter.getGreeterService(), demoService.getGreeterService1Bean());
65-
Assert.assertSame(filter.getGreeterService2(), demoService.getGreeterService2Bean());
66-
Assert.assertSame(filter.getMyTestServer(), demoService.getMyTestServer());
57+
Assertions.assertSame(filter, autoInjectTestFilter);
58+
Assertions.assertNotNull(filter.getGreeterService());
59+
Assertions.assertNotNull(filter.getGreeterService2());
60+
Assertions.assertNotNull(filter.getMyTestServer());
61+
Assertions.assertSame(filter.getGreeterService(), demoService.getGreeterService1Bean());
62+
Assertions.assertSame(filter.getGreeterService2(), demoService.getGreeterService2Bean());
63+
Assertions.assertSame(filter.getMyTestServer(), demoService.getMyTestServer());
6764
}
6865

6966
@Configuration

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/java/com/tencent/trpc/spring/boot/starters/context/BindTest1.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
import com.tencent.trpc.spring.boot.starters.context.configuration.TRpcConfigurationProperties;
1515
import com.tencent.trpc.spring.boot.starters.test.SpringBootTestApplication;
1616
import java.util.List;
17-
import org.junit.Assert;
18-
import org.junit.Test;
19-
import org.junit.runner.RunWith;
17+
import org.junit.jupiter.api.Assertions;
18+
import org.junit.jupiter.api.Test;
2019
import org.springframework.beans.factory.annotation.Autowired;
2120
import org.springframework.boot.test.context.SpringBootTest;
2221
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2322
import org.springframework.test.context.ActiveProfiles;
24-
import org.springframework.test.context.junit4.SpringRunner;
2523

26-
@RunWith(SpringRunner.class)
2724
@SpringBootTest(classes = SpringBootTestApplication.class, webEnvironment = WebEnvironment.NONE)
2825
@ActiveProfiles("bind-test1")
2926
public class BindTest1 {
@@ -35,9 +32,9 @@ public class BindTest1 {
3532
@Test
3633
@SuppressWarnings("unchecked")
3734
public void test() {
38-
Assert.assertEquals(properties.getServer().getApp(), "TestApp");
35+
Assertions.assertEquals(properties.getServer().getApp(), "TestApp");
3936
List<Object> serviceList = (List<Object>) properties.getPlugins().getRegistry().get("polaris").get("service");
40-
Assert.assertNotNull(serviceList);
41-
Assert.assertEquals(serviceList.size(), 1);
37+
Assertions.assertNotNull(serviceList);
38+
Assertions.assertEquals(serviceList.size(), 1);
4239
}
4340
}

0 commit comments

Comments
 (0)