On 10/3/19 5:18 AM, Jiunn Chang wrote:
> Analog tuner control test tuner_ctl_test():
> - give analog tuner status
> - select tuner analog service
> - analog tuner step features
>
> Signed-off-by: Jiunn Chang <c0d1n61...@gmail.com>
> ---
> utils/cec-compliance/cec-test.cpp | 74 +++++++++++++++++++++++++++++++
> 1 file changed, 74 insertions(+)
>
> diff --git a/utils/cec-compliance/cec-test.cpp
> b/utils/cec-compliance/cec-test.cpp
> index 017d1ef8..669df4b7 100644
> --- a/utils/cec-compliance/cec-test.cpp
> +++ b/utils/cec-compliance/cec-test.cpp
> @@ -16,6 +16,7 @@
> #include <sys/ioctl.h>
> #include <config.h>
> #include <sstream>
> +#include <vector>
>
> #include "cec-compliance.h"
>
> @@ -722,6 +723,78 @@ static struct remote_subtest deck_ctl_subtests[] = {
> TODO: These are very rudimentary tests which should be expanded.
> */
>
> +static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool
> interactive)
> +{
> + struct cec_msg msg = {};
> + struct cec_op_tuner_device_info info = {};
> + __u16 start_freq;
> + std::vector<struct cec_op_tuner_device_info> info_vec;
> +
> + cec_msg_init(&msg, me, la);
> + cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE);
> + fail_on_test(!transmit_timeout(node, &msg));
> + if (timed_out(&msg) || unrecognized_op(&msg))
> + return NOTSUPPORTED;
> + if (refused(&msg))
> + return REFUSED;
You're missing a 'fail_on_test(cec_msg_status_is_abort(&msg));' line here,
since any other abort reason means the test should fail.
> + cec_ops_tuner_device_status(&msg, &info);
> + start_freq = info.analog.ana_freq;
> + info_vec.push_back(info);
> +
> + while (1) {
> + cec_msg_init(&msg, me, la);
> + cec_msg_tuner_step_increment(&msg);
> + fail_on_test(!transmit_timeout(node, &msg));
> + fail_on_test(cec_msg_status_is_abort(&msg));
> + if (cec_msg_status_is_abort(&msg)) {
> + fail_on_test(abort_reason(&msg) ==
> CEC_OP_ABORT_UNRECOGNIZED_OP);
> + if (abort_reason(&msg) == CEC_OP_ABORT_REFUSED) {
> + warn("Tuner step increment does not wrap.\n");
> + break;
> + } else {
> + warn("Tuner at end of service list did not
> receive feature abort refused.\n");
> + break;
> + }
> + }
> + cec_msg_init(&msg, me, la);
> + cec_msg_give_tuner_device_status(&msg, true,
> CEC_OP_STATUS_REQ_ONCE);
> + fail_on_test(!transmit_timeout(node, &msg));
> + fail_on_test(timed_out_or_abort(&msg));
> + cec_ops_tuner_device_status(&msg, &info);
> + if (info.analog.ana_freq == start_freq)
> + break;
> + info_vec.push_back(info);
> + }
> +
> + for (std::vector<struct cec_op_tuner_device_info>::iterator iter =
> info_vec.begin();
> + iter != info_vec.end(); iter++) {
> + cec_msg_init(&msg, me, la);
> + cec_msg_select_analogue_service(&msg,
> iter->analog.ana_bcast_type,
> + iter->analog.ana_freq, iter->analog.bcast_system);
> + fail_on_test(!transmit_timeout(node, &msg));
> + fail_on_test(cec_msg_status_is_abort(&msg));
> + cec_msg_init(&msg, me, la);
> + cec_msg_give_tuner_device_status(&msg, true,
> CEC_OP_STATUS_REQ_ONCE);
> + fail_on_test(!transmit_timeout(node, &msg));
> + fail_on_test(timed_out_or_abort(&msg));
> + cec_ops_tuner_device_status(&msg, &info);
> + fail_on_test(info.analog.ana_freq != iter->analog.ana_freq);
> + if (iter->is_analog) {
> + double freq_mhz = (iter->analog.ana_freq * 625) /
> 10000.0;
Add newline.
> + info("Analog channel freq: %.2f MHz\n", freq_mhz);
> + }
> + }
> +
> + cec_msg_init(&msg, me, la);
> + cec_msg_select_analogue_service(&msg, 3, 16000, 9);
> + fail_on_test(!transmit_timeout(node, &msg));
> + fail_on_test(!cec_msg_status_is_abort(&msg));
> + fail_on_test(unrecognized_op(&msg));
This test is unnecessary, since the next test will catch this.
> + fail_on_test(abort_reason(&msg) != CEC_OP_ABORT_INVALID_OP);
> +
> + return 0;
> +}
> +
> static int tuner_ctl_give_status(struct node *node, unsigned me, unsigned
> la, bool interactive)
> {
> struct cec_msg msg = {};
> @@ -885,6 +958,7 @@ static int tuner_ctl_step_inc(struct node *node, unsigned
> me, unsigned la, bool
> }
>
> static struct remote_subtest tuner_ctl_subtests[] = {
> + { "Tuner Control", CEC_LOG_ADDR_MASK_TUNER | CEC_LOG_ADDR_MASK_TV,
> tuner_ctl_test },
> { "Give Tuner Device Status", CEC_LOG_ADDR_MASK_TUNER,
> tuner_ctl_give_status },
> { "Select Analogue Service", CEC_LOG_ADDR_MASK_TUNER,
> tuner_ctl_sel_analog_service },
> { "Select Digital Service", CEC_LOG_ADDR_MASK_TUNER,
> tuner_ctl_sel_digital_service },
>
Regards,
Hans
