X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fsdks_test.go;h=89fdc67f83c7686e07c31b5e170b23619e7cac88;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=1e3298f94f9deacba124a90a6ce08cd9f8a7241e;hpb=72bb1c521aff5bb166db287ef426b243166d8927;p=src%2Fxds%2Fxds-server.git

diff --git a/test/sdks_test.go b/test/sdks_test.go
index 1e3298f..89fdc67 100644
--- a/test/sdks_test.go
+++ b/test/sdks_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
-	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
-	"github.com/stretchr/testify/assert"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
+	"github.com/stretchr/testify/require"
 )
 
 var cpt int
@@ -51,12 +51,12 @@ func ConnectSDKStateChange(t *testing.T, sCli *IOSockClient, channel chan xsapiv
 	})
 
 	args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTSDKStateChange}
-	assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+	require.Nil(t, HTTPCli.Post("/events/register", args, nil))
 }
 
 func DisconnectSDKStateChange(t *testing.T, sCli *IOSockClient) {
 	args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTSDKStateChange}
-	assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+	require.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
 }
 
 func InitSdkDir() {
@@ -73,13 +73,13 @@ func InitSdkDir() {
 }
 
 func RemoveSdk(t *testing.T, sdk xsapiv1.SDK, chSdks chan xsapiv1.SDK) {
-	t.Logf("remove sdk %v", sdk.ID)
-	assert.Nil(t, HTTPCli.Delete("/sdks/"+sdk.ID, &sdk))
+	Debugf(t, "remove sdk %v", sdk.ID)
+	require.Nil(t, HTTPCli.Delete("/sdks/"+sdk.ID, &sdk))
 	sdkFromEvt := <-chSdks //waiting for event Uninstalling
-	assert.Equal(t, sdk.ID, sdkFromEvt.ID)
-	assert.Equal(t, sdkFromEvt.Status, "Un-installing")
+	require.Equal(t, sdk.ID, sdkFromEvt.ID)
+	require.Equal(t, sdkFromEvt.Status, "Un-installing")
 	sdkFromEvt = <-chSdks //waiting for event not installed
-	assert.Equal(t, sdkFromEvt.Status, "Not Installed")
+	require.Equal(t, sdkFromEvt.Status, "Not Installed")
 	os.RemoveAll(path.Join(os.Getenv(envXdtSdk), sdk.Profile))
 	os.Remove(strings.Replace(sdk.URL, "file://", "", 1))
 }
@@ -88,9 +88,9 @@ func TestSdks(t *testing.T) {
 	InitSdkDir()
 	/*get sdk list from sdk_latest.json*/
 	var sdkArray []xsapiv1.SDK
-	assert.Nil(t, HTTPCli.Get("/sdks", &sdkArray))
+	require.Nil(t, HTTPCli.Get("/sdks", &sdkArray))
 	_, err := os.Stat(path.Join(os.Getenv(envXdtSdk), "sdks_latest.json"))
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	/*create channel fro SDK event*/
 	chSdks := make(chan xsapiv1.SDK)
@@ -100,47 +100,47 @@ func TestSdks(t *testing.T) {
 	/*checking startup installing of SDKs*/
 	for i := 0; i < len(sdkArray); i++ {
 		re := regexp.MustCompile("^[0-9a-z]+-[0-9a-z]+-[0-9a-z]+-[0-9a-z]+-[0-9a-z]+$")
-		assert.True(t, re.MatchString(sdkArray[i].ID))
-		assert.Equal(t, sdkArray[0].Status, "Not Installed")
+		require.True(t, re.MatchString(sdkArray[i].ID))
+		require.Equal(t, sdkArray[0].Status, "Not Installed")
 
 		var sdk xsapiv1.SDK
-		assert.Nil(t, HTTPCli.Get("/sdks/"+sdkArray[i].ID, &sdk))
-		assert.Equal(t, sdkArray[i], sdk)
+		require.Nil(t, HTTPCli.Get("/sdks/"+sdkArray[i].ID, &sdk))
+		require.Equal(t, sdkArray[i], sdk)
 
 		var sdkRes xsapiv1.SDK
 		/*install sdk*/
-		t.Logf("install sdk %v", sdk.Name)
-		assert.Nil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
-		assert.Equal(t, sdkRes.Status, "Installing")
+		Debugf(t, "install sdk %v", sdk.Name)
+		require.Nil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
+		require.Equal(t, sdkRes.Status, "Installing")
 		sdkFromEvent := <-chSdks //waiting for installing event
-		assert.Equal(t, sdkRes.ID, sdkFromEvent.ID)
-		assert.Equal(t, sdkFromEvent.Status, "Installing")
+		require.Equal(t, sdkRes.ID, sdkFromEvent.ID)
+		require.Equal(t, sdkFromEvent.Status, "Installing")
 
 		/*abort sdk install*/
-		t.Logf("abort install sdk %v", sdk.Name)
-		assert.Nil(t, HTTPCli.Post("/sdks/abortinstall", sdk, &sdkRes))
-		assert.Equal(t, sdkRes.Status, "Not Installed")
+		Debugf(t, "abort install sdk %v", sdk.Name)
+		require.Nil(t, HTTPCli.Post("/sdks/abortinstall", sdk, &sdkRes))
+		require.Equal(t, sdkRes.Status, "Not Installed")
 		sdkFromEvent = <-chSdks //waiting for not installed status*/
-		assert.Equal(t, sdkRes.ID, sdkFromEvent.ID)
-		assert.Equal(t, sdkRes.Status, sdkFromEvent.Status)
+		require.Equal(t, sdkRes.ID, sdkFromEvent.ID)
+		require.Equal(t, sdkRes.Status, sdkFromEvent.Status)
 	}
 }
 
 func installFakeSdk(t *testing.T, sdkInstall xsapiv1.SDKInstallArgs, chSdks chan xsapiv1.SDK) xsapiv1.SDK {
 	InitSdkDir()
 	var sdkRes xsapiv1.SDK
-	assert.Nil(t, HTTPCli.Post("/sdks", sdkInstall, &sdkRes))
-	t.Logf("Install fake sdk %v (force=%v)", sdkRes.Name, sdkInstall.Force)
-	assert.Equal(t, sdkRes.Status, "Installing")
+	require.Nil(t, HTTPCli.Post("/sdks", sdkInstall, &sdkRes))
+	Debugf(t, "Install fake sdk %v (force=%v)", sdkRes.Name, sdkInstall.Force)
+	require.Equal(t, sdkRes.Status, "Installing")
 	sdkFromEvent := <-chSdks
-	assert.Equal(t, sdkRes.ID, sdkFromEvent.ID)
-	assert.Equal(t, sdkFromEvent.Status, "Installing")
+	require.Equal(t, sdkRes.ID, sdkFromEvent.ID)
+	require.Equal(t, sdkFromEvent.Status, "Installing")
 	/*waiting for SDKStateChange event from channel*/
 	sdkFromEvent = <-chSdks
-	assert.Equal(t, sdkRes.ID, sdkFromEvent.ID)
-	assert.Equal(t, "Installed", sdkFromEvent.Status)
-	assert.Equal(t, sdkFromEvent.LastError, "")
-	t.Logf("Fake sdk %v installed", sdkFromEvent.Name)
+	require.Equal(t, sdkRes.ID, sdkFromEvent.ID)
+	require.Equal(t, "Installed", sdkFromEvent.Status)
+	require.Equal(t, sdkFromEvent.LastError, "")
+	Debugf(t, "Fake sdk %v installed", sdkFromEvent.Name)
 	return sdkFromEvent
 }
 
@@ -169,17 +169,17 @@ func TestSdksError(t *testing.T) {
 		Filename: "",
 		Force:    false,
 	}
-	t.Logf("error while installing sdk with no ID and no Filename")
+	Debugf(t, "error while installing sdk with no ID and no Filename")
 	var sdkRes xsapiv1.SDK
 	/*error with no ID no filename*/
-	assert.NotNil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
+	require.NotNil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
 	sdk.ID = "42885c24-374e-3ef0-9723-0c8a05191aa"
-	t.Logf("error while installing sdk with a fake id=%v", sdk.ID)
+	Debugf(t, "error while installing sdk with a fake id=%v", sdk.ID)
 	/*error with fake ID*/
-	assert.NotNil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
+	require.NotNil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
 	sdk.ID = ""
 	sdk.Filename = "fake"
-	t.Logf("error while installing sdk with a fake filename=%v", sdk.Filename)
+	Debugf(t, "error while installing sdk with a fake filename=%v", sdk.Filename)
 	/*error with fake filename*/
-	assert.NotNil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
+	require.NotNil(t, HTTPCli.Post("/sdks", sdk, &sdkRes))
 }