From 7301c94297d27287c6071630427e47bbc8421e6a Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 19 Jun 2022 20:38:51 +0900 Subject: [PATCH] tests: test object type instead of its instance No need to instantiate object to test. Signed-off-by: Takashi Sakamoto --- tests/alsactl-card | 4 ++-- tests/alsactl-card-info | 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-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 ++-- 31 files changed, 62 insertions(+), 62 deletions(-) diff --git a/tests/alsactl-card b/tests/alsactl-card index 3804d5b..265b2db 100644 --- a/tests/alsactl-card +++ b/tests/alsactl-card @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.Card() +target_type = ALSACtl.Card props = ( 'devnode', 'subscribed', @@ -39,5 +39,5 @@ signals = ( 'handle-disconnection', ) -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-card-info b/tests/alsactl-card-info index 10c71c4..3d8b65b 100644 --- a/tests/alsactl-card-info +++ b/tests/alsactl-card-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.CardInfo() +target_type = ALSACtl.CardInfo props = ( 'card-id', 'id', @@ -22,5 +22,5 @@ props = ( methods = () signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-boolean b/tests/alsactl-elem-info-boolean index 4f1baab..17d19c2 100644 --- a/tests/alsactl-elem-info-boolean +++ b/tests/alsactl-elem-info-boolean @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.ElemInfoBoolean.new() +target_type = ALSACtl.ElemInfoBoolean props = ( 'elem-id', 'elem-type', @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-bytes b/tests/alsactl-elem-info-bytes index a348ea1..792d2eb 100644 --- a/tests/alsactl-elem-info-bytes +++ b/tests/alsactl-elem-info-bytes @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.ElemInfoBytes.new() +target_type = ALSACtl.ElemInfoBytes props = ( 'elem-id', 'elem-type', @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-enumerated b/tests/alsactl-elem-info-enumerated index 286a130..dcb4843 100644 --- a/tests/alsactl-elem-info-enumerated +++ b/tests/alsactl-elem-info-enumerated @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.ElemInfoEnumerated.new() +target_type = ALSACtl.ElemInfoEnumerated props = ( 'elem-id', 'elem-type', @@ -23,5 +23,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-iec60958 b/tests/alsactl-elem-info-iec60958 index 0ce2709..d81d184 100644 --- a/tests/alsactl-elem-info-iec60958 +++ b/tests/alsactl-elem-info-iec60958 @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.ElemInfoIec60958.new() +target_type = ALSACtl.ElemInfoIec60958 props = ( 'elem-id', 'elem-type', @@ -21,5 +21,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-integer b/tests/alsactl-elem-info-integer index c9d1ba9..69a0323 100644 --- a/tests/alsactl-elem-info-integer +++ b/tests/alsactl-elem-info-integer @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.ElemInfoInteger.new() +target_type = ALSACtl.ElemInfoInteger props = ( 'elem-id', 'elem-type', @@ -25,5 +25,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-info-integer64 b/tests/alsactl-elem-info-integer64 index 8df4522..066fe2e 100644 --- a/tests/alsactl-elem-info-integer64 +++ b/tests/alsactl-elem-info-integer64 @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.ElemInfoInteger64.new() +target_type = ALSACtl.ElemInfoInteger64 props = ( 'elem-id', 'elem-type', @@ -25,5 +25,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsactl-elem-value b/tests/alsactl-elem-value index 0105c39..c4a55f7 100644 --- a/tests/alsactl-elem-value +++ b/tests/alsactl-elem-value @@ -9,7 +9,7 @@ import gi gi.require_version('ALSACtl', '0.0') from gi.repository import ALSACtl -target = ALSACtl.ElemValue() +target_type = ALSACtl.ElemValue props = ( 'elem-id', ) @@ -33,5 +33,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsahwdep-device-info b/tests/alsahwdep-device-info index 6ffb437..4d27ef8 100644 --- a/tests/alsahwdep-device-info +++ b/tests/alsahwdep-device-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSAHwdep', '0.0') from gi.repository import ALSAHwdep -target = ALSAHwdep.DeviceInfo() +target_type = ALSAHwdep.DeviceInfo props = ( 'device-id', 'card-id', @@ -20,5 +20,5 @@ props = ( methods = () signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-stream-pair b/tests/alsarawmidi-stream-pair index d8c3846..5bd2b1b 100644 --- a/tests/alsarawmidi-stream-pair +++ b/tests/alsarawmidi-stream-pair @@ -9,7 +9,7 @@ import gi gi.require_version('ALSARawmidi', '0.0') from gi.repository import ALSARawmidi -target = ALSARawmidi.StreamPair() +target_type = ALSARawmidi.StreamPair props = ( 'devnode', ) @@ -33,5 +33,5 @@ signals = ( 'handle-disconnection', ) -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-substream-info b/tests/alsarawmidi-substream-info index 5b19c5a..3d9e87b 100644 --- a/tests/alsarawmidi-substream-info +++ b/tests/alsarawmidi-substream-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSARawmidi', '0.0') from gi.repository import ALSARawmidi -target = ALSARawmidi.SubstreamInfo() +target_type = ALSARawmidi.SubstreamInfo props = ( 'device-id', 'subdevice-id', @@ -25,5 +25,5 @@ props = ( methods = () signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-substream-params b/tests/alsarawmidi-substream-params index 32cf015..5a1b631 100644 --- a/tests/alsarawmidi-substream-params +++ b/tests/alsarawmidi-substream-params @@ -9,7 +9,7 @@ import gi gi.require_version('ALSARawmidi', '0.0') from gi.repository import ALSARawmidi -target = ALSARawmidi.SubstreamParams() +target_type = ALSARawmidi.SubstreamParams props = ( 'buffer-size', 'avail-min', @@ -20,5 +20,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsarawmidi-substream-status b/tests/alsarawmidi-substream-status index 0dac6f0..876b649 100644 --- a/tests/alsarawmidi-substream-status +++ b/tests/alsarawmidi-substream-status @@ -9,7 +9,7 @@ import gi gi.require_version('ALSARawmidi', '0.0') from gi.repository import ALSARawmidi -target = ALSARawmidi.SubstreamStatus() +target_type = ALSARawmidi.SubstreamStatus props = ( 'avail', 'xruns', @@ -19,5 +19,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-client-info b/tests/alsaseq-client-info index 61c0e6a..b268f8e 100644 --- a/tests/alsaseq-client-info +++ b/tests/alsaseq-client-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.ClientInfo() +target_type = ALSASeq.ClientInfo props = ( 'client-id', 'type', @@ -28,5 +28,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-client-pool b/tests/alsaseq-client-pool index a22437f..fd5e1d1 100644 --- a/tests/alsaseq-client-pool +++ b/tests/alsaseq-client-pool @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.ClientPool() +target_type = ALSASeq.ClientPool props = ( 'client-id', 'output-pool', @@ -21,5 +21,5 @@ props = ( methods = () signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-port-info b/tests/alsaseq-port-info index c4b060a..bb166c2 100644 --- a/tests/alsaseq-port-info +++ b/tests/alsaseq-port-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.PortInfo() +target_type = ALSASeq.PortInfo props = ( 'name', 'caps', @@ -28,5 +28,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-info b/tests/alsaseq-queue-info index 2eb2dea..42fab07 100644 --- a/tests/alsaseq-queue-info +++ b/tests/alsaseq-queue-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.QueueInfo() +target_type = ALSASeq.QueueInfo props = ( 'queue-id', 'client-id', @@ -21,5 +21,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-status b/tests/alsaseq-queue-status index 0898d55..d5eca73 100644 --- a/tests/alsaseq-queue-status +++ b/tests/alsaseq-queue-status @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.QueueStatus() +target_type = ALSASeq.QueueStatus props = ( 'queue-id', 'event-count', @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-tempo b/tests/alsaseq-queue-tempo index a349484..8aca8f3 100644 --- a/tests/alsaseq-queue-tempo +++ b/tests/alsaseq-queue-tempo @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.QueueTempo() +target_type = ALSASeq.QueueTempo props = ( 'queue-id', 'tempo', @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-queue-timer-alsa b/tests/alsaseq-queue-timer-alsa index f933fae..7ac6f63 100644 --- a/tests/alsaseq-queue-timer-alsa +++ b/tests/alsaseq-queue-timer-alsa @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.QueueTimerAlsa() +target_type = ALSASeq.QueueTimerAlsa props = ( 'queue-id', 'timer-type', @@ -23,5 +23,5 @@ methods = ( signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-subscribe-data b/tests/alsaseq-subscribe-data index c0b4bcb..65c3225 100644 --- a/tests/alsaseq-subscribe-data +++ b/tests/alsaseq-subscribe-data @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.SubscribeData() +target_type = ALSASeq.SubscribeData props = ( 'sender', 'dest', @@ -23,5 +23,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-system-info b/tests/alsaseq-system-info index d302ac2..e9c43b1 100644 --- a/tests/alsaseq-system-info +++ b/tests/alsaseq-system-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.SystemInfo() +target_type = ALSASeq.SystemInfo props = ( 'maximum-queue-count', 'maximum-client-count', @@ -21,5 +21,5 @@ props = ( methods = () signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsaseq-user-client b/tests/alsaseq-user-client index cb23e52..5ec0b41 100644 --- a/tests/alsaseq-user-client +++ b/tests/alsaseq-user-client @@ -9,7 +9,7 @@ import gi gi.require_version('ALSASeq', '0.0') from gi.repository import ALSASeq -target = ALSASeq.UserClient() +target_type = ALSASeq.UserClient props = ( 'client-id', ) @@ -42,5 +42,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-device-info b/tests/alsatimer-device-info index dc2ef99..97e3123 100644 --- a/tests/alsatimer-device-info +++ b/tests/alsatimer-device-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSATimer', '0.0') from gi.repository import ALSATimer -target = ALSATimer.DeviceInfo() +target_type = ALSATimer.DeviceInfo props = ( 'flags', 'card-id', @@ -23,5 +23,5 @@ props = ( methods = () signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-device-params b/tests/alsatimer-device-params index 986761a..3778007 100644 --- a/tests/alsatimer-device-params +++ b/tests/alsatimer-device-params @@ -9,7 +9,7 @@ import gi gi.require_version('ALSATimer', '0.0') from gi.repository import ALSATimer -target = ALSATimer.DeviceParams() +target_type = ALSATimer.DeviceParams props = ( 'period-numerator', 'period-denominator', @@ -19,5 +19,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-device-status b/tests/alsatimer-device-status index 0a06c4c..4a1382d 100644 --- a/tests/alsatimer-device-status +++ b/tests/alsatimer-device-status @@ -9,7 +9,7 @@ import gi gi.require_version('ALSATimer', '0.0') from gi.repository import ALSATimer -target = ALSATimer.DeviceStatus() +target_type = ALSATimer.DeviceStatus props = ( 'resolution', 'resolution-numerator', @@ -20,5 +20,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-instance-info b/tests/alsatimer-instance-info index 8293b4e..25e1588 100644 --- a/tests/alsatimer-instance-info +++ b/tests/alsatimer-instance-info @@ -9,7 +9,7 @@ import gi gi.require_version('ALSATimer', '0.0') from gi.repository import ALSATimer -target = ALSATimer.InstanceInfo() +target_type = ALSATimer.InstanceInfo props = ( 'flags', 'card-id', @@ -20,5 +20,5 @@ props = ( methods = () signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-instance-params b/tests/alsatimer-instance-params index e9d90a2..293f9ed 100644 --- a/tests/alsatimer-instance-params +++ b/tests/alsatimer-instance-params @@ -9,7 +9,7 @@ import gi gi.require_version('ALSATimer', '0.0') from gi.repository import ALSATimer -target = ALSATimer.InstanceParams() +target_type = ALSATimer.InstanceParams props = ( 'flags', 'interval', @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-instance-status b/tests/alsatimer-instance-status index f8a453f..4135042 100644 --- a/tests/alsatimer-instance-status +++ b/tests/alsatimer-instance-status @@ -9,7 +9,7 @@ import gi gi.require_version('ALSATimer', '0.0') from gi.repository import ALSATimer -target = ALSATimer.InstanceStatus() +target_type = ALSATimer.InstanceStatus props = ( 'interval', 'lost', @@ -22,5 +22,5 @@ methods = ( ) signals = () -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) diff --git a/tests/alsatimer-user-instance b/tests/alsatimer-user-instance index 05aecb1..4b94906 100644 --- a/tests/alsatimer-user-instance +++ b/tests/alsatimer-user-instance @@ -9,7 +9,7 @@ import gi gi.require_version('ALSATimer', '0.0') from gi.repository import ALSATimer -target = ALSATimer.UserInstance() +target_type = ALSATimer.UserInstance props = () methods = ( 'new', @@ -36,5 +36,5 @@ signals = ( 'handle-disconnection', ) -if not test_object(target, props, methods, signals): +if not test_object(target_type, props, methods, signals): exit(ENXIO) -- 2.47.3