Add test code of service map

diff --git a/src/servicemgr/test/concurrent_map_test.go b/src/servicemgr/test/concurrent_map_test.go
index d2825a58efa25aad9a577094ed062bc1d99557dd..ccd9dfdae8489beccef02557c5e2f74352528b1a 100644 (file)
--- a/src/servicemgr/test/concurrent_map_test.go
+++ b/src/servicemgr/test/concurrent_map_test.go
@@ -13,19 +13,19 @@ const (
 
 func TestMapSetGet(t *testing.T) {
        servicemgr.InitServiceMap()
-       servicemgr.ServiceNameMap.Set(uint64(1), serviceName1)
+       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
 
-       str, _ := servicemgr.ServiceNameMap.Get(uint64(1))
+       str, _ := servicemgr.ServiceMap.Get(uint64(1))
        AssertEqualStr(t, str.(string), serviceName1)
 }
 
 func TestMapRemove(t *testing.T) {
        servicemgr.InitServiceMap()
-       servicemgr.ServiceNameMap.Set(uint64(1), serviceName1)
+       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
 
-       servicemgr.ServiceNameMap.Remove(uint64(1))
+       servicemgr.ServiceMap.Remove(uint64(1))
 
-       exist, _ := servicemgr.ServiceNameMap.Get(uint64(1))
+       exist, _ := servicemgr.ServiceMap.Get(uint64(1))
        if exist != nil {
                t.Error("ConcurrentMap Remove API is failed")
        }
@@ -33,19 +33,19 @@ func TestMapRemove(t *testing.T) {
 
 func TestMapModify(t *testing.T) {
        servicemgr.InitServiceMap()
-       servicemgr.ServiceNameMap.Set(uint64(1), serviceName1)
-       servicemgr.ServiceNameMap.Set(uint64(1), serviceName2)
+       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
+       servicemgr.ServiceMap.Set(uint64(1), serviceName2)
 
-       str, _ := servicemgr.ServiceNameMap.Get(uint64(1))
+       str, _ := servicemgr.ServiceMap.Get(uint64(1))
        AssertEqualStr(t, str.(string), serviceName2)
 }
 
 func TestMapIter(t *testing.T) {
        servicemgr.InitServiceMap()
-       servicemgr.ServiceNameMap.Set(uint64(1), serviceName1)
-       servicemgr.ServiceNameMap.Set(uint64(2), serviceName2)
+       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
+       servicemgr.ServiceMap.Set(uint64(2), serviceName2)
 
-       mapItem := servicemgr.ServiceNameMap.Iter()
+       mapItem := servicemgr.ServiceMap.Iter()
        compareStr := make([]string, 10)
        idx := 0
 

diff --git a/src/servicemgr/test/service_id_test.go b/src/servicemgr/test/service_id_test.go
index 9e3297f25b226221d743032a7e4dd14d21821e53..cb5f044ffd6628bd5c2591f2ae2cfd169712ee96 100644 (file)
--- a/src/servicemgr/test/service_id_test.go
+++ b/src/servicemgr/test/service_id_test.go
@@ -23,7 +23,7 @@ func TestCreateServiceID(t *testing.T) {
        servicemgr.InitServiceMap()
 
        var cmd *exec.Cmd
-       idx := servicemgr.CreateServiceMap(cmd, serviceName, appName)
+       idx, _, _ := servicemgr.CreateServiceMap(cmd, serviceName, appName)
        t.Log(idx)
 
        if idx != 1 {
@@ -35,31 +35,31 @@ func TestReadAppName(t *testing.T) {
        servicemgr.InitServiceMap()
 
        var cmd *exec.Cmd
-       idx := servicemgr.CreateServiceMap(cmd, serviceName, appName)
+       idx, _, _ := servicemgr.CreateServiceMap(cmd, serviceName, appName)
 
-       name, _ := servicemgr.ServiceAppNameMap.Get(idx)
-       AssertEqualStr(t, name.(string), appName)
+       name, _ := servicemgr.GetAppName(idx)
+       AssertEqualStr(t, name, appName)
 }
 
 func TestReadServiceName(t *testing.T) {
        servicemgr.InitServiceMap()
 
        var cmd *exec.Cmd
-       idx := servicemgr.CreateServiceMap(cmd, serviceName, appName)
+       idx, _, _ := servicemgr.CreateServiceMap(cmd, serviceName, appName)
 
-       name, _ := servicemgr.ServiceNameMap.Get(idx)
-       AssertEqualStr(t, name.(string), serviceName)
+       name, _ := servicemgr.GetServiceName(idx)
+       AssertEqualStr(t, name, serviceName)
 }
 
 func TestRemoveServiceID(t *testing.T) {
        servicemgr.InitServiceMap()
 
        var cmd *exec.Cmd
-       idx := servicemgr.CreateServiceMap(cmd, serviceName, appName)
+       idx, _, _ := servicemgr.CreateServiceMap(cmd, serviceName, appName)
        servicemgr.DeleteServiceMap(idx)
 
-       name, _ := servicemgr.ServiceNameMap.Get(idx)
-       if name != nil {
+       _, err := servicemgr.GetServiceName(idx)
+       if err == nil {
                t.Fail()
        }
 }