|
@@ -8,16 +8,16 @@ import (
|
|
|
"strings"
|
|
"strings"
|
|
|
"testing"
|
|
"testing"
|
|
|
|
|
|
|
|
- . "gitp78su.ipnodns.ru/svi/kern/v3/kc/helpers"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/krn/kbus/kbus_msg/msg_pub"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/krn/kbus/kbus_msg/msg_serve"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/krn/kbus/kbus_msg/msg_sub"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/krn/kbus/kbus_msg/msg_unsub"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/krn/kctx"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/krn/kserv_http"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/mock/mock_env"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/mock/mock_hand_serve"
|
|
|
|
|
- "gitp78su.ipnodns.ru/svi/kern/v3/mock/mock_hand_sub_local"
|
|
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/krn/kbus/kbus_msg/msg_pub"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/krn/kbus/kbus_msg/msg_serve"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/krn/kbus/kbus_msg/msg_sub"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/krn/kbus/kbus_msg/msg_unsub"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/krn/kctx"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/krn/kserv_http"
|
|
|
|
|
+ . "gitp78su.ipnodns.ru/svi/kern/v4/lev1/helpers"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/mock/mock_env"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/mock/mock_hand_serve"
|
|
|
|
|
+ "gitp78su.ipnodns.ru/svi/kern/v4/mock/mock_hand_sub_local"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
type tester struct {
|
|
type tester struct {
|
|
@@ -63,7 +63,8 @@ func (sf *tester) unsubGood2() {
|
|
|
}
|
|
}
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("unsubGood2").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/unsub", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/unsub", body)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
sf.t.Fatalf("unsubGood2(): err=%v", err)
|
|
sf.t.Fatalf("unsubGood2(): err=%v", err)
|
|
@@ -95,7 +96,8 @@ func (sf *tester) unsubBad3() {
|
|
|
req := "tra-la-la"
|
|
req := "tra-la-la"
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("unsubBad3").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/unsub", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/unsub", body)
|
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -181,7 +183,8 @@ func (sf *tester) pubGood2() {
|
|
|
}
|
|
}
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("pubGood2").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/pub", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/pub", body)
|
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -212,7 +215,8 @@ func (sf *tester) pubBad3() {
|
|
|
req := "tra-la-la"
|
|
req := "tra-la-la"
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("pubBad3").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/pub", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/pub", body)
|
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -302,7 +306,8 @@ func (sf *tester) subGood2() {
|
|
|
}
|
|
}
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("subGood2").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/sub", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/sub", body)
|
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -385,7 +390,8 @@ func (sf *tester) subBad1() {
|
|
|
req := "tra-ta-ta"
|
|
req := "tra-ta-ta"
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("subBad1").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/sub", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/sub", body)
|
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -422,7 +428,8 @@ func (sf *tester) reqBad4() {
|
|
|
}
|
|
}
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("reqBad4").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -456,7 +463,8 @@ func (sf *tester) reqGood1() {
|
|
|
}
|
|
}
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("reqGood1").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
hReq.Header.Add("Content-Type", "application/json")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -491,7 +499,8 @@ func (sf *tester) reqBad3() {
|
|
|
}
|
|
}
|
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
binReq, _ := json.MarshalIndent(req, "", " ")
|
|
|
body := strings.NewReader(string(binReq))
|
|
body := strings.NewReader(string(binReq))
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("reqBad3").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
sf.t.Fatalf("reqBad3(): err=%v", err)
|
|
sf.t.Fatalf("reqBad3(): err=%v", err)
|
|
@@ -509,7 +518,8 @@ func (sf *tester) reqBad3() {
|
|
|
func (sf *tester) reqBad2() {
|
|
func (sf *tester) reqBad2() {
|
|
|
sf.t.Log("reqBad1")
|
|
sf.t.Log("reqBad1")
|
|
|
body := strings.NewReader("test_msg")
|
|
body := strings.NewReader("test_msg")
|
|
|
- fibApp := kserv_http.GetKernelServHttp().Fiber()
|
|
|
|
|
|
|
+ resServ := kserv_http.GetKernelServHttp()
|
|
|
|
|
+ fibApp := resServ.Hassert("reqBad2").Fiber()
|
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
hReq, err := http.NewRequest("POST", "/bus/request", body)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
sf.t.Fatalf("reqBad1(): err=%v", err)
|
|
sf.t.Fatalf("reqBad1(): err=%v", err)
|