From 04f05c8ca762ea5d971e67a7b71bf635605df18a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 03 八月 2019 15:48:05 +0800
Subject: [PATCH] fix taskSdkAdd
---
api_test.go | 154 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 139 insertions(+), 15 deletions(-)
diff --git a/api_test.go b/api_test.go
index 700e322..bbf192e 100644
--- a/api_test.go
+++ b/api_test.go
@@ -2,14 +2,51 @@
import (
"basic.com/pubsub/protomsg.git"
+ "crypto/rand"
+ "encoding/json"
"fmt"
+ "reflect"
"testing"
+ "time"
)
+func Add(a,b string) (string,string) {
+ ret := a+" "+b
+ return ret,ret
+}
+
+func PseudoUuid() (uuid string) {
+ b := make([]byte, 16)
+ rand.Read(b)
+ uuid = fmt.Sprintf("%X-%X-%X-%X-%X", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
+
+ return uuid
+}
+
+var funcMap = map[string]interface{}{"add":Add}
+
+func Call(name string, params ...interface{}) ([]reflect.Value){
+ fun :=reflect.ValueOf(funcMap[name])
+ if len(params) != fun.Type().NumIn() {
+ return nil
+ }
+ in := make([]reflect.Value,len(params))
+ for k,v :=range params {
+ in[k] = reflect.ValueOf(v)
+ }
+
+ return fun.Call(in)
+}
+
func TestGetLocalCameraTree(t *testing.T) {
- var api AreaApi
- body := api.GetLocalCameraTree(0, 0, "c")
- fmt.Println(body)
+ //var api AreaApi
+ //body := api.GetLocalCameraTree("0", "0", "c")
+ //fmt.Println(body)
+
+ ret := Call("add", "hello", "world")
+ fmt.Println("NewUUID:",PseudoUuid())
+
+ fmt.Println(ret)
}
func TestAreaAdd(t *testing.T) {
@@ -18,8 +55,11 @@
Parentid: 0,
Name: "鍝堝搱鍝�",
}
+ dataBytes, _ := json.Marshal(area)
+ paramBody := make(map[string]interface{},0)
+ json.Unmarshal(dataBytes,paramBody)
- flag := api.AreaAdd(area)
+ flag := api.AreaAdd(paramBody)
fmt.Println(flag)
}
@@ -30,7 +70,10 @@
Name: "鍖哄煙鏇存柊娴嬭瘯",
Parentid: 0,
}
- flag := api.AreaUpdate(area)
+ dataBytes, _ := json.Marshal(area)
+ paramBody := make(map[string]interface{},0)
+ json.Unmarshal(dataBytes,paramBody)
+ flag := api.AreaUpdate(paramBody)
fmt.Println(flag)
}
@@ -46,23 +89,44 @@
Name:"娴嬭瘯鍟婂晩鍟婂晩鍟婂晩鍟婂晩",
Areaid:0,
}
- result := api.CameraAdd(camera)
+ dataBytes, _ := json.Marshal(camera)
+ paramBody := make(map[string]interface{},0)
+ json.Unmarshal(dataBytes,paramBody)
+ result := api.CameraAdd(paramBody)
fmt.Println("add result: ",result)
}
func TestSdkApi_Save(t *testing.T) {
- var api SdkApi
- sdk := protomsg.Sdk{
- SdkName:"娴嬭瘯sdk鍟婂晩鍟婂晩鍟�",
-
+ for {
+ time.Sleep(10 * time.Second)
+ var api SdkApi
+ sdk := protomsg.Sdk{
+ SdkName:"awfewagewag",
+ Icon:"bbb",
+ Url:"baidu",
+ }
+ dataBytes, _ := json.Marshal(sdk)
+ paramBody := make(map[string]interface{},0)
+ json.Unmarshal(dataBytes,paramBody)
+ result,data := api.Save(paramBody)
+ fmt.Println("add result: ",result,data)
}
- result := api.Save(sdk)
- fmt.Println("add result: ",result)
+
+}
+
+type Point struct {
+ X float64 `json:"x"`
+ Y float64 `json:"y"`
}
func TestMangosReqClient(t *testing.T){
-
+ location := make([]Point, 0)
+ if err := json.Unmarshal([]byte(""), &location); err == nil {
+ fmt.Println("location:",location)
+ } else {
+ fmt.Println("unmarshal err:",err)
+ }
}
func TestSdkApi_FindAll(t *testing.T) {
@@ -73,8 +137,27 @@
func TestSdkApi_GetById(t *testing.T) {
var api SdkApi
- model := api.GetById("812b674b-2375-4589-919a-5c1c3278a97e")
- fmt.Println(model)
+ _,data := api.GetById("812b674b-2375-4589-919a-5c1c3278a97e")
+
+ dataBytes, _ := json.Marshal(data)
+ var sdkInfo protomsg.Sdk
+ err := json.Unmarshal(dataBytes,&sdkInfo)
+ if err !=nil {
+ fmt.Println("sdk Unmarshal err",err)
+ }
+ fmt.Println(sdkInfo.Args)
+}
+
+func TestTaskApi_FindAllForIpc(t *testing.T) {
+ var api TaskApi
+ taskSdks := api.FindAllTaskSdkRun()
+ fmt.Println(taskSdks)
+}
+
+func TestSdkApi_FindAllSdkRun(t *testing.T) {
+ var api SdkApi
+ sdkRuns := api.FindAllSdkRun()
+ fmt.Println(sdkRuns)
}
func TestSdkApi_GetAllSdkIds(t *testing.T) {
@@ -93,4 +176,45 @@
var api CameraApi
cameras := api.FindAll()
fmt.Println(cameras)
+}
+
+//鏌ユ壘鎵�鏈夌殑澶氳竟褰�
+func TestCameraApi_FindAllPolygons(t *testing.T) {
+ var api CameraApi
+ data := api.FindAllPolygons()
+ fmt.Println("polygons:",data)
+}
+
+//鏌ユ壘鎵�鏈夋椂闂磋鍒�
+func TestCameraApi_FindAllTimeRules(t *testing.T) {
+ var api CameraApi
+ _, rules := api.FindAllTimeRules()
+ fmt.Println("timeRules:",rules)
+}
+
+//鏌ユ壘鎵�鏈変换鍔¤鍒�
+func TestCameraTaskArgsApi_FindAll(t *testing.T) {
+ var api CameraTaskArgsApi
+ all := api.FindAll()
+ fmt.Println("all:",all)
+}
+
+func TestSysSetApi_GetServerInfo(t *testing.T) {
+ var api SysSetApi
+ flag, sysconf := api.GetServerInfo()
+ fmt.Println("flag:",flag)
+ fmt.Println("server.Info:",sysconf)
+}
+
+func TestCameraApi_GetCamerasByRunType(t *testing.T) {
+ var api CameraApi
+ flag, cameras := api.GetCamerasByRunType(1,"")
+ fmt.Println("flag:",flag)
+ fmt.Println("cameras:",cameras)
+}
+
+func TestSysSetApi_GetPollConfig(t *testing.T) {
+ var api SysSetApi
+ _, config := api.GetPollConfig()
+ fmt.Println("config:",config)
}
\ No newline at end of file
--
Gitblit v1.8.0