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 <o-takashi@sakamocchi.jp>

diff --git a/tests/alsactl-card b/tests/alsactl-card
index e9d7702a008aebcf50b529335a5eaaec3da15c97..3804d5b230e9f444a8fda355922072b39a7178dd 100644 (file)
--- 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 2961b979cea1f91ea7f0aeb2f4f1e2cd7893a077..10c71c437fbe21c5493d07895c7d0f7ef5ceaf2d 100644 (file)
--- 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 08f6b1eeeda784c6dfa26692c04c90d99c42c10b..0a1226e1d634fe8f4ba1144c85bb03e700128c30 100644 (file)
--- 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 500020100c896677b7353862267487ee2fcb1af8..4f1baab7563c82468702bcd021ca2a666698400a 100644 (file)
--- 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 378b3c4a577f1d2e80c05c45487517ed6ad74782..a348ea12adb4facf13a533ee8646918d4ef88f4f 100644 (file)
--- 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 26716edff3d3bd2cd6c896133929da5d0b855b7b..286a1305e5073e7d717f8f00eed659bd9b674070 100644 (file)
--- 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 5b986019fe5a801a0a6a07754398f379b4104ccf..0ce270916c23ddbe24e62a902fb3b864bebbe0cb 100644 (file)
--- 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 d5868a5e22d261e0a0283601edb9be4001cefa0d..c9d1ba941c78fcee2de6bb33006a48239a76452e 100644 (file)
--- 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 b9b8eb130c719838743d8db7e86998c902641e9c..8df4522f2421161969ea197ae71c3c73d864beb3 100644 (file)
--- 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 4d1e8f7a27cdff0897c87c5e60ed447ebc7cdd10..0105c3974b34ac2e092543fbb062c970af54757e 100644 (file)
--- 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 d1eff794b91c1878aecec6fbef01f8c82f6fd023..6ffb437f5a6a76517f5d8009625ab7274070b43d 100644 (file)
--- 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 175b50e2dd3636dacde618d8448c5412c76aa2f1..d8c3846f1c504b2ca3b78c2f7402881aae597613 100644 (file)
--- 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 f4dcf8eb2f09e253f0750f46bd7f6c3595398101..5b19c5a2a89db65fb6dfa5d53111b2407c6690e2 100644 (file)
--- 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 f85a18644ef3c0e7e53838f0ca89502709f36e69..32cf0152541bcd235ee846beff9591a9b5338098 100644 (file)
--- 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 8e6dc8746d31ad3d11713f31c32c9a1292655323..0dac6f033e92ad0caa023c41e3d4d55ea418a45f 100644 (file)
--- 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 de93e0ad7d983b6529b28259a92df129e6ee9dc6..61c0e6a4f29959c6d4d36779df82d0ca21745e64 100644 (file)
--- 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 cbd5744407012992b96830b0624e3f2d0c2cf43e..a22437faec59047dff4788b420f0ea2d854bd9cd 100644 (file)
--- 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 11b26731c9063ef2c474c6e399f69c985a8db662..c4b060af78ade44f3f0ffc64b0ce9477776cb96a 100644 (file)
--- 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 2220bb224f2f7f163723160cf3c91ea9049c1a41..2eb2dea1e6ba7a585dddd316272a46c18536e800 100644 (file)
--- 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 aabcf68bbc1fdcd908066c899f7e95dc6cc687a7..0898d55864bdac94f337e080ee6d5921ea0b8d0f 100644 (file)
--- 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 6cf80e4bd9c30c65c55554543f3bbf34a8450ec1..a3494845b605c77735b6863bc9064677cbf98d03 100644 (file)
--- 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 afba8686e8f0fe58112530a5d2cbb0d9411b6f3a..f933faebfc8157d3de4dd06db01d5921bf1748ee 100644 (file)
--- 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 9d4cca287a7b94002518a18f07063988f50f7acb..c0b4bcbb3d4199d0b992966993eac2326a016fa1 100644 (file)
--- 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 22e5909b8c4c8af2767aedc0b0f2f2a180e41b85..d302ac21ada6f5269f86a22b2bcf0ce8bbf3cb4e 100644 (file)
--- 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 cee0f5a150c0ced524aca9a5578a527cce240f6f..cb23e520328291eea08686ff1983708fc07c2834 100644 (file)
--- 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 f5b1e256215ecd5f545d7b5a64bb52599808ff37..009c4da962f8145f809c483a6c4c82c07e560b5b 100644 (file)
--- 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 103296884139effe437ab7941d0ae405f66a5030..dc2ef9981570dca60658d710f98cfe71ea6a3aac 100644 (file)
--- 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 5474794ec388a1f192aa250db21192612f8852f3..986761a99a2d27c47cbb9fd31eb5d3f4d8304625 100644 (file)
--- 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 d069a1a6227a1dbb47343d9941c7d8b3cc253daa..0a06c4c75488a364c8571446a5e78badea9cbc1a 100644 (file)
--- 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 59ba7734a7d9f0ce40bf8ee4ab2dcb0647fdac03..8293b4e04b5baf37e2705e96aa6f611ae2841c02 100644 (file)
--- 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 358ea70399dacdcc11c42dbeac5602a2527b7509..e9d90a2524194c11355424f86b60c36266fc37d0 100644 (file)
--- 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 be3ca1ec917d28cf518b9197d672f352c251f84c..f8a453fbdc741f7c1bc3bd385de81676f51d8baa 100644 (file)
--- 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 b287ed21342ae4f3fe6e3fa092d858b76ce73ed6..05aecb19ef418812a64b6684d7faca7c4bf89600 100644 (file)
--- 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 35a8d647c2dbff039b8478f3f18a8ab678168690..f67c6cb9e64806128b19e30b6ecb697c2bab0ee5 100644 (file)
--- 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: