Skip to content

Commit fceba6c

Browse files
committed
Refine some test categories and add and use some more constants in the RDM tests
(cherry picked from commit 4cf3d17)
1 parent 704337b commit fceba6c

3 files changed

Lines changed: 17 additions & 14 deletions

File tree

python/ola/RDMConstants.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
__author__ = 'nomis52@gmail.com (Simon Newton)'
2121

2222

23+
RDM_MAX_PARAM_DATA_LENGTH = 231
24+
2325
RDM_ZERO_FOOTPRINT_DMX_ADDRESS = 0xFFFF
2426

2527
RDM_MANUFACTURER_PID_MIN = 0x8000
@@ -43,6 +45,8 @@
4345

4446
RDM_MAX_TEST_DATA_PATTERN_LENGTH = 4096
4547

48+
RDM_MAX_SEARCH_DOMAIN_LENGTH = 231
49+
4650

4751
def _ReverseDict(input):
4852
output = {}

tools/rdm/TestCategory.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class TestCategory(object):
3434
'DISPLAY_SETTINGS': 'Display Settings',
3535
'CONFIGURATION': 'Configuration',
3636
'CONTROL': 'Control',
37+
'E133_MANAGEMENT': 'E1.33 (RDMnet) Management',
3738
# And others for things that don't quite fit
3839
'CORE': 'Core Functionality',
3940
'ERROR_CONDITIONS': 'Error Conditions',

tools/rdm/TestDefinitions.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
RDM_MANUFACTURER_SD_MAX, RDM_MANUFACTURER_SD_MIN,
2929
RDM_MAX_DOMAIN_NAME_LENGTH,
3030
RDM_MAX_HOSTNAME_LENGTH,
31+
RDM_MAX_SEARCH_DOMAIN_LENGTH,
3132
RDM_MAX_SERIAL_NUMBER_LENGTH,
3233
RDM_MAX_STRING_LENGTH,
3334
RDM_MAX_TEST_DATA_PATTERN_LENGTH,
@@ -8450,11 +8451,14 @@ class AllSubDevicesGetSearchDomain(TestMixins.AllSubDevicesGetMixin,
84508451
PID = 'SEARCH_DOMAIN'
84518452

84528453

8453-
# class GetSearchDomain(TestMixins.,
8454-
# OptionalParameterTestFixture):
8455-
# CATEGORY = TestCategory.
8456-
# PID = 'SEARCH_DOMAIN'
8457-
# TODO(peter): Test get
8454+
class GetSearchDomain(TestMixins.GetStringMixin,
8455+
OptionalParameterTestFixture):
8456+
CATEGORY = TestCategory.E133_MANAGEMENT
8457+
PID = 'SEARCH_DOMAIN'
8458+
EXPECTED_FIELDS = ['search_domain']
8459+
PROVIDES = ['search_domain']
8460+
MAX_LENGTH = RDM_MAX_SEARCH_DOMAIN_LENGTH
8461+
# TODO(Peter): Validate invalid search domains?
84588462

84598463

84608464
class GetSearchDomainWithData(TestMixins.GetWithDataMixin,
@@ -8465,7 +8469,7 @@ class GetSearchDomainWithData(TestMixins.GetWithDataMixin,
84658469

84668470
# class SetSearchDomain(TestMixins.,
84678471
# OptionalParameterTestFixture):
8468-
# CATEGORY = TestCategory.
8472+
# CATEGORY = TestCategory.E133_MANAGEMENT
84698473
# PID = 'SEARCH_DOMAIN'
84708474
# TODO(peter): Test set
84718475

@@ -8476,12 +8480,6 @@ class SetSearchDomainWithNoData(TestMixins.SetWithNoDataMixin,
84768480
PID = 'SEARCH_DOMAIN'
84778481

84788482

8479-
class SetSearchDomainWithExtraData(TestMixins.SetWithDataMixin,
8480-
OptionalParameterTestFixture):
8481-
"""Send a SET SEARCH_DOMAIN command with extra data."""
8482-
PID = 'SEARCH_DOMAIN'
8483-
8484-
84858483
class AllSubDevicesGetBrokerStatus(TestMixins.AllSubDevicesGetMixin,
84868484
OptionalParameterTestFixture):
84878485
"""Send a get BROKER_STATUS to ALL_SUB_DEVICES."""
@@ -8490,7 +8488,7 @@ class AllSubDevicesGetBrokerStatus(TestMixins.AllSubDevicesGetMixin,
84908488

84918489
# class GetBrokerStatus(TestMixins.,
84928490
# OptionalParameterTestFixture):
8493-
# CATEGORY = TestCategory.
8491+
# CATEGORY = TestCategory.E133_MANAGEMENT
84948492
# PID = 'BROKER_STATUS'
84958493
# TODO(peter): Test get
84968494

@@ -8503,7 +8501,7 @@ class GetBrokerStatusWithData(TestMixins.GetWithDataMixin,
85038501

85048502
# class SetBrokerStatus(TestMixins.,
85058503
# OptionalParameterTestFixture):
8506-
# CATEGORY = TestCategory.
8504+
# CATEGORY = TestCategory.E133_MANAGEMENT
85078505
# PID = 'BROKER_STATUS'
85088506
# TODO(peter): Test set
85098507

0 commit comments

Comments
 (0)