This is an automated email from the ASF dual-hosted git repository.
liubao 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 479879c4c [SCB-2475] migrate generator-core module to junit5 (#3425)
479879c4c is described below
commit 479879c4cf1fcbd870d1b78458509bfb6261156f
Author: TingTing Wang <[email protected]>
AuthorDate: Sat Oct 29 10:28:08 2022 +0800
[SCB-2475] migrate generator-core module to junit5 (#3425)
---
.../org/apache/servicecomb/swagger/TestSwaggerUtils.java | 8 +++++---
.../servicecomb/swagger/converter/ConverterMgrTest.java | 2 +-
.../extend/property/creator/TestPartPropertyCreator.java | 2 +-
.../swagger/generator/core/TestApiOperation.java | 6 +++---
.../swagger/generator/core/TestApiResponse.java | 6 +++---
.../servicecomb/swagger/generator/core/TestArrayType.java | 2 +-
.../servicecomb/swagger/generator/core/TestClassUtils.java | 2 +-
.../swagger/generator/core/TestInvalidType.java | 14 +++++++-------
.../swagger/generator/core/TestOperationGenerator.java | 6 +++---
.../swagger/generator/core/TestSwaggerDefinition.java | 2 +-
.../swagger/generator/core/TestSwaggerGenerator.java | 2 +-
.../swagger/generator/core/TestSwaggerUtils.java | 2 +-
.../generator/core/model/TestSwaggerOperations.java | 2 +-
.../processor/annotation/ApiOperationProcessorTest.java | 6 +++---
.../core/processor/annotation/ApiProcessorTest.java | 2 +-
.../annotation/SwaggerDefinitionProcessorTest.java | 2 +-
16 files changed, 34 insertions(+), 32 deletions(-)
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
index 3080c09c2..36f1b6686 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/TestSwaggerUtils.java
@@ -24,7 +24,6 @@ import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import
org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import io.swagger.models.Operation;
@@ -32,6 +31,7 @@ import io.swagger.models.Path;
import io.swagger.models.Response;
import io.swagger.models.Swagger;
import io.swagger.util.Yaml;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
@@ -158,11 +158,13 @@ public class TestSwaggerUtils {
Assertions.assertEquals("response of 200", response.getDescription());
}
- @Test(expected = ServiceCombException.class)
+ @Test
public void testInvalidate() {
URL resource = TestSwaggerUtils.class.getResource("/swagger1.yaml");
Swagger swagger = SwaggerUtils.parseSwagger(resource);
- SwaggerUtils.validateSwagger(swagger);
+ Assertions.assertThrows(ServiceCombException.class, () -> {
+ SwaggerUtils.validateSwagger(swagger);
+ });
}
@Test
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
index 889b20417..de1188544 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/converter/ConverterMgrTest.java
@@ -25,7 +25,6 @@ import java.util.Set;
import org.apache.servicecomb.foundation.test.scaffolding.model.Color;
import org.apache.servicecomb.foundation.test.scaffolding.model.User;
import org.apache.servicecomb.swagger.SwaggerUtils;
-import org.junit.Test;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -35,6 +34,7 @@ import io.swagger.models.Swagger;
import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.properties.ObjectProperty;
import io.swagger.models.properties.Property;
+import org.junit.jupiter.api.Test;
public class ConverterMgrTest {
static Swagger swagger = SwaggerUtils
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java
index a40d7d69b..d4058fdcb 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java
@@ -21,9 +21,9 @@ import javax.servlet.http.Part;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Test;
import io.swagger.models.properties.FileProperty;
+import org.junit.jupiter.api.Test;
public class TestPartPropertyCreator {
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
index 686a52f4c..b55cb6eb2 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestApiOperation.java
@@ -27,8 +27,6 @@ import org.apache.servicecomb.swagger.generator.SwaggerConst;
import
org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
-import org.junit.AfterClass;
-import org.junit.Test;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Extension;
@@ -42,12 +40,14 @@ import io.swagger.models.Path;
import io.swagger.models.Response;
import io.swagger.models.Scheme;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestApiOperation {
static SwaggerOperations swaggerOperations =
SwaggerOperations.generate(ApiOperationAnnotation.class);
- @AfterClass
+ @AfterAll
public static void teardown() {
swaggerOperations = null;
}
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 c83764320..237b73821 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
@@ -19,8 +19,6 @@ package org.apache.servicecomb.swagger.generator.core;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
-import org.junit.AfterClass;
-import org.junit.Test;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -28,12 +26,14 @@ import io.swagger.annotations.ResponseHeader;
import io.swagger.models.ModelImpl;
import io.swagger.models.Response;
import io.swagger.models.properties.Property;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestApiResponse {
static SwaggerOperations swaggerOperations =
SwaggerOperations.generate(ApiResponseAnnotation.class);
- @AfterClass
+ @AfterAll
public static void teardown() {
swaggerOperations = null;
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
index 92d2113a3..76b96d8f2 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
@@ -20,12 +20,12 @@ import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.core.schema.ArrayType;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
-import org.junit.Test;
import io.swagger.models.ModelImpl;
import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.properties.ByteArrayProperty;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestArrayType {
@Test
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
index b88738650..83b38039e 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
@@ -24,11 +24,11 @@ import javax.ws.rs.Path;
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.junit.Test;
import io.swagger.annotations.SwaggerDefinition;
import io.swagger.models.parameters.PathParameter;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
@SwaggerDefinition
public class TestClassUtils {
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestInvalidType.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestInvalidType.java
index fb65bdee9..ae76ca3d3 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestInvalidType.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestInvalidType.java
@@ -18,8 +18,8 @@ package org.apache.servicecomb.swagger.generator.core;
import org.apache.servicecomb.swagger.generator.core.schema.InvalidType;
import
org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class TestInvalidType {
@Test
@@ -42,7 +42,7 @@ public class TestInvalidType {
"testAbstractClass");
}
- @Ignore("need to discuss in JVA-422")
+ @Disabled("need to discuss in JVA-422")
@Test
public void testObject() {
UnitTestSwaggerUtils.testException(
@@ -52,7 +52,7 @@ public class TestInvalidType {
"testObject");
}
- @Ignore("need to discuss in JVA-422")
+ @Disabled("need to discuss in JVA-422")
@Test
public void testNotClearList() {
UnitTestSwaggerUtils.testException(
@@ -62,7 +62,7 @@ public class TestInvalidType {
"testNotClearList");
}
- @Ignore("need to discuss in JVA-422")
+ @Disabled("need to discuss in JVA-422")
@Test
public void testNotClearSet() {
UnitTestSwaggerUtils.testException(
@@ -72,7 +72,7 @@ public class TestInvalidType {
"testNotClearSet");
}
- @Ignore("need to discuss in JVA-422")
+ @Disabled("need to discuss in JVA-422")
@Test
public void testNotClearMap() {
UnitTestSwaggerUtils.testException(
@@ -82,7 +82,7 @@ public class TestInvalidType {
"testNotClearMap");
}
- @Ignore("need to discuss in JVA-422")
+ @Disabled("need to discuss in JVA-422")
@Test
public void testInvalidFieldClass() {
UnitTestSwaggerUtils.testException(
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 fa81441e3..553a9ffb2 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
@@ -24,8 +24,6 @@ import java.util.List;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
-import org.junit.AfterClass;
-import org.junit.Test;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,12 +32,14 @@ import io.swagger.annotations.Extension;
import io.swagger.annotations.ExtensionProperty;
import io.swagger.annotations.ResponseHeader;
import io.swagger.models.Response;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestOperationGenerator {
static SwaggerOperations swaggerOperations =
SwaggerOperations.generate(TestClass.class);
- @AfterClass
+ @AfterAll
public static void teardown() {
swaggerOperations = null;
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
index c4fa31010..26f2ec655 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerDefinition.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.junit.Test;
import io.swagger.annotations.Contact;
import io.swagger.annotations.Extension;
@@ -34,6 +33,7 @@ import io.swagger.annotations.SwaggerDefinition;
import io.swagger.annotations.Tag;
import io.swagger.models.Swagger;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestSwaggerDefinition {
@SwaggerDefinition(
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
index db67900e0..c204b7442 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
@@ -24,8 +24,8 @@ import
org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGenerator;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestSwaggerGenerator {
@BeforeClass
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
index 4d3d10497..44a9b1873 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
@@ -40,8 +40,8 @@ import
org.apache.servicecomb.swagger.generator.core.schema.RepeatOperation;
import org.apache.servicecomb.swagger.generator.core.schema.Schema;
import
org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils;
import org.hamcrest.MatcherAssert;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import io.swagger.models.Swagger;
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/model/TestSwaggerOperations.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/model/TestSwaggerOperations.java
index 9270f3474..b60476f68 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/model/TestSwaggerOperations.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/model/TestSwaggerOperations.java
@@ -17,10 +17,10 @@
package org.apache.servicecomb.swagger.generator.core.model;
import org.apache.servicecomb.swagger.SwaggerUtils;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Test;
public class TestSwaggerOperations {
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
index b2bde1c3a..7cd73657c 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
@@ -29,11 +29,11 @@ import
org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.AfterClass;
-import org.junit.Test;
import io.swagger.annotations.ApiOperation;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Map;
@@ -41,7 +41,7 @@ import java.util.Map;
public class ApiOperationProcessorTest {
static SwaggerOperations swaggerOperations =
SwaggerOperations.generate(TestClass.class);
- @AfterClass
+ @AfterAll
public static void teardown() {
swaggerOperations = null;
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
index dea6c6953..468c8eb1e 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
@@ -26,12 +26,12 @@ import
org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation;
import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperations;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Test;
import io.swagger.annotations.Api;
import io.swagger.annotations.SwaggerDefinition;
import io.swagger.models.Swagger;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class ApiProcessorTest {
@Api(tags = {"tag1", "tag2", "", "tag1"})
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
index 3cf949b40..e424865b6 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
@@ -25,7 +25,6 @@ import
org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import
org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
-import org.junit.Test;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiKeyAuthDefinition;
@@ -44,6 +43,7 @@ import io.swagger.annotations.SwaggerDefinition.Scheme;
import io.swagger.annotations.Tag;
import io.swagger.models.Swagger;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class SwaggerDefinitionProcessorTest {
@Api(consumes = MediaType.APPLICATION_XML, produces =
MediaType.APPLICATION_XML)
