This is an automated email from the ASF dual-hosted git repository.
chenzhida pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 2474c6b26 [#5017] Fix `swagger/swagger-generator/generator-core` OD
tests (#5018)
2474c6b26 is described below
commit 2474c6b26b7a996b0dc90947d5d70a86a08e6025
Author: Peizhao Mei <[email protected]>
AuthorDate: Fri Dec 19 19:38:24 2025 -0600
[#5017] Fix `swagger/swagger-generator/generator-core` OD tests (#5018)
* Fix swagger generator core OD tests
* Refactor to use PER_CLASS lifecycle to improve CI performance
---
.../servicecomb/swagger/generator/core/TestApiResponse.java | 13 +++++++++++--
.../swagger/generator/core/TestOperationGenerator.java | 12 ++++++++++--
.../annotation/OperationMethodAnnotationProcessorTest.java | 12 ++++++++++--
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
index 58e1ebeb7..e39b3bbf8 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java
@@ -21,7 +21,9 @@ import
org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
import io.swagger.v3.oas.annotations.headers.Header;
import io.swagger.v3.oas.annotations.media.Content;
@@ -30,11 +32,18 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import jakarta.ws.rs.core.MediaType;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class TestApiResponse {
- static SwaggerOperations swaggerOperations =
SwaggerOperations.generate(ApiResponseAnnotation.class);
+
+ SwaggerOperations swaggerOperations;
+
+ @BeforeAll
+ public void setUp() {
+ swaggerOperations =
SwaggerOperations.generate(ApiResponseAnnotation.class);
+ }
@AfterAll
- public static void teardown() {
+ public void tearDown() {
swaggerOperations = null;
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
index f238e91ff..b46b9bb83 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
@@ -27,7 +27,9 @@ import
org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
import io.swagger.v3.oas.annotations.Operation;
@@ -39,11 +41,17 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class TestOperationGenerator {
- static SwaggerOperations swaggerOperations =
SwaggerOperations.generate(TestClass.class);
+ SwaggerOperations swaggerOperations;
+
+ @BeforeAll
+ public void setUp() {
+ swaggerOperations = SwaggerOperations.generate(TestClass.class);
+ }
@AfterAll
- public static void teardown() {
+ public void tearDown() {
swaggerOperations = null;
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
index e164a97ca..fdc3cea27 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
@@ -28,7 +28,9 @@ import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -41,11 +43,17 @@ import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.ws.rs.core.MediaType;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class OperationMethodAnnotationProcessorTest {
- static SwaggerOperations swaggerOperations =
SwaggerOperations.generate(TestClass.class);
+ SwaggerOperations swaggerOperations;
+
+ @BeforeAll
+ public void setUp() {
+ swaggerOperations = SwaggerOperations.generate(TestClass.class);
+ }
@AfterAll
- public static void teardown() {
+ public void tearDown() {
swaggerOperations = null;
}
