From 23c554ee96eec0bb422ef77cd016929945ee93fa Mon Sep 17 00:00:00 2001
From: Penny Zheng <penny.zheng@arm.com>
Date: Thu, 14 Feb 2019 11:09:54 +0800
Subject: [PATCH] unit-test: refine func TestGetCPUDetails

refine struct testData in func TestGetCPUDetails to remove redundant
/unused struct field expectedVendor and expectedModel

Fixes: #1200

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
---
 cli/kata-check_arm64_test.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/cli/kata-check_arm64_test.go b/cli/kata-check_arm64_test.go
index 05c04043a..433c0996f 100644
--- a/cli/kata-check_arm64_test.go
+++ b/cli/kata-check_arm64_test.go
@@ -129,19 +129,17 @@ func TestKvmIsUsable(t *testing.T) {
 func TestGetCPUDetails(t *testing.T) {
 	type testData struct {
 		contents                string
-		expectedVendor          string
-		expectedModel           string
 		expectedNormalizeVendor string
 		expectedNormalizeModel  string
 		expectError             bool
 	}
 
-	const validVendorName = "0x41"
-	const validNormalizeVendorName = "ARM Limited"
+	validVendorName := "0x41"
+	validNormalizeVendorName := "ARM Limited"
 	validVendor := fmt.Sprintf(`%s  : %s`, archCPUVendorField, validVendorName)
 
-	const validModelName = "8"
-	const validNormalizeModelName = "v8"
+	validModelName := "8"
+	validNormalizeModelName := "v8"
 	validModel := fmt.Sprintf(`%s   : %s`, archCPUModelField, validModelName)
 
 	validContents := fmt.Sprintf(`
@@ -152,12 +150,12 @@ foo     : bar
 `, validVendor, validModel)
 
 	data := []testData{
-		{"", "", "", "", "", true},
-		{"invalid", "", "", "", "", true},
-		{archCPUVendorField, "", "", "", "", true},
-		{validVendor, "", "", "", "", true},
-		{validModel, "", "", "", "", true},
-		{validContents, validVendorName, validModelName, validNormalizeVendorName, validNormalizeModelName, false},
+		{"", "", "", true},
+		{"invalid", "", "", true},
+		{archCPUVendorField, "", "", true},
+		{validVendor, "", "", true},
+		{validModel, "", "", true},
+		{validContents, validNormalizeVendorName, validNormalizeModelName, false},
 	}
 
 	tmpdir, err := ioutil.TempDir("", "")