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 2018/10/10 03:55:45 UTC
[incubator-servicecomb-java-chassis] branch master updated:
[SCB-940] move float type test case from demo to integration-test
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/incubator-servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 7fca502 [SCB-940] move float type test case from demo to integration-test
7fca502 is described below
commit 7fca50243dc29336cee63312c1ff9d30a808171a
Author: heyile <he...@huawei.com>
AuthorDate: Thu Sep 27 11:49:23 2018 +0800
[SCB-940] move float type test case from demo to integration-test
---
.../it/testcase/TestDataTypePrimitive.java | 238 +++++++++++++++++++++
.../servicecomb/it/testcase/TestDefaultValue.java | 116 ++++++++++
.../servicecomb/it/schema/DataTypeJaxrsSchema.java | 42 ++++
.../servicecomb/it/schema/DataTypePojoSchema.java | 8 +
.../it/schema/DataTypeSpringmvcSchema.java | 36 ++++
.../it/schema/DefaultValueJaxrsSchema.java | 19 ++
.../it/schema/DefaultValueSpringmvcSchema.java | 40 +++-
7 files changed, 498 insertions(+), 1 deletion(-)
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDataTypePrimitive.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDataTypePrimitive.java
index 82d505c..1561435 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDataTypePrimitive.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDataTypePrimitive.java
@@ -44,6 +44,10 @@ public class TestDataTypePrimitive {
double doubleBody(double input);
double doubleAdd(double num1, double num2);
+
+ float floatBody(float input);
+
+ float floatAdd(float num1, float num2);
}
public interface DataTypeRestIntf {
@@ -90,6 +94,21 @@ public class TestDataTypePrimitive {
double doubleForm(double input);
double doubleAdd(double num1, double num2);
+
+ //float
+ float floatPath(float input);
+
+ float floatQuery(float input);
+
+ float floatHeader(float input);
+
+ float floatCookie(float input);
+
+ float floatBody(float input);
+
+ float floatForm(float input);
+
+ float floatAdd(float num1, float num2);
}
private static Consumers<DataTypePojoIntf> consumersPojo = new Consumers<>("dataTypePojo", DataTypePojoIntf.class);
@@ -793,4 +812,223 @@ public class TestDataTypePrimitive {
consumersSpringmvc.getSCBRestTemplate()
.getForObject("/stringConcat?str1=service&str2=Comb", String.class));
}
+
+ //float
+ @Test
+ public void float_pojo_intf() {
+ assertEquals(10.2f, consumersPojo.getIntf().floatBody(10.2f), 0.0f);
+ }
+
+ @Test
+ public void float_pojo_rt() {
+ Map<String, Float> map = new HashMap<>();
+ map.put("input", 10.2f);
+ assertEquals(10.2f, consumersPojo.getSCBRestTemplate().postForObject("/floatBody", map, float.class),
+ 0.0f);
+ }
+
+ @Test
+ public void floatAdd_pojo_intf() {
+ assertEquals(20.5f, consumersPojo.getIntf().floatAdd(10.2f, 10.3f), 0.0f);
+ }
+
+ @Test
+ public void floatAdd_pojo_rt() {
+ Map<String, Float> map = new HashMap<>();
+ map.put("num1", 10.2f);
+ map.put("num2", 10.3f);
+ assertEquals(20.5f, consumersPojo.getSCBRestTemplate().postForObject("/floatAdd", map, float.class), 0.0f);
+ }
+
+ @Test
+ public void floatPath_jaxrs_intf() {
+ assertEquals(10.2f, consumersJaxrs.getIntf().floatPath(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatPath_jaxrs_rt() {
+ assertEquals(10.2f, consumersJaxrs.getSCBRestTemplate().getForObject("/floatPath/10.2f", float.class),
+ 0.0f);
+ }
+
+ @Test
+ public void floatQuery_jaxrs_intf() {
+ assertEquals(10.2f, consumersJaxrs.getIntf().floatQuery(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatQuery_jaxrs_rt() {
+ assertEquals(10.2f,
+ consumersJaxrs.getSCBRestTemplate().getForObject("/floatQuery?input=10.2f", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_jaxrs_intf() {
+ assertEquals(10.2f, consumersJaxrs.getIntf().floatHeader(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_jaxrs_rt() {
+ floatHeader_rt(consumersJaxrs);
+ }
+
+ protected void floatHeader_rt(Consumers<DataTypeRestIntf> consumers) {
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("input", "10.2f");
+
+ @SuppressWarnings("rawtypes")
+ HttpEntity entity = new HttpEntity<>(null, headers);
+ ResponseEntity<Float> response = consumers.getSCBRestTemplate()
+ .exchange("/floatHeader",
+ HttpMethod.GET,
+ entity,
+ float.class);
+ assertEquals(10.2f, response.getBody(), 0.0f);
+ }
+
+ @Test
+ public void floatCookie_jaxrs_intf() {
+ assertEquals(10.2f, consumersJaxrs.getIntf().floatCookie(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatCookie_jaxrs_rt() {
+ floatCookie_rt(consumersJaxrs);
+ }
+
+ void floatCookie_rt(Consumers<DataTypeRestIntf> consumers) {
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Cookie", "input=10.2f");
+
+ @SuppressWarnings("rawtypes")
+ HttpEntity entity = new HttpEntity<>(null, headers);
+ ResponseEntity<Float> response = consumers.getSCBRestTemplate()
+ .exchange("/floatCookie",
+ HttpMethod.GET,
+ entity,
+ float.class);
+ assertEquals(10.2f, response.getBody(), 0.0f);
+ }
+
+ @Test
+ public void floatForm_jaxrs_intf() {
+ assertEquals(10.2f, consumersJaxrs.getIntf().floatForm(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatForm_jaxrs_rt() {
+ Map<String, Float> map = new HashMap<>();
+ map.put("input", 10.2f);
+ HttpEntity<Map<String, Float>> formEntiry = new HttpEntity<>(map);
+
+ assertEquals(10.2f,
+ consumersJaxrs.getSCBRestTemplate().postForEntity("/floatForm", formEntiry, float.class).getBody(),
+ 0.0f);
+ //just use map is ok
+ assertEquals(10.2f,
+ consumersJaxrs.getSCBRestTemplate().postForEntity("/floatForm", map, float.class).getBody(), 0.0f);
+ }
+
+ @Test
+ public void floatBody_jaxrs_intf() {
+ assertEquals(10.2f, consumersJaxrs.getIntf().floatBody(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatBody_jaxrs_rt() {
+ assertEquals(10.2f, consumersJaxrs.getSCBRestTemplate().postForObject("/floatBody", 10.2f, float.class),
+ 0.0f);
+ }
+
+ @Test
+ public void floatAdd_jaxrs_intf() {
+ assertEquals(20.5f, consumersJaxrs.getIntf().floatAdd(10.2f, 10.3f), 0.0f);
+ }
+
+ @Test
+ public void floatAdd_jaxrs_rt() {
+ assertEquals(20.5f,
+ consumersJaxrs.getSCBRestTemplate().getForObject("/floatAdd?num1=10.2f&num2=10.3f", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatPath_springmvc_intf() {
+ assertEquals(10.2f, consumersSpringmvc.getIntf().floatPath(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatPath_springmvc_rt() {
+ assertEquals(10.2f, consumersSpringmvc.getSCBRestTemplate().getForObject("/floatPath/10.2f", float.class),
+ 0.0f);
+ }
+
+ @Test
+ public void floatQuery_springmvc_intf() {
+ assertEquals(10.2f, consumersSpringmvc.getIntf().floatQuery(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatQuery_springmvc_rt() {
+ assertEquals(10.2f,
+ consumersSpringmvc.getSCBRestTemplate().getForObject("/floatQuery?input=10.2f", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_springmvc_intf() {
+ assertEquals(10.2f, consumersSpringmvc.getIntf().floatHeader(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_springmvc_rt() {
+ floatHeader_rt(consumersSpringmvc);
+ }
+
+ @Test
+ public void floatCookie_springmvc_intf() {
+ assertEquals(10.2f, consumersSpringmvc.getIntf().floatCookie(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatCookie_springmvc_rt() {
+ floatCookie_rt(consumersSpringmvc);
+ }
+
+ @Test
+ public void floatForm_springmvc_intf() {
+ assertEquals(10.2f, consumersSpringmvc.getIntf().floatForm(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatForm_springmvc_rt() {
+ Map<String, Float> map = new HashMap<>();
+ map.put("input", 10.2f);
+ HttpEntity<Map<String, Float>> formEntiry = new HttpEntity<>(map);
+
+ assertEquals(10.2f,
+ consumersSpringmvc.getSCBRestTemplate().postForEntity("/floatForm", formEntiry, float.class)
+ .getBody(), 0.0f);
+ }
+
+ @Test
+ public void floatBody_springmvc_intf() {
+ assertEquals(10.2f, consumersSpringmvc.getIntf().floatBody(10.2f), 0.0f);
+ }
+
+ @Test
+ public void floatBody_springmvc_rt() {
+ assertEquals(10.2f,
+ consumersSpringmvc.getSCBRestTemplate().postForObject("/floatBody", 10.2f, float.class), 0.0f);
+ }
+
+ @Test
+ public void floatAdd_springmvc_intf() {
+ assertEquals(20.5f, consumersSpringmvc.getIntf().floatAdd(10.2f, 10.3f), 0.0f);
+ }
+
+ @Test
+ public void floatAdd_springmvc_rt() {
+ assertEquals(20.5f,
+ consumersSpringmvc.getSCBRestTemplate().getForObject("/floatAdd?num1=10.2f&num2=10.3f", float.class),
+ 0.0f);
+ }
}
diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java
index 8d55dd3..d4ad947 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestDefaultValue.java
@@ -40,6 +40,13 @@ public class TestDefaultValue {
double doubleHeader(Double input);
double doubleForm(Double input);
+
+ // float
+ float floatQuery(Float input);
+
+ float floatHeader(Float input);
+
+ float floatForm(Float input);
}
interface DefaultValueRequireIntf extends DefaultValueIntf {
@@ -60,6 +67,12 @@ public class TestDefaultValue {
double doubleHeaderRequire(Double input);
double doubleFormRequire(Double input);
+
+ float floatQueryRequire(Float input);
+
+ float floatHeaderRequire(Float input);
+
+ float floatFormRequire(Float input);
}
private String defaultStr = "string";
@@ -68,6 +81,8 @@ public class TestDefaultValue {
private double defaultDouble = 10.2;
+ private float defaultFloat = 10.2f;
+
private static Consumers<DefaultValueIntf> consumersJaxrs = new Consumers<>("defaultValueJaxrs",
DefaultValueIntf.class);
@@ -364,4 +379,105 @@ public class TestDefaultValue {
assertEquals(defaultStr,
consumersSpringmvc.getSCBRestTemplate().postForObject("/stringFormRequire", null, String.class));
}
+
+ //float
+ @Test
+ public void floatQuery_jaxrs_intf() {
+ assertEquals(defaultFloat, consumersJaxrs.getIntf().floatQuery(null), 0.0f);
+ }
+
+ @Test
+ public void floatQuery_jaxrs_rt() {
+ assertEquals(defaultFloat, consumersJaxrs.getSCBRestTemplate().getForObject("/floatQuery", float.class),
+ 0.0f);
+ }
+
+ @Test
+ public void floatHeader_jaxrs_intf() {
+ assertEquals(defaultFloat, consumersJaxrs.getIntf().floatHeader(null), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_jaxrs_rt() {
+ assertEquals(defaultFloat,
+ consumersJaxrs.getSCBRestTemplate().getForObject("/floatHeader", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatForm_jaxrs_intf() {
+ assertEquals(defaultFloat, consumersJaxrs.getIntf().floatForm(null), 0.0f);
+ }
+
+ @Test
+ public void floatForm_jaxrs_rt() {
+ assertEquals(defaultFloat,
+ consumersJaxrs.getSCBRestTemplate().postForObject("/floatForm", null, float.class), 0.0f);
+ }
+
+ @Test
+ public void floatQuery_springmvc_intf() {
+ assertEquals(defaultFloat, consumersSpringmvc.getIntf().floatQuery(null), 0.0f);
+ }
+
+ @Test
+ public void floatQuery_springmvc_rt() {
+ assertEquals(defaultFloat,
+ consumersSpringmvc.getSCBRestTemplate().getForObject("/floatQuery", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_springmvc_intf() {
+ assertEquals(defaultFloat, consumersSpringmvc.getIntf().floatHeader(null), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_springmvc_rt() {
+ assertEquals(defaultFloat,
+ consumersSpringmvc.getSCBRestTemplate().getForObject("/floatHeader", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatForm_springmvc_intf() {
+ assertEquals(defaultFloat, consumersSpringmvc.getIntf().floatForm(null), 0.0f);
+ }
+
+ @Test
+ public void floatForm_springmvc_rt() {
+ assertEquals(defaultFloat,
+ consumersSpringmvc.getSCBRestTemplate().postForObject("/floatForm", null, float.class), 0.0f);
+ }
+
+ @Test
+ public void floatQuery_require_springmvc_intf() {
+ assertEquals(defaultFloat, consumersSpringmvc.getIntf().floatQueryRequire(null), 0.0f);
+ }
+
+ @Test
+ public void floatQuery_require_springmvc_rt() {
+ assertEquals(defaultFloat,
+ consumersSpringmvc.getSCBRestTemplate().getForObject("/floatQueryRequire", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatHeader_require_springmvc_intf() {
+ assertEquals(defaultFloat, consumersSpringmvc.getIntf().floatHeaderRequire(null), 0.0f);
+ }
+
+
+ @Test
+ public void floatHeader_require_springmvc_rt() {
+ assertEquals(defaultFloat,
+ consumersSpringmvc.getSCBRestTemplate().getForObject("/floatHeaderRequire", float.class), 0.0f);
+ }
+
+ @Test
+ public void floatForm_require_springmvc_intf() {
+ assertEquals(defaultFloat, consumersSpringmvc.getIntf().floatFormRequire(null), 0.0f);
+ }
+
+ @Test
+ public void floatForm_require_springmvc_rt() {
+ assertEquals(defaultFloat,
+ consumersSpringmvc.getSCBRestTemplate().postForObject("/floatFormRequire", null, float.class), 0.0f);
+ }
}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeJaxrsSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeJaxrsSchema.java
index 0326140..63a99c3 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeJaxrsSchema.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeJaxrsSchema.java
@@ -158,4 +158,46 @@ public class DataTypeJaxrsSchema {
return num1 + num2;
}
+ // float
+ @Path("floatPath/{input}")
+ @GET
+ public float floatPath(@PathParam("input") float input) {
+ return input;
+ }
+
+ @Path("floatQuery")
+ @GET
+ public float floatQuery(@QueryParam("input") float input) {
+ return input;
+ }
+
+ @Path("floatHeader")
+ @GET
+ public float floatHeader(@HeaderParam("input") float input) {
+ return input;
+ }
+
+ @Path("floatCookie")
+ @GET
+ public float floatCookie(@CookieParam("input") float input) {
+ return input;
+ }
+
+ @Path("floatForm")
+ @POST
+ public float floatForm(@FormParam("input") float input) {
+ return input;
+ }
+
+ @Path("floatBody")
+ @POST
+ public float floatBody(float input) {
+ return input;
+ }
+
+ @Path("floatAdd")
+ @GET
+ public float floatAdd(@QueryParam("num1") float num1, @QueryParam("num2") float num2) {
+ return num1 + num2;
+ }
}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypePojoSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypePojoSchema.java
index 9e8ac2e..a112ccd 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypePojoSchema.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypePojoSchema.java
@@ -46,4 +46,12 @@ public class DataTypePojoSchema {
public double doubleAdd(double num1, double num2) {
return num1 + num2;
}
+
+ public float floatBody(float input) {
+ return input;
+ }
+
+ public float floatAdd(float num1, float num2) {
+ return num1 + num2;
+ }
}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeSpringmvcSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeSpringmvcSchema.java
index 570affe..68460e7 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeSpringmvcSchema.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DataTypeSpringmvcSchema.java
@@ -138,4 +138,40 @@ public class DataTypeSpringmvcSchema {
public double doubleAdd(double num1, double num2) {
return num1 + num2;
}
+
+ //float
+ @GetMapping("floatPath/{input}")
+ public float floatPath(@PathVariable("input") float input) {
+ return input;
+ }
+
+ @GetMapping("floatQuery")
+ public float floatQuery(@RequestParam("input") float input) {
+ return input;
+ }
+
+ @GetMapping("floatHeader")
+ public float floatHeader(@RequestHeader("input") float input) {
+ return input;
+ }
+
+ @GetMapping("floatCookie")
+ public float floatCookie(@CookieValue("input") float input) {
+ return input;
+ }
+
+ @PostMapping("floatForm")
+ public float floatForm(@RequestAttribute("input") float input) {
+ return input;
+ }
+
+ @PostMapping("floatBody")
+ public float floatBody(@RequestBody float input) {
+ return input;
+ }
+
+ @GetMapping(path = "floatAdd")
+ public float floatAdd(float num1, float num2) {
+ return num1 + num2;
+ }
}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueJaxrsSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueJaxrsSchema.java
index f724402..3d9aa57 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueJaxrsSchema.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueJaxrsSchema.java
@@ -82,4 +82,23 @@ public class DefaultValueJaxrsSchema {
public double doubleForm(@FormParam("input") @DefaultValue("10.2") double input) {
return input;
}
+
+ // float
+ @Path("floatQuery")
+ @GET
+ public float floatQuery(@QueryParam("input") @DefaultValue("10.2") float input) {
+ return input;
+ }
+
+ @Path("floatHeader")
+ @GET
+ public float floatHeader(@HeaderParam(value = "input") @DefaultValue("10.2") float input) {
+ return input;
+ }
+
+ @Path("floatForm")
+ @POST
+ public float floatForm(@FormParam("input") @DefaultValue("10.2") float input) {
+ return input;
+ }
}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueSpringmvcSchema.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueSpringmvcSchema.java
index 5a565b3..9ed160c 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueSpringmvcSchema.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/DefaultValueSpringmvcSchema.java
@@ -117,11 +117,11 @@ public class DefaultValueSpringmvcSchema {
@ApiImplicitParams({
@ApiImplicitParam(name = "input", dataType = "number", format = "double", paramType = "form", value = "", defaultValue = "10.2", required = false)})
-
@PostMapping(path = "doubleForm")
public double doubleForm(double input) {
return input;
}
+
// springmvc rule: required should be false because defaultValue have value
@GetMapping(path = "doubleQueryRequire")
public double doubleQueryRequire(
@@ -142,4 +142,42 @@ public class DefaultValueSpringmvcSchema {
public double doubleFormRequire(double input) {
return input;
}
+
+
+ //float
+ @GetMapping(path = "floatQuery")
+ public float floatQuery(@RequestParam(name = "input", required = false, defaultValue = "10.2") float input) {
+ return input;
+ }
+
+ @GetMapping(path = "floatHeader")
+ public float floatHeader(@RequestHeader(name = "input", required = false, defaultValue = "10.2") float input) {
+ return input;
+ }
+
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "input", dataType = "number", format = "float", paramType = "form", value = "", defaultValue = "10.2", required = false)})
+ @PostMapping(path = "floatForm")
+ public float floatForm(float input) {
+ return input;
+ }
+
+ // springmvc rule: required should be false because defaultValue have value
+ @GetMapping(path = "floatQueryRequire")
+ public float floatQueryRequire(@RequestParam(name = "input", required = true, defaultValue = "10.2") float input) {
+ return input;
+ }
+
+ // springmvc rule: required should be false because defaultValue have value
+ @GetMapping(path = "floatHeaderRequire")
+ public float floatHeaderRequire(@RequestHeader(name = "input", required = true, defaultValue = "10.2") float input) {
+ return input;
+ }
+
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "input", dataType = "number", format = "float", paramType = "form", value = "a required form param", required = true, defaultValue = "10.2")})
+ @PostMapping(path = "floatFormRequire")
+ public float floatFormRequire(float input) {
+ return input;
+ }
}