X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=core%2Fchannel_test.go;h=fa3e58dc369ba4cfb54ba4c37d526b25cf560570;hb=568e126201d709d6d3da989f0e60cfc170d19fe9;hp=b8d07b549ce3f9716c247468c73d6c207b9e7bb3;hpb=9f27eeff53ee501b8641595baa7cbc2f0014a68c;p=govpp.git

diff --git a/core/channel_test.go b/core/channel_test.go
index b8d07b5..fa3e58d 100644
--- a/core/channel_test.go
+++ b/core/channel_test.go
@@ -22,10 +22,10 @@ import (
 
 	"git.fd.io/govpp.git/adapter/mock"
 	"git.fd.io/govpp.git/api"
-	"git.fd.io/govpp.git/examples/binapi/interface_types"
-	"git.fd.io/govpp.git/examples/binapi/interfaces"
-	"git.fd.io/govpp.git/examples/binapi/memif"
-	"git.fd.io/govpp.git/examples/binapi/vpe"
+	interfaces "git.fd.io/govpp.git/binapi/interface"
+	"git.fd.io/govpp.git/binapi/interface_types"
+	"git.fd.io/govpp.git/binapi/memif"
+	"git.fd.io/govpp.git/binapi/vpe"
 )
 
 type testCtx struct {
@@ -129,7 +129,7 @@ func TestMultiRequestReplySwInterfaceMemifDump(t *testing.T) {
 	var msgs []api.Message
 	for i := 1; i <= 10; i++ {
 		msgs = append(msgs, &memif.MemifDetails{
-			SwIfIndex: interfaces.InterfaceIndex(i),
+			SwIfIndex: interface_types.InterfaceIndex(i),
 		})
 	}
 	ctx.mockVpp.MockReply(msgs...)
@@ -288,7 +288,7 @@ func TestMultiRequestDouble(t *testing.T) {
 	for i := 1; i <= 3; i++ {
 		msgs = append(msgs, mock.MsgWithContext{
 			Msg: &interfaces.SwInterfaceDetails{
-				SwIfIndex:     interfaces.InterfaceIndex(i),
+				SwIfIndex:     interface_types.InterfaceIndex(i),
 				InterfaceName: "if-name-test",
 			},
 			Multipart: true,
@@ -301,7 +301,7 @@ func TestMultiRequestDouble(t *testing.T) {
 		msgs = append(msgs,
 			mock.MsgWithContext{
 				Msg: &interfaces.SwInterfaceDetails{
-					SwIfIndex:     interfaces.InterfaceIndex(i),
+					SwIfIndex:     interface_types.InterfaceIndex(i),
 					InterfaceName: "if-name-test",
 				},
 				Multipart: true,
@@ -427,7 +427,7 @@ func TestReceiveReplyAfterTimeoutMultiRequest(t *testing.T) {
 	for i := 1; i <= 3; i++ {
 		msgs = append(msgs, mock.MsgWithContext{
 			Msg: &interfaces.SwInterfaceDetails{
-				SwIfIndex:     interfaces.InterfaceIndex(i),
+				SwIfIndex:     interface_types.InterfaceIndex(i),
 				InterfaceName: "if-name-test",
 			},
 			Multipart: true,
@@ -466,5 +466,5 @@ func TestInvalidMessageID(t *testing.T) {
 	// second should fail with error invalid message ID
 	err = ctx.ch.SendRequest(&ControlPing{}).ReceiveReply(&ControlPingReply{})
 	Expect(err).Should(HaveOccurred())
-	Expect(err.Error()).To(ContainSubstring("invalid message ID"))
+	Expect(err.Error()).To(ContainSubstring("unexpected message"))
 }