summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README10
-rw-r--r--test-introspect.xml21
2 files changed, 20 insertions, 11 deletions
diff --git a/README b/README
index 537832a..5a084e5 100644
--- a/README
+++ b/README
@@ -6,6 +6,9 @@ description of the function:
test-introspect.xml
+The SingleTests Tests and TestSignals interfaces should be implemented by the
+servers. The TestClient interface should be implemented by the client.
+
Servers must also support:
Peer.Ping
@@ -47,3 +50,10 @@ Ignoring tests:
Tests can be ignored if you know they are going to fail. This will print a
list of ignored fails. To ignore tests create a file cross-test-ignore
containing a list of interface.function, one per line.
+
+A note on Signals:
+
+ The tests involve two signals. Triggered is sent from the server to the
+ client when the Trigger() method is called. The client sends Trigger to the
+ server which should cause Response() to be called by the server on the
+ client.
diff --git a/test-introspect.xml b/test-introspect.xml
index d1c75f1..89bf29e 100644
--- a/test-introspect.xml
+++ b/test-introspect.xml
@@ -167,27 +167,26 @@
<annotation name="org.freedesktop.DBus.Description" value="Causes server process to exit"/>
</method>
</interface>
-
+
<interface name="org.freedesktop.DBus.Binding.TestSignals">
<annotation name="org.freedesktop.DBus.Description" value="Signals that can be sent within the tests."/>
<signal name="Triggered">
- <annotation name="org.freedesktop.DBus.Description" value="Sent in response to a method call"/>
+ <annotation name="org.freedesktop.DBus.Description" value="Sent in response to method call Tests.Trigger"/>
<arg type="t" name="parameter"/>
</signal>
-
- <signal name="Trigger">
- <annotation name="org.freedesktop.DBus.Description" value="Causes a callback"/>
- <arg type="q" name="parameter1"/>
- <arg type="d" name="parameter2"/>
- </signal>
</interface>
- <interface name="org.freedesktop.DBus.Binding.TestCallbacks">
- <annotation name="org.freedesktop.DBus.Description" value="Callbacks to be made on the client."/>
+ <interface name="org.freedesktop.DBus.Binding.TestClient">
+ <annotation name="org.freedesktop.DBus.Description" value="Interface on the client side"/>
<method name="Response" >
- <annotation name="org.freedesktop.DBus.Description" value="when the trigger signal is received, this method should be called on the sending service/object."/>
+ <annotation name="org.freedesktop.DBus.Description" value="To be called by the server upon receiving signal TestClient.Trigger using the path it came from"/>
<arg type="q" name="input1" direction="in"/>
<arg type="d" name="input2" direction="in"/>
</method>
+ <signal name="Trigger">
+ <annotation name="org.freedesktop.DBus.Description" value="Causes a callback to TestClient.Response"/>
+ <arg type="q" name="parameter1"/>
+ <arg type="d" name="parameter2"/>
+ </signal>
</interface>
</node>