X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Ftarget_test.go;h=bc0be58a9ab03a060b221c2f6d38c836a952a5f1;hb=8c5b8a9a3d6086d08eb52572e899542d74e41fa7;hp=696c8fcf8ad9adbb6b33086b3bc6f2ced876c9a1;hpb=4c01e5e3fad9455b97519380babdf7e8801d8643;p=src%2Fxds%2Fxds-server.git

diff --git a/test/target_test.go b/test/target_test.go
index 696c8fc..bc0be58 100644
--- a/test/target_test.go
+++ b/test/target_test.go
@@ -40,7 +40,75 @@ func flushChannelTerm(channel chan xsapiv1.TerminalOutMsg, ms time.Duration) {
 	}
 }
 
+func ConnectTargetEvents(t *testing.T, channel chan xsapiv1.TargetConfig) {
+	sCli.Conn.On(xsapiv1.EVTTargetAdd, func(e xsapiv1.EventMsg) {
+		target, _ := e.DecodeTargetEvent()
+		channel <- target
+	})
+
+	args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetAdd}
+	assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+
+	sCli.Conn.On(xsapiv1.EVTTargetRemove, func(e xsapiv1.EventMsg) {
+		target, _ := e.DecodeTargetEvent()
+		channel <- target
+	})
+
+	args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetRemove}
+	assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+}
+
+func DisconnectTargetEvents(t *testing.T) {
+	args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetAdd}
+	assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+	args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetRemove}
+	assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+}
+
+func ConnectTermEvents(t *testing.T, channel chan xsapiv1.TerminalConfig) {
+	sCli.Conn.On(xsapiv1.EVTTargetTerminalAdd, func(e xsapiv1.EventMsg) {
+		termEvt, _ := e.DecodeTerminalEvent()
+		channel <- termEvt
+	})
+
+	args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalAdd}
+	assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+
+	sCli.Conn.On(xsapiv1.EVTTargetTerminalStateChange, func(e xsapiv1.EventMsg) {
+		termEvt, _ := e.DecodeTerminalEvent()
+		channel <- termEvt
+	})
+
+	args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalStateChange}
+	assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+
+	sCli.Conn.On(xsapiv1.EVTTargetTerminalRemove, func(e xsapiv1.EventMsg) {
+		termEvt, _ := e.DecodeTerminalEvent()
+		channel <- termEvt
+	})
+
+	args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalRemove}
+	assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+}
+
+func DisconnectTermEvents(t *testing.T) {
+	args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalAdd}
+	assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+	args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalStateChange}
+	assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+	args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalRemove}
+	assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+}
+
 func TestTarget(t *testing.T) {
+	chTarget := make(chan xsapiv1.TargetConfig)
+	defer close(chTarget)
+	ConnectTargetEvents(t, chTarget)
+
+	chTermEvt := make(chan xsapiv1.TerminalConfig)
+	defer close(chTermEvt)
+	ConnectTermEvents(t, chTermEvt)
+
 	var targetArray []xsapiv1.TargetConfig
 	assert.Nil(t, HTTPCli.Get("/targets", &targetArray))
 	assert.Equal(t, len(targetArray), 0)
@@ -52,8 +120,12 @@ func TestTarget(t *testing.T) {
 	}
 	var targetRes, targetResBis xsapiv1.TargetConfig
 	assert.Nil(t, HTTPCli.Post("/targets", target, &targetRes))
+	targetEvt := <-chTarget
+	assert.Equal(t, targetRes.ID, targetEvt.ID)
 	target.Name = "fakeTargetBis"
 	assert.Nil(t, HTTPCli.Post("/targets", target, &targetResBis))
+	targetEvt = <-chTarget
+	assert.Equal(t, targetResBis.ID, targetEvt.ID)
 	assert.Equal(t, targetRes.Status, "Enable")
 	assert.Equal(t, targetResBis.Status, "Enable")
 
@@ -63,23 +135,30 @@ func TestTarget(t *testing.T) {
 	}
 	var termRes, termResBis xsapiv1.TerminalConfig
 	assert.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes))
