Skip to content

Commit b9aa02b

Browse files
committed
Fix swagger generator core OD tests
1 parent bd5311a commit b9aa02b

File tree

3 files changed

+30
-12
lines changed

3 files changed

+30
-12
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
2121
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
22-
import org.junit.jupiter.api.AfterAll;
22+
import org.junit.jupiter.api.AfterEach;
2323
import org.junit.jupiter.api.Assertions;
24+
import org.junit.jupiter.api.BeforeEach;
2425
import org.junit.jupiter.api.Test;
2526

2627
import io.swagger.v3.oas.annotations.headers.Header;
@@ -31,10 +32,15 @@
3132
import jakarta.ws.rs.core.MediaType;
3233

3334
public class TestApiResponse {
34-
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(ApiResponseAnnotation.class);
35+
SwaggerOperations swaggerOperations;
3536

36-
@AfterAll
37-
public static void teardown() {
37+
@BeforeEach
38+
public void setUp() {
39+
swaggerOperations = SwaggerOperations.generate(ApiResponseAnnotation.class);
40+
}
41+
42+
@AfterEach
43+
public void tearDown() {
3844
swaggerOperations = null;
3945
}
4046

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
2626
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
2727
import org.hamcrest.MatcherAssert;
28-
import org.junit.jupiter.api.AfterAll;
28+
import org.junit.jupiter.api.AfterEach;
2929
import org.junit.jupiter.api.Assertions;
30+
import org.junit.jupiter.api.BeforeEach;
3031
import org.junit.jupiter.api.Test;
3132

3233
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
@@ -40,10 +41,15 @@
4041
import io.swagger.v3.oas.annotations.tags.Tag;
4142

4243
public class TestOperationGenerator {
43-
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(TestClass.class);
44+
SwaggerOperations swaggerOperations;
4445

45-
@AfterAll
46-
public static void teardown() {
46+
@BeforeEach
47+
public void setUp() {
48+
swaggerOperations = SwaggerOperations.generate(TestClass.class);
49+
}
50+
51+
@AfterEach
52+
public void tearDown() {
4753
swaggerOperations = null;
4854
}
4955

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
2727
import org.hamcrest.MatcherAssert;
2828
import org.hamcrest.Matchers;
29-
import org.junit.jupiter.api.AfterAll;
29+
import org.junit.jupiter.api.AfterEach;
3030
import org.junit.jupiter.api.Assertions;
31+
import org.junit.jupiter.api.BeforeEach;
3132
import org.junit.jupiter.api.Test;
3233

3334
import io.swagger.v3.oas.annotations.Operation;
@@ -42,10 +43,15 @@
4243
import jakarta.ws.rs.core.MediaType;
4344

4445
public class OperationMethodAnnotationProcessorTest {
45-
static SwaggerOperations swaggerOperations = SwaggerOperations.generate(TestClass.class);
46+
SwaggerOperations swaggerOperations;
4647

47-
@AfterAll
48-
public static void teardown() {
48+
@BeforeEach
49+
public void setUp() {
50+
swaggerOperations = SwaggerOperations.generate(TestClass.class);
51+
}
52+
53+
@AfterEach
54+
public void tearDown() {
4955
swaggerOperations = null;
5056
}
5157

0 commit comments

Comments
 (0)