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/03/30 03:18:54 UTC
[servicecomb-java-chassis] branch master updated: move test case main class to make it more easier to find (#2758)
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 e7efae3 move test case main class to make it more easier to find (#2758)
e7efae3 is described below
commit e7efae38ecf4530327caeb4d7c9c1d5c4d3bc8be
Author: liubao68 <bi...@qq.com>
AuthorDate: Wed Mar 30 11:18:47 2022 +0800
move test case main class to make it more easier to find (#2758)
---
demo/demo-jaxrs/jaxrs-client/pom.xml | 2 +-
.../apache/servicecomb/demo/jaxrs/{client => }/JaxrsClient.java | 3 ++-
.../apache/servicecomb/demo/jaxrs/client/TestCodeFirstJaxrs.java | 7 +++++++
.../src/test/java/org/apache/servicecomb/demo/jaxrs/JaxrsIT.java | 1 -
demo/demo-jaxrs/jaxrs-server/pom.xml | 2 +-
.../apache/servicecomb/demo/jaxrs/{server => }/JaxrsServer.java | 2 +-
.../org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java | 7 +++++++
.../apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java | 2 +-
8 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/demo/demo-jaxrs/jaxrs-client/pom.xml b/demo/demo-jaxrs/jaxrs-client/pom.xml
index f87ca0f..ea6d2b8 100644
--- a/demo/demo-jaxrs/jaxrs-client/pom.xml
+++ b/demo/demo-jaxrs/jaxrs-client/pom.xml
@@ -55,7 +55,7 @@
</dependencies>
<properties>
- <demo.main>org.apache.servicecomb.demo.jaxrs.client.JaxrsClient</demo.main>
+ <demo.main>org.apache.servicecomb.demo.jaxrs.JaxrsClient</demo.main>
</properties>
<build>
<plugins>
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java
similarity index 99%
rename from demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java
rename to demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java
index 36f63c0..93e086c 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.jaxrs.client;
+package org.apache.servicecomb.demo.jaxrs;
import java.util.HashMap;
import java.util.Map;
@@ -32,6 +32,7 @@ import org.apache.servicecomb.demo.RestObjectMapperWithStringMapper;
import org.apache.servicecomb.demo.RestObjectMapperWithStringMapperNotWriteNull;
import org.apache.servicecomb.demo.TestMgr;
import org.apache.servicecomb.demo.compute.Person;
+import org.apache.servicecomb.demo.jaxrs.client.CodeFirstRestTemplateJaxrs;
import org.apache.servicecomb.demo.jaxrs.client.pojoDefault.DefaultModelServiceClient;
import org.apache.servicecomb.demo.jaxrs.client.validation.ValidationServiceClient;
import org.apache.servicecomb.demo.validator.Student;
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestCodeFirstJaxrs.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestCodeFirstJaxrs.java
index 5c1e15a..66d0729 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestCodeFirstJaxrs.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestCodeFirstJaxrs.java
@@ -47,6 +47,7 @@ public class TestCodeFirstJaxrs implements CategorizedTestCase {
@Override
public void testAllTransport() throws Exception {
testCodeFirstJaxrs();
+ testResponseLong();
}
@Override
@@ -62,6 +63,12 @@ public class TestCodeFirstJaxrs implements CategorizedTestCase {
TestMgr.check(file.exists(), false);
}
+ private void testResponseLong() {
+ Object result = InvokerUtils.syncInvoke(SERVICE_NAME, SCHEMA_ID, "responseLong", null,
+ Object.class);
+ TestMgr.check(result, Long.MAX_VALUE);
+ }
+
// invoke CodeFirstJaxrs
private void testCodeFirstJaxrs() {
Map<String, Object> swaggerArguments = new HashMap<>();
diff --git a/demo/demo-jaxrs/jaxrs-client/src/test/java/org/apache/servicecomb/demo/jaxrs/JaxrsIT.java b/demo/demo-jaxrs/jaxrs-client/src/test/java/org/apache/servicecomb/demo/jaxrs/JaxrsIT.java
index df4d1ab..4ce87c8 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/test/java/org/apache/servicecomb/demo/jaxrs/JaxrsIT.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/test/java/org/apache/servicecomb/demo/jaxrs/JaxrsIT.java
@@ -21,7 +21,6 @@ import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import org.apache.servicecomb.demo.TestMgr;
-import org.apache.servicecomb.demo.jaxrs.client.JaxrsClient;
import org.junit.Before;
import org.junit.Test;
diff --git a/demo/demo-jaxrs/jaxrs-server/pom.xml b/demo/demo-jaxrs/jaxrs-server/pom.xml
index 3d3cde8..3e64f60 100644
--- a/demo/demo-jaxrs/jaxrs-server/pom.xml
+++ b/demo/demo-jaxrs/jaxrs-server/pom.xml
@@ -51,7 +51,7 @@
</dependency>
</dependencies>
<properties>
- <demo.main>org.apache.servicecomb.demo.jaxrs.server.JaxrsServer</demo.main>
+ <demo.main>org.apache.servicecomb.demo.jaxrs.JaxrsServer</demo.main>
</properties>
<build>
<plugins>
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxrsServer.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsServer.java
similarity index 96%
rename from demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxrsServer.java
rename to demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsServer.java
index 87b19bd..4f281d3 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxrsServer.java
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsServer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.jaxrs.server;
+package org.apache.servicecomb.demo.jaxrs;
import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory;
import org.apache.servicecomb.demo.RestObjectMapperWithStringMapper;
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java
index 8492437..8db5585 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java
@@ -243,6 +243,13 @@ public class CodeFirstJaxrs {
}
}
+ @GET
+ @Path("/responseLong")
+ @ApiResponse(code = 200, response = Object.class, message = "")
+ public Response responseLong() {
+ return Response.createSuccess(Long.MAX_VALUE);
+ }
+
@Path("/upload2")
@POST
@Produces(MediaType.TEXT_PLAIN)
diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java
index 89e4d9d..2165391 100644
--- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java
+++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/java/org/apache/servicecomb/springboot/jaxrs/client/JaxrsClient.java
@@ -35,7 +35,7 @@ public class JaxrsClient {
RestObjectMapperFactory.setConsumerWriterMapper(new RestObjectMapperWithStringMapperNotWriteNull());
new SpringApplicationBuilder().sources(JaxrsClient.class).web(WebApplicationType.NONE).build().run(args);
- org.apache.servicecomb.demo.jaxrs.client.JaxrsClient.run();
+ org.apache.servicecomb.demo.jaxrs.JaxrsClient.run();
TestMgr.summary();
}
}