Merge pull request #1782 from dboltovskyi/fix/smoke_regarding_send_location

Smoke: Remove turnText item

Author: dboltovskyi

test_scripts/Smoke/HeartBeat/ATF_HeartBeat_App_does_not_send_HB_and_does_not_respond.lua

@@ -67,6 +67,7 @@ commonFunctions:newTestCasesGroup("Test")
 
 function Test:Start_Session_And_Register_App()
   self.mobileSession = mobile_session.MobileSession(self, self.mobileConnection)
+  self.mobileSession.activateHeartbeat = false
   self.mobileSession.sendHeartbeatToSDL = false
   self.mobileSession.answerHeartbeatFromSDL = false
   self.mobileSession.ignoreSDLHeartBeatACK = false
@@ -84,6 +85,7 @@ end
 
 function Test:Register_Second_App_With_HeartBeat()
   self.mobileSession1 = mobile_session.MobileSession(self, self.mobileConnection)
+  self.mobileSession1.activateHeartbeat = true
   self.mobileSession1.sendHeartbeatToSDL = true
   self.mobileSession1.answerHeartbeatFromSDL = true
   self.mobileSession1.ignoreSDLHeartBeatACK = false
@@ -115,4 +117,4 @@ function Test.Stop_SDL()
   StopSDL()
 end
 
-return Test
+return Test

test_scripts/Smoke/HeartBeat/ATF_HeartBeat_App_does_not_send_HB_but_respond.lua

@@ -66,9 +66,10 @@ commonFunctions:newTestCasesGroup("Test")
 
 function Test:Start_Session_And_Register_App()
   self.mobileSession = mobile_session.MobileSession(self, self.mobileConnection)
+  self.mobileSession.activateHeartbeat = true
   self.mobileSession.sendHeartbeatToSDL = false
   self.mobileSession.answerHeartbeatFromSDL = true
