Skip to content

Commit 2474c6b

Browse files
authored
[#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
1 parent 4fa6f5c commit 2474c6b

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiResponse.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
2222
import org.junit.jupiter.api.AfterAll;
2323
import org.junit.jupiter.api.Assertions;
24+
import org.junit.jupiter.api.BeforeAll;
2425
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.TestInstance;
2527

2628
import io.swagger.v3.oas.annotations.headers.Header;
2729
import io.swagger.v3.oas.annotations.media.Content;
@@ -30,11 +32,18 @@
3032
import io.swagger.v3.oas.annotations.responses.ApiResponses;
3133
import jakarta.ws.rs.core.MediaType;
3234

35+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3336
public class TestApiResponse {
34-
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(ApiResponseAnnotation.class);
37+
38+
SwaggerOperations swaggerOperations;
39+
40+
@BeforeAll
41+
public void setUp() {
42+
swaggerOperations = SwaggerOperations.generate(ApiResponseAnnotation.class);
43+
}
3544

3645
@AfterAll
37-
public static void teardown() {
46+
public void tearDown() {
3847
swaggerOperations = null;
3948
}
4049

swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import org.hamcrest.MatcherAssert;
2828
import org.junit.jupiter.api.AfterAll;
2929
import org.junit.jupiter.api.Assertions;
30+
import org.junit.jupiter.api.BeforeAll;
3031
import org.junit.jupiter.api.Test;
32+
import org.junit.jupiter.api.TestInstance;
3133

3234
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
3335
import io.swagger.v3.oas.annotations.Operation;
@@ -39,11 +41,17 @@
3941
import io.swagger.v3.oas.annotations.responses.ApiResponse;
4042
import io.swagger.v3.oas.annotations.tags.Tag;
4143

44+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4245
public class TestOperationGenerator {
43-
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(TestClass.class);
46+
SwaggerOperations swaggerOperations;
47+
48+
@BeforeAll
49+
public void setUp() {
50+
swaggerOperations = SwaggerOperations.generate(TestClass.class);
51+
}
4452

4553
@AfterAll
46-
public static void teardown() {
54+
public void tearDown() {
4755
swaggerOperations = null;
4856
}
4957

swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
import org.hamcrest.Matchers;
2929
import org.junit.jupiter.api.AfterAll;
3030
import org.junit.jupiter.api.Assertions;
31+
import org.junit.jupiter.api.BeforeAll;
3132
import org.junit.jupiter.api.Test;
33+
import org.junit.jupiter.api.TestInstance;
3234

3335
import io.swagger.v3.oas.annotations.Operation;
3436
import io.swagger.v3.oas.annotations.media.Content;
@@ -41,11 +43,17 @@
4143
import jakarta.validation.constraints.NotNull;
4244
import jakarta.ws.rs.core.MediaType;
4345

46+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4447
public class OperationMethodAnnotationProcessorTest {
45-
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(TestClass.class);
48+
SwaggerOperations swaggerOperations;
49+
50+
@BeforeAll
51+
public void setUp() {
52+
swaggerOperations = SwaggerOperations.generate(TestClass.class);
53+
}
4654

4755
@AfterAll
48-
public static void teardown() {
56+
public void tearDown() {
4957
swaggerOperations = null;
5058
}
5159

0 commit comments

Comments
 (0)