You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/05/05 02:59:24 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2474](task 2) Java17 Test paas on swagger module (#2817)
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 73dd64120 [SCB-2474](task 2) Java17 Test paas on swagger module (#2817)
73dd64120 is described below
commit 73dd64120d8cc5c19511b4bbf8c0e47c9d2224b0
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Thu May 5 10:59:19 2022 +0800
[SCB-2474](task 2) Java17 Test paas on swagger module (#2817)
---
swagger/swagger-generator/generator-core/pom.xml | 5 +++++
.../swagger/generator/jaxrs/TestJaxrs.java | 15 ++++++++++++++-
.../swagger/generator/springmvc/TestSpringmvc.java | 9 ++++++++-
swagger/swagger-invocation/invocation-core/pom.xml | 7 ++++++-
.../swagger/engine/TestSwaggerProducerOperation.java | 17 ++++++++++-------
.../arguments/consumer/TestPojoOneArg.java | 20 ++++++++++----------
6 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/swagger/swagger-generator/generator-core/pom.xml b/swagger/swagger-generator/generator-core/pom.xml
index fee94f84f..f875bf222 100644
--- a/swagger/swagger-generator/generator-core/pom.xml
+++ b/swagger/swagger-generator/generator-core/pom.xml
@@ -69,6 +69,11 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-test-scaffolding</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java
index c487fed66..4084f8781 100644
--- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java
+++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java
@@ -19,7 +19,9 @@ package org.apache.servicecomb.swagger.generator.jaxrs;
import org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils;
import org.apache.servicecomb.swagger.generator.jaxrs.model.ConsumesAndProduces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
public class TestJaxrs {
@Test
@@ -49,6 +51,7 @@ public class TestJaxrs {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void testEcho() {
UnitTestSwaggerUtils.testSwagger("schemas/echo.yaml", Echo.class, "echo");
}
@@ -64,6 +67,7 @@ public class TestJaxrs {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void testQueryComplex() {
UnitTestSwaggerUtils.testException(
"generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:queryComplex.",
@@ -112,23 +116,27 @@ public class TestJaxrs {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void aggregatedParam() {
UnitTestSwaggerUtils.testSwagger("schemas/aggregatedParam.yaml", Echo.class, "aggregatedParam");
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void beanParamDefaultBody() {
UnitTestSwaggerUtils
.testSwagger("schemas/beanParamDefaultBody.yaml", Echo.class, "beanParamDefaultBody");
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void beanParamWithJsonIgnoredTagged() {
UnitTestSwaggerUtils
.testSwagger("schemas/beanParamWithJsonIgnoredTagged.yaml", Echo.class, "beanParamWithJsonIgnoredTagged");
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void beanParamWithPart() {
UnitTestSwaggerUtils.testSwagger("schemas/beanParamWithPart.yaml", Echo.class, "beanParamWithPart");
}
@@ -144,16 +152,19 @@ public class TestJaxrs {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void should_support_dynamic_enum() {
UnitTestSwaggerUtils.testSwagger("schemas/dynamicStatusEnum.yaml", Echo.class, "dynamicStatusEnum");
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void should_support_jdk_enum() {
UnitTestSwaggerUtils.testSwagger("schemas/jdkStatusEnum.yaml", Echo.class, "jdkStatusEnum");
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void beanParamComplexField() {
UnitTestSwaggerUtils.testException(
"generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:beanParamComplexField.",
@@ -164,6 +175,7 @@ public class TestJaxrs {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void beanParamComplexSetter() {
UnitTestSwaggerUtils.testException(
"generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:beanParamComplexSetter.",
@@ -174,6 +186,7 @@ public class TestJaxrs {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void beanParamInvalidDefaultBody() {
UnitTestSwaggerUtils.testException(
"generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:beanParamInvalidDefaultBody.",
diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java
index fe0054683..c83cd55fd 100644
--- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java
+++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java
@@ -22,7 +22,9 @@ import org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameter
import org.apache.servicecomb.swagger.generator.springmvc.model.SwaggerTestTarget;
import org.apache.servicecomb.swagger.generator.springmvc.model.SwaggerTestTarget_ValueOverWritePath;
import org.apache.servicecomb.swagger.generator.springmvc.model.TestProducer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
public class TestSpringmvc {
@Test
@@ -33,6 +35,7 @@ public class TestSpringmvc {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void testResponseEntity() {
UnitTestSwaggerUtils.testSwagger("schemas/responseEntity.yaml", MethodResponseEntity.class);
}
@@ -44,6 +47,7 @@ public class TestSpringmvc {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void testMixupAnnotations() {
UnitTestSwaggerUtils.testSwagger("schemas/mixupAnnotations.yaml", MethodMixupAnnotations.class);
}
@@ -172,11 +176,13 @@ public class TestSpringmvc {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void testObjectParam() {
UnitTestSwaggerUtils.testSwagger("schemas/testObjectParam.yaml", DefaultParameterSchema.class, "testObjectParam");
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void testMultiObjParamsWithSameFiledName() {
UnitTestSwaggerUtils.testException(
"generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema:testMultiObjParamsWithSameFiledName.",
@@ -186,6 +192,7 @@ public class TestSpringmvc {
}
@Test
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
public void testUnsupportedParamType() {
UnitTestSwaggerUtils.testException(
"generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema:testUnsupportedParamType.",
diff --git a/swagger/swagger-invocation/invocation-core/pom.xml b/swagger/swagger-invocation/invocation-core/pom.xml
index ccd29061c..d71298a8e 100644
--- a/swagger/swagger-invocation/invocation-core/pom.xml
+++ b/swagger/swagger-invocation/invocation-core/pom.xml
@@ -46,5 +46,10 @@
<artifactId>swagger-generator-springmvc</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerProducerOperation.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerProducerOperation.java
index e06fa94eb..eced9c576 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerProducerOperation.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/engine/TestSwaggerProducerOperation.java
@@ -18,8 +18,10 @@
package org.apache.servicecomb.swagger.engine;
import org.apache.servicecomb.swagger.invocation.models.PojoImpl;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
public class TestSwaggerProducerOperation {
private static final SwaggerEnvironment env = new SwaggerEnvironment();
@@ -27,17 +29,18 @@ public class TestSwaggerProducerOperation {
private static SwaggerProducer producer;
@Test
- public void testgetParameterType() {
+ @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11)
+ public void testGetParameterType() {
PojoImpl pojo = new PojoImpl();
producer = env.createProducer(pojo, null);
SwaggerProducerOperation swaggerProducerOperation = producer.findOperation("testBytes");
- Assert.assertEquals(1, swaggerProducerOperation.getSwaggerOperation().getOperation().getParameters().size());
- Assert.assertEquals(Object.class, swaggerProducerOperation.getSwaggerParameterType("bytes"));
+ Assertions.assertEquals(1, swaggerProducerOperation.getSwaggerOperation().getOperation().getParameters().size());
+ Assertions.assertEquals(Object.class, swaggerProducerOperation.getSwaggerParameterType("bytes"));
swaggerProducerOperation = producer.findOperation("testSimple");
- Assert.assertEquals(1, swaggerProducerOperation.getSwaggerOperation().getOperation().getParameters().size());
- Assert.assertEquals(Object.class, swaggerProducerOperation.getSwaggerParameterType(
+ Assertions.assertEquals(1, swaggerProducerOperation.getSwaggerOperation().getOperation().getParameters().size());
+ Assertions.assertEquals(Object.class, swaggerProducerOperation.getSwaggerParameterType(
swaggerProducerOperation.getSwaggerOperation().getOperation().getParameters().get(0).getName()));
}
}
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoOneArg.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoOneArg.java
index df926494f..a436c0dbb 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoOneArg.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/TestPojoOneArg.java
@@ -28,10 +28,10 @@ import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
import org.apache.servicecomb.swagger.invocation.arguments.ArgumentsMapper;
import org.apache.servicecomb.swagger.invocation.schemas.ConsumerOneArg;
import org.apache.servicecomb.swagger.invocation.schemas.PojoOneArg;
-import org.junit.Assert;
-import org.junit.Test;
import io.swagger.models.Swagger;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
@SuppressWarnings("unchecked")
public class TestPojoOneArg {
@@ -49,10 +49,10 @@ public class TestPojoOneArg {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("name");
- Assert.assertEquals(1, result.size());
- Assert.assertEquals("name", result.get("name"));
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertEquals("name", result.get("name"));
}
@Test
@@ -69,8 +69,8 @@ public class TestPojoOneArg {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
- Assert.assertSame(arguments.get("user"), result.get("user"));
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertSame(arguments.get("user"), result.get("user"));
}
@Test
@@ -87,9 +87,9 @@ public class TestPojoOneArg {
Map<String, Object> result = mapper.invocationArgumentToSwaggerArguments(invocation, arguments);
- Assert.assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
result = (Map<String, Object>) result.get("color");
- Assert.assertEquals(1, result.size());
- Assert.assertEquals(Color.BLUE, result.get("color"));
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertEquals(Color.BLUE, result.get("color"));
}
}