-  self.mobileSession.ignoreSDLHeartBeatACK = false
+  self.mobileSession.ignoreSDLHeartBeatACK = true
   self.mobileSession:StartRPC():Do(function()
     local correlation_id = self.mobileSession:SendRPC("RegisterAppInterface", default_app_params)
     EXPECT_HMINOTIFICATION("BasicCommunication.OnAppRegistered",
@@ -98,4 +99,4 @@ function Test.Stop_SDL()
   StopSDL()
 end
 
-return Test
+return Test

test_scripts/smoke_api.lua

@@ -24,7 +24,7 @@ require('user_modules/AppTypes')
 
 --[[ Local Variables ]]
 local iTimeout = 5000
-local strMaxLengthFileName255 = string.rep("a", 251)  .. ".png" -- set max length file name
+local strMaxLengthFileName242 = string.rep("a", 238)  .. ".png" -- max is 242 since docker limitation
 local textPromtValue = {"Please speak one of the following commands,", "Please say a command,"}
 
 local storagePath = commonPreconditions:GetPathToSDL() .. "storage/" .. config.application1.registerAppInterfaceParams.appID .. "_" .. config.deviceMAC .. "/"
@@ -514,7 +514,7 @@ end
 
 -- 2. PutFiles
 	commonSteps:PutFile("PutFile_action.png", "action.png")
-	commonSteps:PutFile("PutFile_MaxLength_255Characters", strMaxLengthFileName255)
+	commonSteps:PutFile("PutFile_MaxLength_255Characters", strMaxLengthFileName242)
 	commonSteps:PutFile("Putfile_SpaceBefore", " SpaceBefore")
 	commonSteps:PutFile("Putfile_Icon.png", "icon.png")
 
@@ -679,17 +679,7 @@ function Test:ResetGlobalProperties_PositiveCase()
 		--hmi side: expect TTS.SetGlobalProperties request
 		EXPECT_HMICALL("TTS.SetGlobalProperties",
 		{
-			helpPrompt =
-			{
-				{
-					type = "TEXT",
-					text = textPromtValue[1]
-				},
-				{
-					type = "TEXT",
-					text = textPromtValue[2]
-				}
-			},
+			helpPrompt = { },
 			timeoutPrompt =
 			{
 				{
@@ -1226,10 +1216,10 @@ function Test:ListFiles()
     {
       success = true,
       resultCode = "SUCCESS",
-      spaceAvailable = 103878520
+      -- spaceAvailable = 103878520 -- disabled due to CI issue
     })
   :ValidIf(function(_, data)
-    local files_expected = { " SpaceBefore", strMaxLengthFileName255, "icon.png" }
+    local files_expected = { " SpaceBefore", strMaxLengthFileName242, "icon.png" }
     if not commonFunctions:is_table_equal(data.payload.filenames, files_expected) then
         return false, "\nExpected files:\n" .. commonFunctions:convertTableToString(files_expected, 1)
           .. "\nActual files:\n" .. commonFunctions:convertTableToString(data.payload.filenames, 1)
@@ -2781,12 +2771,6 @@ local function displayCap_textFields_Value()
 			rows = 1,
 			width = 500
 		},
-		{
-			characterSet = "TYPE2SET",
-			name = "turnText",
-			rows = 1,
-			width = 500
-		},
 		{
 			characterSet = "TYPE2SET",
 			name = "menuTitle",
@@ -3259,7 +3243,23 @@ local function setGVDResponse(paramsSend)
 			gps =
 				{
 					longitudeDegrees = 25.5,
-					latitudeDegrees = 45.5
+					latitudeDegrees = 45.5,
+					utcYear = 2010,
+					utcMonth = 1,
+					utcDay = 1,
+					utcHours = 2,
+					utcMinutes = 3,
+					utcSeconds = 4,
+					compassDirection = "NORTH",
+					pdop = 1.1,
+					hdop = 2.2,
+					vdop = 3.3,
+					actual = true,
+					satellites = 5,
+					dimension = "NO_FIX",
+					altitude = 4.4,
+					heading = 5.5,
+					speed = 100
 				},
 			speed = 100.5,
 			rpm = 1000,
@@ -3271,18 +3271,48 @@ local function setGVDResponse(paramsSend)
 			prndl="DRIVE",
 			tirePressure={
 					pressureTelltale = "ON",
+					leftFront = { status = "NORMAL" },
+					rightFront = { status = "NORMAL" },
+					leftRear = { status = "NORMAL" },
+					rightRear = { status = "NORMAL" },
+					innerLeftRear = { status = "NORMAL" },
+					innerRightRear = { status = "NORMAL" }
 				},
 			odometer= 8888,
 			beltStatus={
-					driverBeltDeployed = "NOT_SUPPORTED"
+					driverBeltDeployed = "NOT_SUPPORTED",
+					passengerBeltDeployed = "YES",
+					passengerBuckleBelted = "YES",
+					driverBuckleBelted = "YES",
+					leftRow2BuckleBelted = "YES",
+					passengerChildDetected = "YES",
+					rightRow2BuckleBelted = "YES",
+					middleRow2BuckleBelted = "YES",
+					middleRow3BuckleBelted = "YES",
+					leftRow3BuckleBelted = "YES",
+					rightRow3BuckleBelted = "YES",
+					leftRearInflatableBelted = "YES",
+					rightRearInflatableBelted = "YES",
+					middleRow1BeltDeployed = "YES",
+					middleRow1BuckleBelted = "YES"
 				},
 			bodyInformation={
 					parkBrakeActive = true,
 					ignitionStableStatus = "MISSING_FROM_TRANSMITTER",
 					ignitionStatus = "UNKNOWN"
 				},
 			deviceStatus={
-					voiceRecOn = true
+					voiceRecOn = true,
+					btIconOn = true,
+					callActive = true,
+					phoneRoaming = true,
+					textMsgAvailable = true,
+					battLevelStatus = "ONE_LEVEL_BARS",
+					stereoAudioOutputMuted = true,
+					monoAudioOutputMuted = true,
+					signalLevelStatus = "TWO_LEVEL_BARS",
+					primaryAudioSource = "USB",
+					eCallEventActive = true
 				},
 			driverBraking="NOT_SUPPORTED",
 			wiperStatus="MAN_LOW",
@@ -3416,7 +3446,7 @@ local function setExTurnList(size)
 							navigationText =
 							{
 								fieldText = "Text",
-								fieldName = "turnText"
+								fieldName = "navigationText"
 							},
 							turnIcon =
 							{
@@ -3433,7 +3463,7 @@ local function setExTurnList(size)
 					navigationText =
 					{
 						fieldText = "Text"..i,
-						fieldName = "turnText"
+						fieldName = "navigationText"
 					},
 					turnIcon =
 					{

test_sets/smoke_tests.txt

@@ -22,4 +22,3 @@
 ./test_scripts/Smoke/HeartBeat/ATF_HeartBeat_App_does_not_send_HB_but_respond.lua
 ./test_scripts/Smoke/HeartBeat/ATF_HeartBeat_App_does_not_send_HB_and_does_not_respond.lua
 ./test_scripts/smoke_api.lua
-./test_scripts/ATF_Expanded_smoke_test_Genivi.lua