update(ut): update method-related unit-test

apache · Jul 8, 2024 · 25f6129 · 25f6129
1 parent cbe3ead
commit 25f6129
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 11 deletions.
diff --git a/common/rpc_service_test.go b/common/rpc_service_test.go
@@ -101,7 +101,7 @@ func TestServiceMapRegister(t *testing.T) {
  s := &TestService{}
  methods, err := ServiceMap.Register(testInterfaceName, "testporotocol", "", "v1", s)
  assert.NoError(t, err)
- assert.Equal(t, "MethodOne,MethodThree,methodTwo", methods)
+ assert.Equal(t, "MethodOne,methodOne,MethodThree,methodThree,methodTwo,MethodTwo", methods)
 
  // repeat
  _, err = ServiceMap.Register(testInterfaceName, "testporotocol", "", "v1", s)

diff --git a/metadata/definition/definition_test.go b/metadata/definition/definition_test.go
@@ -47,7 +47,29 @@ func TestBuildServiceDefinition(t *testing.T) {
  assert.NoError(t, err)
  service := common.ServiceMap.GetServiceByServiceKey(url.Protocol, url.ServiceKey())
  sd := BuildServiceDefinition(*service, url)
- assert.Equal(t, "{canonicalName:com.ikurento.user.UserProvider, codeSource:, methods:[{name:GetUser,parameterTypes:[{type:slice}],returnType:ptr,params:[] }], types:[]}", sd.String())
+ expected := "{canonicalName:com.ikurento.user.UserProvider, codeSource:, methods:[{name:GetUser,parameterTypes:" +
+ "[{type:slice}],returnType:ptr,params:[] }{name:getUser,parameterTypes:[{type:slice}],returnType:ptr,params:[] }" +
+ "], types:[]}"
+ expected2 := "{canonicalName:com.ikurento.user.UserProvider, codeSource:, methods:[{name:getUser,parameterTypes:" +
+ "[{type:slice}],returnType:ptr,params:[] }{name:GetUser,parameterTypes:[{type:slice}],returnType:ptr,params:[] }" +
+ "], types:[]}"
+ sdStr := sd.String()
+ assert.Equal(t, true, (expected == sdStr || expected2 == sdStr))
  fsd := BuildFullDefinition(*service, url)
- assert.Equal(t, "{parameters:{anyhost:true,application:BDTService,bean.name:UserProvider,category:providers,default.timeout:10000,dubbo:dubbo-provider-golang-1.0.0,environment:dev,group:group1,interface:com.ikurento.user.UserProvider,ip:192.168.56.1,methods:GetUser,module:dubbogo user-info server,org:ikurento.com,owner:ZX,pid:1447,revision:0.0.1,side:provider,timeout:3000,timestamp:1556509797245,version:0.0.1}, canonicalName:com.ikurento.user.UserProvider, codeSource:, methods:[{name:GetUser,parameterTypes:[{type:slice}],returnType:ptr,params:[] }], types:[]}", fsd.String())
+ expected = "{parameters:{anyhost:true,application:BDTService,bean.name:UserProvider,category:providers,default." +
+ "timeout:10000,dubbo:dubbo-provider-golang-1.0.0,environment:dev,group:group1," +
+ "interface:com.ikurento.user.UserProvider,ip:192.168.56.1,methods:GetUser,module:dubbogo user-info server," +
+ "org:ikurento.com,owner:ZX,pid:1447,revision:0.0.1,side:provider,timeout:3000,timestamp:1556509797245," +
+ "version:0.0.1}, canonicalName:com.ikurento.user.UserProvider, codeSource:, methods:[{name:GetUser," +
+ "parameterTypes:[{type:slice}],returnType:ptr,params:[] }{name:getUser,parameterTypes:[{type:slice}]," +
+ "returnType:ptr,params:[] }], types:[]}"
+ expected2 = "{parameters:{anyhost:true,application:BDTService,bean.name:UserProvider,category:providers,default." +
+ "timeout:10000,dubbo:dubbo-provider-golang-1.0.0,environment:dev,group:group1," +
+ "interface:com.ikurento.user.UserProvider,ip:192.168.56.1,methods:GetUser,module:dubbogo user-info server," +
+ "org:ikurento.com,owner:ZX,pid:1447,revision:0.0.1,side:provider,timeout:3000,timestamp:1556509797245," +
+ "version:0.0.1}, canonicalName:com.ikurento.user.UserProvider, codeSource:, methods:[{name:getUser," +
+ "parameterTypes:[{type:slice}],returnType:ptr,params:[] }{name:GetUser,parameterTypes:[{type:slice}]," +
+ "returnType:ptr,params:[] }], types:[]}"
+ fsdStr := fsd.String()
+ assert.Equal(t, true, (fsdStr == expected || fsdStr == expected2))
 }
diff --git a/metadata/service/local/service_test.go b/metadata/service/local/service_test.go
@@ -108,12 +108,24 @@ func TestMetadataService(t *testing.T) {
  "\"timeout\":\"3000\",\"timestamp\":\"1556509797245\",\"version\":\"0.0.1\"}," +
  "\"canonicalName\":\"com.ikurento.user.UserProvider\",\"codeSource\":\"\"," +
  "\"methods\":[{\"name\":\"GetUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"," +
- "\"parameters\":null}],\"types\":null}"
+ "\"parameters\":null},{\"name\":\"getUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"" +
+ ",\"parameters\":null}],\"types\":null}"
+ expected2 := "{\"parameters\":{\"anyhost\":\"true\",\"application\":\"BDTService\"," +
+ "\"bean.name\":\"UserProvider\",\"category\":\"providers\",\"default.timeout\":\"10000\"," +
+ "\"dubbo\":\"dubbo-provider-golang-1.0.0\",\"environment\":\"dev\",\"group\":\"group1\"," +
+ "\"interface\":\"com.ikurento.user.UserProvider\",\"ip\":\"192.168.56.1\"," +
+ "\"methods\":\"GetUser\",\"module\":\"dubbogo user-info server\",\"org\":\"ikurento.com\"," +
+ "\"owner\":\"ZX\",\"pid\":\"1447\",\"revision\":\"0.0.1\",\"side\":\"provider\"," +
+ "\"timeout\":\"3000\",\"timestamp\":\"1556509797245\",\"version\":\"0.0.1\"}," +
+ "\"canonicalName\":\"com.ikurento.user.UserProvider\",\"codeSource\":\"\"," +
+ "\"methods\":[{\"name\":\"getUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"," +
+ "\"parameters\":null},{\"name\":\"GetUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"" +
+ ",\"parameters\":null}],\"types\":null}"
  def1, err := mts.GetServiceDefinition(serviceName, group, version)
- assert.Equal(t, expected, def1)
+ assert.Equal(t, true, (def1 == expected || def1 == expected2))
  assert.NoError(t, err)
  serviceKey := definition.ServiceDescriperBuild(serviceName, group, version)
  def2, err := mts.GetServiceDefinitionByServiceKey(serviceKey)
- assert.Equal(t, expected, def2)
+ assert.Equal(t, true, (def2 == expected || def2 == expected2))
  assert.NoError(t, err)
 }
diff --git a/metadata/service/remote/service_test.go b/metadata/service/remote/service_test.go
@@ -165,10 +165,22 @@ func TestMockInmemoryProc(t *testing.T) {
  "\"timeout\":\"3000\",\"timestamp\":\"1556509797245\",\"version\":\"0.0.1\"}," +
  "\"canonicalName\":\"com.ikurento.user.UserProvider\",\"codeSource\":\"\"," +
  "\"methods\":[{\"name\":\"GetUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"," +
- "\"parameters\":null}],\"types\":null}"
+ "\"parameters\":null},{\"name\":\"getUser\",\"parameterTypes\":[\"slice\"],\"returnType\"" +
+ ":\"ptr\",\"parameters\":null}],\"types\":null}"
+ expected2 := "{\"parameters\":{\"anyhost\":\"true\",\"application\":\"BDTService\"," +
+ "\"bean.name\":\"UserProvider\",\"category\":\"providers\",\"default.timeout\":\"10000\"," +
+ "\"dubbo\":\"dubbo-provider-golang-1.0.0\",\"environment\":\"dev\",\"group\":\"group1\"," +
+ "\"interface\":\"com.ikurento.user.UserProvider\",\"ip\":\"192.168.56.1\"," +
+ "\"methods\":\"GetUser\",\"module\":\"dubbogo user-info server\",\"org\":\"ikurento.com\"," +
+ "\"owner\":\"ZX\",\"pid\":\"1447\",\"revision\":\"0.0.1\",\"side\":\"provider\"," +
+ "\"timeout\":\"3000\",\"timestamp\":\"1556509797245\",\"version\":\"0.0.1\"}," +
+ "\"canonicalName\":\"com.ikurento.user.UserProvider\",\"codeSource\":\"\"," +
+ "\"methods\":[{\"name\":\"getUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"," +
+ "\"parameters\":null},{\"name\":\"GetUser\",\"parameterTypes\":[\"slice\"],\"returnType\"" +
+ ":\"ptr\",\"parameters\":null}],\"types\":null}"
  def1, _ := mts.GetServiceDefinition(serviceName, group, version)
- assert.Equal(t, expected, def1)
+ assert.Equal(t, true, (def1 == expected || def1 == expected2))
  serviceKey := definition.ServiceDescriperBuild(serviceName, group, version)
  def2, _ := mts.GetServiceDefinitionByServiceKey(serviceKey)
- assert.Equal(t, expected, def2)
+ assert.Equal(t, true, (def2 == expected || def2 == expected2))
 }
diff --git a/remoting/getty/getty_client_test.go b/remoting/getty/getty_client_test.go
@@ -332,7 +332,7 @@ func InitTest(t *testing.T) (*Server, *common.URL) {
 
  methods, err := common.ServiceMap.Register("com.ikurento.user.UserProvider", "dubbo", "", "", &UserProvider{})
  assert.NoError(t, err)
- assert.Equal(t, "GetBigPkg,GetUser,GetUser0,GetUser1,GetUser2,GetUser3,GetUser4,GetUser5,GetUser6", methods)
+ assert.Equal(t, "GetBigPkg,getBigPkg,GetUser,getUser,GetUser0,getUser0,GetUser1,getUser1,GetUser2,getUser2,GetUser3,getUser3,GetUser4,getUser4,GetUser5,getUser5,GetUser6,getUser6", methods)
 
  // config
  SetClientConf(ClientConfig{

diff --git a/remoting/getty/readwriter_test.go b/remoting/getty/readwriter_test.go
@@ -86,7 +86,7 @@ func getServer(t *testing.T) (*Server, *common.URL) {
 
  methods, err := common.ServiceMap.Register("com.ikurento.user.AdminProvider", "dubbo", "", "", &AdminProvider{})
  assert.NoError(t, err)
- assert.Equal(t, "GetAdmin", methods)
+ assert.Contains(t, "GetAdmin,getAdmin", methods)
 
  // config
  SetClientConf(ClientConfig{