From b4291f4fa991ee912d7035977bd6be1616491e8b Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 19 Jun 2022 20:38:51 +0900 Subject: [PATCH] tests: rename helper function to test object interface It appears that some helper functions are required to test GObject interface, enumerations, and flags. This commit renames current helper function for objects. Signed-off-by: Takashi Sakamoto --- tests/alsactl-card | 4 ++-- tests/alsactl-card-info | 4 ++-- tests/alsactl-elem-id | 4 ++-- tests/alsactl-elem-info-boolean | 4 ++-- tests/alsactl-elem-info-bytes | 4 ++-- tests/alsactl-elem-info-enumerated | 4 ++-- tests/alsactl-elem-info-iec60958 | 4 ++-- tests/alsactl-elem-info-integer | 4 ++-- tests/alsactl-elem-info-integer64 | 4 ++-- tests/alsactl-elem-value | 4 ++-- tests/alsahwdep-device-info | 4 ++-- tests/alsarawmidi-stream-pair | 4 ++-- tests/alsarawmidi-substream-info | 4 ++-- tests/alsarawmidi-substream-params | 4 ++-- tests/alsarawmidi-substream-status | 4 ++-- tests/alsaseq-client-info | 4 ++-- tests/alsaseq-client-pool | 4 ++-- tests/alsaseq-port-info | 4 ++-- tests/alsaseq-queue-info | 4 ++-- tests/alsaseq-queue-status | 4 ++-- tests/alsaseq-queue-tempo | 4 ++-- tests/alsaseq-queue-timer-alsa | 4 ++-- tests/alsaseq-subscribe-data | 4 ++-- tests/alsaseq-system-info | 4 ++-- tests/alsaseq-user-client | 4 ++-- tests/alsatimer-device-id | 4 ++-- tests/alsatimer-device-info | 4 ++-- tests/alsatimer-device-params | 4 ++-- tests/alsatimer-device-status | 4 ++-- tests/alsatimer-instance-info | 4 ++-- tests/alsatimer-instance-params | 4 ++-- tests/alsatimer-instance-status | 4 ++-- tests/alsatimer-user-instance | 4 ++-- tests/helper.py | 2 +- 34 files changed, 67 insertions(+), 67 deletions(-) diff --git a/tests/alsactl-card b/tests/alsactl-card index e9d7702..3804d5b 100644 --- a/tests/alsactl-card +++ b/tests/alsactl-card @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -39,5 +39,5 @@ signals = ( 'handle-disconnection', ) -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-card-info b/tests/alsactl-card-info index 2961b97..10c71c4 100644 --- a/tests/alsactl-card-info +++ b/tests/alsactl-card-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -22,5 +22,5 @@ props = ( methods = () signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-id b/tests/alsactl-elem-id index 08f6b1e..0a1226e 100644 --- a/tests/alsactl-elem-id +++ b/tests/alsactl-elem-id @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-boolean b/tests/alsactl-elem-info-boolean index 5000201..4f1baab 100644 --- a/tests/alsactl-elem-info-boolean +++ b/tests/alsactl-elem-info-boolean @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-bytes b/tests/alsactl-elem-info-bytes index 378b3c4..a348ea1 100644 --- a/tests/alsactl-elem-info-bytes +++ b/tests/alsactl-elem-info-bytes @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-enumerated b/tests/alsactl-elem-info-enumerated index 26716ed..286a130 100644 --- a/tests/alsactl-elem-info-enumerated +++ b/tests/alsactl-elem-info-enumerated @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -23,5 +23,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-iec60958 b/tests/alsactl-elem-info-iec60958 index 5b98601..0ce2709 100644 --- a/tests/alsactl-elem-info-iec60958 +++ b/tests/alsactl-elem-info-iec60958 @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -21,5 +21,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-integer b/tests/alsactl-elem-info-integer index d5868a5..c9d1ba9 100644 --- a/tests/alsactl-elem-info-integer +++ b/tests/alsactl-elem-info-integer @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -25,5 +25,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-integer64 b/tests/alsactl-elem-info-integer64 index b9b8eb1..8df4522 100644 --- a/tests/alsactl-elem-info-integer64 +++ b/tests/alsactl-elem-info-integer64 @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -25,5 +25,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-value b/tests/alsactl-elem-value index 4d1e8f7..0105c39 100644 --- a/tests/alsactl-elem-value +++ b/tests/alsactl-elem-value @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSACtl', '0.0') @@ -33,5 +33,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsahwdep-device-info b/tests/alsahwdep-device-info index d1eff79..6ffb437 100644 --- a/tests/alsahwdep-device-info +++ b/tests/alsahwdep-device-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSAHwdep', '0.0') @@ -20,5 +20,5 @@ props = ( methods = () signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-stream-pair b/tests/alsarawmidi-stream-pair index 175b50e..d8c3846 100644 --- a/tests/alsarawmidi-stream-pair +++ b/tests/alsarawmidi-stream-pair @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSARawmidi', '0.0') @@ -33,5 +33,5 @@ signals = ( 'handle-disconnection', ) -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-substream-info b/tests/alsarawmidi-substream-info index f4dcf8e..5b19c5a 100644 --- a/tests/alsarawmidi-substream-info +++ b/tests/alsarawmidi-substream-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSARawmidi', '0.0') @@ -25,5 +25,5 @@ props = ( methods = () signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-substream-params b/tests/alsarawmidi-substream-params index f85a186..32cf015 100644 --- a/tests/alsarawmidi-substream-params +++ b/tests/alsarawmidi-substream-params @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSARawmidi', '0.0') @@ -20,5 +20,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-substream-status b/tests/alsarawmidi-substream-status index 8e6dc87..0dac6f0 100644 --- a/tests/alsarawmidi-substream-status +++ b/tests/alsarawmidi-substream-status @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSARawmidi', '0.0') @@ -19,5 +19,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-client-info b/tests/alsaseq-client-info index de93e0a..61c0e6a 100644 --- a/tests/alsaseq-client-info +++ b/tests/alsaseq-client-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -28,5 +28,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-client-pool b/tests/alsaseq-client-pool index cbd5744..a22437f 100644 --- a/tests/alsaseq-client-pool +++ b/tests/alsaseq-client-pool @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -21,5 +21,5 @@ props = ( methods = () signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-port-info b/tests/alsaseq-port-info index 11b2673..c4b060a 100644 --- a/tests/alsaseq-port-info +++ b/tests/alsaseq-port-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -28,5 +28,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-info b/tests/alsaseq-queue-info index 2220bb2..2eb2dea 100644 --- a/tests/alsaseq-queue-info +++ b/tests/alsaseq-queue-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -21,5 +21,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-status b/tests/alsaseq-queue-status index aabcf68..0898d55 100644 --- a/tests/alsaseq-queue-status +++ b/tests/alsaseq-queue-status @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-tempo b/tests/alsaseq-queue-tempo index 6cf80e4..a349484 100644 --- a/tests/alsaseq-queue-tempo +++ b/tests/alsaseq-queue-tempo @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-timer-alsa b/tests/alsaseq-queue-timer-alsa index afba868..f933fae 100644 --- a/tests/alsaseq-queue-timer-alsa +++ b/tests/alsaseq-queue-timer-alsa @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -23,5 +23,5 @@ methods = ( signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-subscribe-data b/tests/alsaseq-subscribe-data index 9d4cca2..c0b4bcb 100644 --- a/tests/alsaseq-subscribe-data +++ b/tests/alsaseq-subscribe-data @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -23,5 +23,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-system-info b/tests/alsaseq-system-info index 22e5909..d302ac2 100644 --- a/tests/alsaseq-system-info +++ b/tests/alsaseq-system-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -21,5 +21,5 @@ props = ( methods = () signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-user-client b/tests/alsaseq-user-client index cee0f5a..cb23e52 100644 --- a/tests/alsaseq-user-client +++ b/tests/alsaseq-user-client @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSASeq', '0.0') @@ -42,5 +42,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-device-id b/tests/alsatimer-device-id index f5b1e25..009c4da 100644 --- a/tests/alsatimer-device-id +++ b/tests/alsatimer-device-id @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-device-info b/tests/alsatimer-device-info index 1032968..dc2ef99 100644 --- a/tests/alsatimer-device-info +++ b/tests/alsatimer-device-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -23,5 +23,5 @@ props = ( methods = () signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-device-params b/tests/alsatimer-device-params index 5474794..986761a 100644 --- a/tests/alsatimer-device-params +++ b/tests/alsatimer-device-params @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -19,5 +19,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-device-status b/tests/alsatimer-device-status index d069a1a..0a06c4c 100644 --- a/tests/alsatimer-device-status +++ b/tests/alsatimer-device-status @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -20,5 +20,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-instance-info b/tests/alsatimer-instance-info index 59ba773..8293b4e 100644 --- a/tests/alsatimer-instance-info +++ b/tests/alsatimer-instance-info @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -20,5 +20,5 @@ props = ( methods = () signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-instance-params b/tests/alsatimer-instance-params index 358ea70..e9d90a2 100644 --- a/tests/alsatimer-instance-params +++ b/tests/alsatimer-instance-params @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-instance-status b/tests/alsatimer-instance-status index be3ca1e..f8a453f 100644 --- a/tests/alsatimer-instance-status +++ b/tests/alsatimer-instance-status @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-user-instance b/tests/alsatimer-user-instance index b287ed2..05aecb1 100644 --- a/tests/alsatimer-user-instance +++ b/tests/alsatimer-user-instance @@ -3,7 +3,7 @@ from sys import exit from errno import ENXIO -from helper import test +from helper import test_object import gi gi.require_version('ALSATimer', '0.0') @@ -36,5 +36,5 @@ signals = ( 'handle-disconnection', ) -if not test(target, props, methods, signals): +if not test_object(target, props, methods, signals): exit(ENXIO) diff --git a/tests/helper.py b/tests/helper.py index 35a8d64..f67c6cb 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -2,7 +2,7 @@ import gi gi.require_version('GObject', '2.0') from gi.repository import GObject -def test(target, props, methods, signals) ->bool: +def test_object(target, props, methods, signals) ->bool: labels = [prop.name for prop in target.props] for prop in props: if prop not in labels: -- 2.47.3