Skip to content

Commit

Permalink
Update the PICs code for atomic request from TSTAT.S.CFE.Rsp to TSTAT…
Browse files Browse the repository at this point in the history
….S.Cfe.Rsp to follow convention
  • Loading branch information
nivi-apple committed Aug 8, 2024
1 parent afce336 commit 25c10af
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/app/tests/suites/certification/PICS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6525,7 +6525,7 @@ PICS:
- label:
"Does the device implement receiving the AtomicRequest command for
Thermostat?"
id: TSTAT.S.CFE.Rsp
id: TSTAT.S.Cfe.Rsp

#
# server / commandsGenerated
Expand Down Expand Up @@ -6619,7 +6619,7 @@ PICS:
id: TSTAT.C.C06.Tx

- label: "Does the device implement sending the AtomicRequest command?"
id: TSTAT.C.CFE.Tx
id: TSTAT.C.Cfe.Tx

#
# client / manually
Expand Down
4 changes: 2 additions & 2 deletions src/app/tests/suites/certification/ci-pics-values
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,7 @@ TSTAT.S.C02.Rsp=0
TSTAT.S.C03.Rsp=0
TSTAT.S.C04.Rsp=0
TSTAT.S.C06.Rsp=1
TSTAT.S.CFE.Rsp=1
TSTAT.S.Cfe.Rsp=1
TSTAT.S.CFD.Tx=1

# Client
Expand All @@ -2017,7 +2017,7 @@ TSTAT.C.C03.Tx=0
TSTAT.S.C00.Tx=0
TSTAT.S.C01.Tx=0
TSTAT.C.C06.Tx=1
TSTAT.C.CFE.Tx=1
TSTAT.C.Cfe.Tx=1

# Client Commands
TSTAT.C.C00.Tx=1
Expand Down
22 changes: 11 additions & 11 deletions src/python_testing/TC_TSTAT_4_2.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ async def test_TC_TSTAT_4_2(self):
asserts.assert_true(status_ok, "Presets write did not return InvalidInState as expected")

self.step("3")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
await self.send_edit_atomic_request_begin_command()

# Write to the presets attribute after calling AtomicRequest command
Expand All @@ -199,7 +199,7 @@ async def test_TC_TSTAT_4_2(self):
asserts.assert_equal(presets, initial_presets, "Presets were updated which is not expected")

self.step("4")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -218,7 +218,7 @@ async def test_TC_TSTAT_4_2(self):
asserts.assert_equal(presets, new_presets_with_handle, "Presets were not updated which is not expected")

self.step("5")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -234,7 +234,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_commit_command(expected_overall_status=Status.Failure, expected_preset_status=Status.ConstraintError)

self.step("6")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.C06.Rsp") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.C06.Rsp") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the SetActivePresetRequest command
await self.send_set_active_preset_handle_request_command(value=b'\x03')
Expand All @@ -258,7 +258,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_commit_command(expected_overall_status=Status.Failure, expected_preset_status=Status.InvalidInState)

self.step("7")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -275,7 +275,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_rollback_command()

self.step("8")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -294,7 +294,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_rollback_command()

self.step("9")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -312,7 +312,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_rollback_command()

self.step("10")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -330,7 +330,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_rollback_command()

self.step("11")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -347,7 +347,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_rollback_command()

self.step("12")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand All @@ -364,7 +364,7 @@ async def test_TC_TSTAT_4_2(self):
await self.send_edit_atomic_request_rollback_command()

self.step("13")
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):

# Send the AtomicRequest begin command
await self.send_edit_atomic_request_begin_command()
Expand Down

0 comments on commit 25c10af

Please sign in to comment.