Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TC-VALCC-3.1: Allow immediate open of valve #35851

Merged
merged 16 commits into from
Dec 13, 2024
Merged

TC-VALCC-3.1: Allow immediate open of valve #35851

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fa83b47
TC-VALCC-3.1: Allow immediate open of valve
cecille Sep 28, 2024
18c0613
fixup for 3.1 test
cecille Oct 4, 2024
7d45e45
another fixup for 3.1
cecille Oct 7, 2024
109f400
Add close at start of test
cecille Oct 7, 2024
c735c6a
linter
cecille Oct 7, 2024
7009dd3
Restyled by clang-format
restyled-commits Oct 7, 2024
3ab061b
Restyled by isort
restyled-commits Oct 7, 2024
fa25f33
Add back the feature check
cecille Oct 22, 2024
b858bfe
TC-VALCC-3.3: Allow immediate open
cecille Oct 22, 2024
63c7cef
Merge remote-tracking branch 'upstream/master' into VALCC_3_1_allow_i…
cecille Oct 23, 2024
9b66452
Linter
cecille Oct 27, 2024
d48e147
Fix 3.2
cecille Dec 8, 2024
00deb59
Merge remote-tracking branch 'upstream/master' into VALCC_3_1_allow_i…
cecille Dec 8, 2024
801e054
couple little fixes
cecille Dec 8, 2024
0793ceb
Restyled by isort
restyled-commits Dec 8, 2024
1f3a1ea
linter
cecille Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions src/python_testing/TC_VALCC_3_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@ def steps_TC_VALCC_3_1(self) -> list[TestStep]:
steps = [
TestStep(1, "Commissioning, already done", is_commissioning=True),
TestStep(2, "Send Open command"),
TestStep(3, "Read TargetState attribute"),
TestStep(4, "Read CurrentState attribute"),
TestStep(3, "Read CurrentState and TargetState attribute until CurrentState is Open",
"Target state is Open while CurrentState is Transitioning"),
TestStep(4, "Read CurrentState and TargetState attribute", "CurrentState is Open, TargetState is NULL"),
TestStep(5, "Send Close command"),
TestStep(6, "Read TargetState attribute"),
TestStep(7, "Read CurrentState attribute"),
TestStep(6, "Read CurrentState and TargetState attribute until CurrentState is Open",
"Target state is Closed while CurrentState is Transitioning"),
TestStep(7, "Read CurrentState and TargetState attribute", "CurrentState is Closed, TargetState is NULL"),
]
return steps

Expand All @@ -65,7 +67,8 @@ async def test_TC_VALCC_3_1(self):
endpoint = self.user_params.get("endpoint", 1)

self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
cluster = Clusters.ValveConfigurationAndControl
attributes = cluster.Attributes

self.step(2)
try:
Expand All @@ -75,24 +78,26 @@ async def test_TC_VALCC_3_1(self):
pass

self.step(3)
target_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.TargetState)

asserts.assert_true(target_state_dut is not NullValue, "TargetState is null")
asserts.assert_equal(target_state_dut, Clusters.Objects.ValveConfigurationAndControl.Enums.ValveStateEnum.kOpen,
"TargetState is not the expected value")

self.step(4)
# Read target state first in case the current state goes to open between these calls.
# The test re-reads target state after CurrentState goes to open.
target_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.TargetState)
current_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.CurrentState)
asserts.assert_true(current_state_dut is not NullValue, "CurrentState is null")

while current_state_dut is Clusters.Objects.ValveConfigurationAndControl.Enums.ValveStateEnum.kTransitioning:
while current_state_dut is cluster.Enums.ValveStateEnum.kTransitioning:
asserts.assert_equal(target_state_dut, cluster.Enums.ValveStateEnum.kOpen, "TargetState is incorrect")
time.sleep(1)

target_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.TargetState)
current_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.CurrentState)
asserts.assert_true(current_state_dut is not NullValue, "CurrentState is null")
asserts.assert_true(target_state_dut is not NullValue, "TargetState is null")
cecille marked this conversation as resolved.
Show resolved Hide resolved

asserts.assert_equal(current_state_dut, Clusters.Objects.ValveConfigurationAndControl.Enums.ValveStateEnum.kOpen,
"CurrentState is not the expected value")
self.step(4)
current_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.CurrentState)
asserts.assert_equal(current_state_dut, cluster.Enums.ValveStateEnum.kOpen, "CurrentState is incorrect")
target_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.TargetState)
asserts.assert_true(target_state_dut is NullValue, "TargetState is not null")

self.step(5)
try:
Expand All @@ -103,23 +108,22 @@ async def test_TC_VALCC_3_1(self):

self.step(6)
target_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.TargetState)

asserts.assert_true(target_state_dut is not NullValue, "TargetState is null")
asserts.assert_equal(target_state_dut, Clusters.Objects.ValveConfigurationAndControl.Enums.ValveStateEnum.kClosed,
"TargetState is not the expected value")

self.step(7)
current_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.CurrentState)
asserts.assert_true(current_state_dut is not NullValue, "CurrentState is null")

while current_state_dut is Clusters.Objects.ValveConfigurationAndControl.Enums.ValveStateEnum.kTransitioning:
while current_state_dut is cluster.Enums.ValveStateEnum.kTransitioning:
asserts.assert_equal(target_state_dut, cluster.Enums.ValveStateEnum.kClosed, "TargetState is incorrect")
time.sleep(1)

target_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.TargetState)
current_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.CurrentState)
asserts.assert_true(current_state_dut is not NullValue, "CurrentState is null")
asserts.assert_true(target_state_dut is not NullValue, "TargetState is null")

asserts.assert_equal(current_state_dut, Clusters.Objects.ValveConfigurationAndControl.Enums.ValveStateEnum.kClosed,
"CurrentState is not the expected value")
self.step(7)
current_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.CurrentState)
asserts.assert_equal(current_state_dut, cluster.Enums.ValveStateEnum.kClosed, "CurrentState is incorrect")
target_state_dut = await self.read_valcc_attribute_expect_success(endpoint=endpoint, attribute=attributes.TargetState)
asserts.assert_true(target_state_dut is NullValue, "TargetState is not null")


if __name__ == "__main__":
Expand Down
Loading