add rest unit tests

apache · Mar 9, 2020 · 3a46e04 · 3a46e04
1 parent 1829072
commit 3a46e04
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/protocol/rest/rest_config_initializer_test.go b/protocol/rest/rest_config_initializer_test.go
@@ -36,6 +36,15 @@ func TestGetRestConsumerServiceConfig(t *testing.T) {
 	initConsumerRestConfig()
 	serviceConfig := GetRestConsumerServiceConfig("UserProvider")
 	assert.NotEmpty(t, serviceConfig)
+	assert.NotEmpty(t, serviceConfig.RestMethodConfigsMap)
+	assert.NotEmpty(t, serviceConfig.RestMethodConfigsMap["GetUser"])
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].QueryParamsMap[1], "userid")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].HeadersMap[3], "age")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].PathParamsMap[4], "time")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].Body, 0)
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].Produces, "application/xml")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].Consumes, "application/xml")
+	assert.Equal(t, serviceConfig.Client, "resty1")
 }
 
 func TestGetRestProviderServiceConfig(t *testing.T) {
@@ -44,4 +53,14 @@ func TestGetRestProviderServiceConfig(t *testing.T) {
 	initProviderRestConfig()
 	serviceConfig := GetRestProviderServiceConfig("UserProvider")
 	assert.NotEmpty(t, serviceConfig)
+	assert.NotEmpty(t, serviceConfig.RestMethodConfigsMap)
+	assert.NotEmpty(t, serviceConfig.RestMethodConfigsMap["GetUser"])
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].QueryParamsMap[1], "userid")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].HeadersMap[3], "age")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].PathParamsMap[4], "time")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].Body, 0)
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].Produces, "application/xml")
+	assert.Equal(t, serviceConfig.RestMethodConfigsMap["GetUser"].Consumes, "application/xml")
+	assert.Equal(t, serviceConfig.Server, "go-restful1")
+
 }
diff --git a/protocol/rest/rest_config_reader/testdata/consumer_config.yml b/protocol/rest/rest_config_reader/testdata/consumer_config.yml
@@ -46,19 +46,19 @@ references:
     url: "dubbo://127.0.0.1:20000/UserProvider"
     cluster: "failover"
     timeout: "3s"
-    rest_client: "resty"
-    rest_produces: "*/*"
-    rest_consumes: "*/*"
+    rest_client: "resty1"
+    rest_produces: "application/xml"
+    rest_consumes: "application/xml"
     methods :
       - name: "GetUser"
         retries: "3"
         timeout: "5s"
         rest_query_params: "1:userid,2:username"
-        rest_headrs: "3:age"
+        rest_headers: "3:age"
         rest_path_params: "4:time,2:name"
         rest_body: 0
-        rest_produces: "*/*"
-        rest_consumes: "*/*"
+        rest_produces: "application/xml"
+        rest_consumes: "application/xml"
 
     params:
       "serviceid":

diff --git a/protocol/rest/rest_config_reader/testdata/provider_config.yml b/protocol/rest/rest_config_reader/testdata/provider_config.yml
@@ -54,7 +54,7 @@ services:
     group: "as"
     warmup: "100"
     cluster: "failover"
-    rest_server: "go-restful"
+    rest_server: "go-restful1"
     rest_produces: "*/*"
     rest_consumes: "*/*"
     methods:
@@ -67,11 +67,11 @@ services:
         # the name of RejectedExecutionHandler
         execute.limit.rejected.handler: "default"
         rest_query_params: "1:userid,2:username"
-        rest_headrs: "3:age"
+        rest_headers: "3:age"
         rest_path_params: "4:time,2:name"
         rest_body: 0
-        rest_produces: "*/*"
-        rest_consumes: "*/*"
+        rest_produces: "application/xml"
+        rest_consumes: "application/xml"
 
 protocols:
     "rest":