- move test code to servicemgr folder

diff --git a/src/servicemgr/test/types_concurrent_map_test.go b/src/servicemgr/test/types_concurrent_map_test.go
deleted file mode 100644 (file)
index ccd9dfd..0000000
--- a/src/servicemgr/test/types_concurrent_map_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package test
-
-import (
-       "servicemgr"
-       "strings"
-       "testing"
-)
-
-const (
-       serviceName1 = "hello1"
-       serviceName2 = "hello2"
-)
-
-func TestMapSetGet(t *testing.T) {
-       servicemgr.InitServiceMap()
-       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
-
-       str, _ := servicemgr.ServiceMap.Get(uint64(1))
-       AssertEqualStr(t, str.(string), serviceName1)
-}
-
-func TestMapRemove(t *testing.T) {
-       servicemgr.InitServiceMap()
-       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
-
-       servicemgr.ServiceMap.Remove(uint64(1))
-
-       exist, _ := servicemgr.ServiceMap.Get(uint64(1))
-       if exist != nil {
-               t.Error("ConcurrentMap Remove API is failed")
-       }
-}
-
-func TestMapModify(t *testing.T) {
-       servicemgr.InitServiceMap()
-       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
-       servicemgr.ServiceMap.Set(uint64(1), serviceName2)
-
-       str, _ := servicemgr.ServiceMap.Get(uint64(1))
-       AssertEqualStr(t, str.(string), serviceName2)
-}
-
-func TestMapIter(t *testing.T) {
-       servicemgr.InitServiceMap()
-       servicemgr.ServiceMap.Set(uint64(1), serviceName1)
-       servicemgr.ServiceMap.Set(uint64(2), serviceName2)
-
-       mapItem := servicemgr.ServiceMap.Iter()
-       compareStr := make([]string, 10)
-       idx := 0
-
-       for {
-               msg := <-mapItem
-
-               t.Log(msg.Key, msg.Value)
-
-               if msg.Value == nil && msg.Key == 0 {
-                       break
-               } else {
-                       compareStr[idx] = msg.Value.(string)
-               }
-       }
-
-       for _, str := range compareStr {
-               if len(str) == 0 {
-                       break
-               }
-
-               if strings.Compare(str, serviceName1) == 0 || strings.Compare(str, serviceName2) == 0 {
-                       continue
-               } else {
-                       t.Fail()
-               }
-       }
-}

diff --git a/src/servicemgr/types_concurrent_map_test.go b/src/servicemgr/types_concurrent_map_test.go
new file mode 100644 (file)
index 0000000..536e0ad
--- /dev/null
+++ b/src/servicemgr/types_concurrent_map_test.go
@@ -0,0 +1,69 @@
+package servicemgr
+
+import (
+       "strings"
+       "testing"
+)
+
+func TestMapSetGet(t *testing.T) {
+       initServiceMap()
+       ServiceMap.Set(uint64(1), serviceName)
+
+       str, _ := ServiceMap.Get(uint64(1))
+       assertEqualStr(t, str.(string), serviceName)
+}
+
+func TestMapRemove(t *testing.T) {
+       initServiceMap()
+       ServiceMap.Set(uint64(1), serviceName)
+
+       ServiceMap.Remove(uint64(1))
+
+       exist, _ := ServiceMap.Get(uint64(1))
+       if exist != nil {
+               t.Error("ConcurrentMap Remove API is failed")
+       }
+}
+
+func TestMapModify(t *testing.T) {
+       initServiceMap()
+       ServiceMap.Set(uint64(1), serviceName)
+       ServiceMap.Set(uint64(1), serviceName2)
+
+       str, _ := ServiceMap.Get(uint64(1))
+       assertEqualStr(t, str.(string), serviceName2)
+}
+
+func TestMapIter(t *testing.T) {
+       initServiceMap()
+       ServiceMap.Set(uint64(1), serviceName)
+       ServiceMap.Set(uint64(2), serviceName2)
+
+       mapItem := ServiceMap.Iter()
+       compareStr := make([]string, 10)
+       idx := 0
+
+       for {
+               msg := <-mapItem
+
+               t.Log(msg.Key, msg.Value)
+
+               if msg.Value == nil && msg.Key == 0 {
+                       break
+               } else {
+                       compareStr[idx] = msg.Value.(string)
+               }
+       }
+
+       for _, str := range compareStr {
+               if len(str) == 0 {
+                       break
+               }
+
+               if strings.Compare(str, serviceName) == 0 || strings.Compare(str, serviceName2) == 0 {
+                       continue
+               } else {
+                       t.Fail()
+               }
+       }
+}