+	termEvt := <-chTermEvt
+	assert.Equal(t, termRes.ID, termEvt.ID)
 	term.Name = "terminalBis"
 	assert.Nil(t, HTTPCli.Post("/targets/"+targetResBis.ID+"/terminals", term, &termResBis))
+	termEvt = <-chTermEvt
+	assert.Equal(t, termResBis.ID, termEvt.ID)
 	assert.Equal(t, termRes.Status, "Enable")
 	assert.Equal(t, termResBis.Status, "Enable")
 
 	chTerm := make(chan xsapiv1.TerminalOutMsg)
 	defer close(chTerm)
-	sCli, err := NewIoSocketClient(prefixURL, HTTPCli.GetClientID())
-	if err != nil {
-		t.Fatal(err)
-	}
+
 	sCli.Conn.On(xsapiv1.TerminalOutEvent, func(ev xsapiv1.TerminalOutMsg) {
 		chTerm <- ev
 	})
 
 	assert.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals/"+termRes.ID+"/open", termRes, &termRes))
+	termEvt = <-chTermEvt
+	assert.Equal(t, termRes.ID, termEvt.ID)
+	assert.Equal(t, termEvt.Status, "Open")
 	assert.Nil(t, HTTPCli.Post("/targets/"+targetResBis.ID+"/terminals/"+termResBis.ID+"/open", termResBis, &termResBis))
+	termEvt = <-chTermEvt
+	assert.Equal(t, termResBis.ID, termEvt.ID)
+	assert.Equal(t, termEvt.Status, "Open")
 	assert.Equal(t, termRes.Status, "Open")
 	assert.Equal(t, termResBis.Status, "Open")
 
@@ -106,7 +185,7 @@ func TestTarget(t *testing.T) {
 		flushChannelTerm(chTerm, 50)
 
 		/*check that toto file is created*/
-		_, err = os.Stat(totoFileCurrent)
+		_, err := os.Stat(totoFileCurrent)
 		assert.Nil(t, err)
 
 		data = []byte("cat " + totoFileCurrent + "\n")
@@ -119,7 +198,13 @@ func TestTarget(t *testing.T) {
 	}
 
 	assert.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals/"+termRes.ID+"/close", termRes, &termRes))
+	termEvt = <-chTermEvt
+	assert.Equal(t, termRes.ID, termEvt.ID)
+	assert.Equal(t, termEvt.Status, "Close")
 	assert.Nil(t, HTTPCli.Post("/targets/"+targetResBis.ID+"/terminals/"+termResBis.ID+"/close", termResBis, &termResBis))
+	termEvt = <-chTermEvt
+	assert.Equal(t, termResBis.ID, termEvt.ID)
+	assert.Equal(t, termEvt.Status, "Close")
 	assert.Equal(t, termRes.Status, "Close")
 	assert.Equal(t, termResBis.Status, "Close")
 
@@ -130,12 +215,18 @@ func TestTarget(t *testing.T) {
 		assert.Nil(t, HTTPCli.Get("/targets/"+targetArray[i].ID+"/terminals", &termArray))
 		for j := 0; j < len(termArray); j++ {
 			assert.Nil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID+"/terminals/"+termArray[j].ID, &termRes))
+			termEvt = <-chTermEvt
+			assert.Equal(t, termRes.ID, termEvt.ID)
 			assert.NotNil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID+"/terminals/"+termArray[j].ID, &termRes))
 		}
 		var tgtRes xsapiv1.TargetConfig
 		assert.Nil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID, &tgtRes))
+		targetEvt = <-chTarget
+		assert.Equal(t, tgtRes.ID, targetEvt.ID)
 		assert.Equal(t, targetArray[i].ID, tgtRes.ID)
 	}
+	DisconnectTargetEvents(t)
+	DisconnectTermEvents(t)
 }
 
 func TestTargetErrors(t *testing.T) {