From 1b9d1c07648bbb22327631818ded3219c75152de Mon Sep 17 00:00:00 2001 From: hutiefang76 <137664623+hutiefang76@users.noreply.github.com> Date: Wed, 21 Oct 2026 21:45:23 +0800 Subject: [PATCH] [AMORO-4459][OpenAPI] Migrate SDK tests to JUnit 5 --- amoro-openapi-sdk/pom.xml | 6 ------ .../org/apache/amoro/openapi/OpenAPITest.java | 21 ++++++++++--------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/amoro-openapi-sdk/pom.xml b/amoro-openapi-sdk/pom.xml index 49580d0d6b..336a5fb14c 100644 --- a/amoro-openapi-sdk/pom.xml +++ b/amoro-openapi-sdk/pom.xml @@ -115,12 +115,6 @@ - - junit - junit - test - - com.github.tomakehurst wiremock-jre8 diff --git a/amoro-openapi-sdk/src/test/java/org/apache/amoro/openapi/OpenAPITest.java b/amoro-openapi-sdk/src/test/java/org/apache/amoro/openapi/OpenAPITest.java index 1dd7cef166..45bceddbda 100644 --- a/amoro-openapi-sdk/src/test/java/org/apache/amoro/openapi/OpenAPITest.java +++ b/amoro-openapi-sdk/src/test/java/org/apache/amoro/openapi/OpenAPITest.java @@ -23,20 +23,22 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.github.tomakehurst.wiremock.WireMockServer; import org.apache.amoro.openapi.api.HealthApi; import org.apache.amoro.openapi.invoker.ApiClient; import org.apache.amoro.openapi.model.Response; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class OpenAPITest { private WireMockServer wireMockServer; private String basePath; - @Before + @BeforeEach public void setup() { wireMockServer = new WireMockServer(0); wireMockServer.start(); @@ -45,14 +47,13 @@ public void setup() { basePath = "http://localhost:" + port; } - @After + @AfterEach public void teardown() { wireMockServer.stop(); } @Test public void testSdkCall() throws Exception { - String json = "{\"message\":\"string\",\"code\":0,\"result\":{}}"; stubFor( get(urlEqualTo("/api/ams/v1/health/status")) .willReturn( @@ -63,9 +64,9 @@ public void testSdkCall() throws Exception { ApiClient apiClient = new ApiClient().setBasePath(basePath); HealthApi api = new HealthApi(apiClient); Response healthResponse = api.apiAmsV1HealthStatusGet(); - assert healthResponse.getCode() == 0; - assert healthResponse.getMessage().equals(""); - assert healthResponse.getResult() instanceof java.util.Map; - assert ((java.util.Map) healthResponse.getResult()).isEmpty(); + assertEquals(0, healthResponse.getCode()); + assertEquals("", healthResponse.getMessage()); + assertTrue(healthResponse.getResult() instanceof java.util.Map); + assertTrue(((java.util.Map) healthResponse.getResult()).isEmpty()); } }