diff options
Diffstat (limited to 'src/tests/com.example.Frob.xml')
-rw-r--r-- | src/tests/com.example.Frob.xml | 108 |
1 files changed, 71 insertions, 37 deletions
diff --git a/src/tests/com.example.Frob.xml b/src/tests/com.example.Frob.xml index 9027d7f..c3aa63f 100644 --- a/src/tests/com.example.Frob.xml +++ b/src/tests/com.example.Frob.xml @@ -6,10 +6,10 @@ <annotation name="org.gtk.EggDBus.DocString" value="The #Point type is used for 2D integer points."/> <annotation name="org.gtk.EggDBus.DocString.Summary" value="2D point"/> - <annotation name="org.gtk.EggDBus.Struct.Member" value="i:x"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Int32:x"> <annotation name="org.gtk.EggDBus.DocString" value="The X coordinate"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="i:y"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Int32:y"> <annotation name="org.gtk.EggDBus.DocString" value="The Y coordinate"/> </annotation> </annotation> @@ -18,10 +18,10 @@ <annotation name="org.gtk.EggDBus.DocString" value="The #Pair type is used to group two integers together."/> <annotation name="org.gtk.EggDBus.DocString.Summary" value="Pair of integers"/> - <annotation name="org.gtk.EggDBus.Struct.Member" value="i:first"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Int32:first"> <annotation name="org.gtk.EggDBus.DocString" value="The first element"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="i:second"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Int32:second"> <annotation name="org.gtk.EggDBus.DocString" value="The second element"/> </annotation> </annotation> @@ -30,12 +30,12 @@ <annotation name="org.gtk.EggDBus.DocString" value="Test type for wrapping (s(ii))."/> <annotation name="org.gtk.EggDBus.DocString.Summary" value="Described point"/> - <annotation name="org.gtk.EggDBus.Struct.Member" value="s:desc"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="String:desc"> <annotation name="org.gtk.EggDBus.DocString" value="A description of the described point"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="(ii):point"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Point:point"> + <annotation name="org.gtk.EggDBus.Type" value="Point"/> <annotation name="org.gtk.EggDBus.DocString" value="The point being described"/> - <annotation name="org.gtk.EggDBus.StructType" value="Point"/> </annotation> </annotation> @@ -43,12 +43,12 @@ <annotation name="org.gtk.EggDBus.DocString" value="Test type for wrapping (s(ii))."/> <annotation name="org.gtk.EggDBus.DocString.Summary" value="Described pair"/> - <annotation name="org.gtk.EggDBus.Struct.Member" value="s:desc"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="String:desc"> <annotation name="org.gtk.EggDBus.DocString" value="A description of the described pair"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="(ii):pair"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Pair:pair"> + <annotation name="org.gtk.EggDBus.Type" value="Pair"/> <annotation name="org.gtk.EggDBus.DocString" value="The pair being described"/> - <annotation name="org.gtk.EggDBus.StructType" value="Pair"/> </annotation> </annotation> @@ -56,14 +56,14 @@ <annotation name="org.gtk.EggDBus.DocString" value="Test type for wrapping (s(ii)s)."/> <annotation name="org.gtk.EggDBus.DocString.Summary" value="Extended described point"/> - <annotation name="org.gtk.EggDBus.Struct.Member" value="s:desc"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="String:desc"> <annotation name="org.gtk.EggDBus.DocString" value="A description of the described point"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="(ii):point"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Point:point"> + <annotation name="org.gtk.EggDBus.Type" value="Point"/> <annotation name="org.gtk.EggDBus.DocString" value="The point being described"/> - <annotation name="org.gtk.EggDBus.StructType" value="Point"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="s:ext_desc"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="String:ext_desc"> <annotation name="org.gtk.EggDBus.DocString" value="An extended description of the point"/> </annotation> </annotation> @@ -72,19 +72,19 @@ <annotation name="org.gtk.EggDBus.DocString" value="Test type for a complex structure (siivi)."/> <annotation name="org.gtk.EggDBus.DocString.Summary" value="Complex structure"/> - <annotation name="org.gtk.EggDBus.Struct.Member" value="s:name"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="String:name"> <annotation name="org.gtk.EggDBus.DocString" value="A name"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="i:anger_level"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Int32:anger_level"> <annotation name="org.gtk.EggDBus.DocString" value="The level of anger"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="i:threat_level"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Int32:threat_level"> <annotation name="org.gtk.EggDBus.DocString" value="The level of threat"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="v:a_variant"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Variant:a_variant"> <annotation name="org.gtk.EggDBus.DocString" value="Some variant"/> </annotation> - <annotation name="org.gtk.EggDBus.Struct.Member" value="i:override_c_type"> + <annotation name="org.gtk.EggDBus.Struct.Member" value="Int32:override_c_type"> <annotation name="org.gtk.EggDBus.DocString" value="Some primitive type"/> <annotation name="org.gtk.EggDBus.CType" value="TestSomeExampleCType"/> </annotation> @@ -158,10 +158,18 @@ </method> <method name="TestStructureTypes"> - <arg direction="in" type="(ii)" name="s1" /> - <arg direction="in" type="(s(ii))" name="s2" /> - <arg direction="out" type="(ii)" /> - <arg direction="out" type="(s(ii))" /> + <arg direction="in" type="(ii)" name="s1"> + <annotation name="org.gtk.EggDBus.Type" value="Point"/> + </arg> + <arg direction="in" type="(s(ii))" name="s2"> + <annotation name="org.gtk.EggDBus.Type" value="DescribedPoint"/> + </arg> + <arg direction="out" type="(ii)"> + <annotation name="org.gtk.EggDBus.Type" value="Point"/> + </arg> + <arg direction="out" type="(s(ii))"> + <annotation name="org.gtk.EggDBus.Type" value="DescribedPoint"/> + </arg> </method> <method name="TestArrayOfStructureTypes"> @@ -219,29 +227,47 @@ <arg direction="out" type="a{sat}" /> <arg direction="in" type="a{sad}" name="hsad" /> <arg direction="out" type="a{sad}" /> - <arg direction="in" type="a{sa(ii)}" name="hash_of_point_arrays" /> - <arg direction="out" type="a{sa(ii)}" name="new_hash_of_point_arrays" /> + <arg direction="in" type="a{sa(ii)}" name="hash_of_point_arrays"> + <annotation name="org.gtk.EggDBus.Type" value="Dict<String,Array<Point>>"/> + </arg> + <arg direction="out" type="a{sa(ii)}" name="new_hash_of_point_arrays"> + <annotation name="org.gtk.EggDBus.Type" value="Dict<String,Array<Point>>"/> + </arg> </method> <method name="TestHashTableOfStructures"> - <arg direction="in" type="a{s(ii)}" name="hash_of_points" /> - <arg direction="out" type="a{s(s(ii))}" name="hash_of_described_points" /> + <arg direction="in" type="a{s(ii)}" name="hash_of_points"> + <annotation name="org.gtk.EggDBus.Type" value="Dict<String,Point>"/> + </arg> + <arg direction="out" type="a{s(s(ii))}" name="hash_of_described_points"> + <annotation name="org.gtk.EggDBus.Type" value="Dict<String,DescribedPoint>"/> + </arg> </method> <method name="TestHashTableOfHashTablesOfStructures"> - <arg direction="in" type="a{sa{s(ii)}}" name="hash_of_hash_of_points" /> - <arg direction="out" type="a{sa{s(ii)}}" name="new_hash_of_hash_of_points" /> + <arg direction="in" type="a{sa{s(ii)}}" name="hash_of_hash_of_points"> + <annotation name="org.gtk.EggDBus.Type" value="Dict<String,Dict<String,Point>>"/> + </arg> + <arg direction="out" type="a{sa{s(ii)}}" name="new_hash_of_hash_of_points"> + <annotation name="org.gtk.EggDBus.Type" value="Dict<String,Dict<String,Point>>"/> + </arg> </method> <method name="TestArrayOfHashTablesOfStructures"> - <arg direction="in" type="aa{s(ii)}" name="array_of_hash_of_points" /> - <arg direction="out" type="aa{s(ii)}" name="new_array_of_hash_of_points" /> + <arg direction="in" type="aa{s(ii)}" name="array_of_hash_of_points"> + <annotation name="org.gtk.EggDBus.Type" value="Array<Dict<String,Point>>"/> + </arg> + <arg direction="out" type="aa{s(ii)}" name="new_array_of_hash_of_points"> + <annotation name="org.gtk.EggDBus.Type" value="Array<Dict<String,Point>>"/> + </arg> </method> <method name="TestArrayOfArrays"> <!-- TODO: add tests for signature type --> <arg direction="in" type="aas" name="aas" /> - <arg direction="in" type="aa(ii)" name="aastruct" /> + <arg direction="in" type="aa(ii)" name="aastruct"> + <annotation name="org.gtk.EggDBus.Type" value="Array<Array<Point>>"/> + </arg> <arg direction="in" type="aao" name="aao" /> <arg direction="in" type="aai" name="aai" /> <arg direction="in" type="aay" name="aay" /> @@ -254,7 +280,9 @@ <arg direction="in" type="aad" name="aad" /> <arg direction="in" type="aaas" name="aaas" /> <arg direction="out" type="aas" name="ret_aas"/> - <arg direction="out" type="aa(ii)" name="ret_aastruct"/> + <arg direction="out" type="aa(ii)" name="ret_aastruct"> + <annotation name="org.gtk.EggDBus.Type" value="Array<Array<Point>>"/> + </arg> <arg direction="out" type="aao" name="ret_aao"/> <arg direction="out" type="aai" name="ret_aai"/> <arg direction="out" type="aay" name="ret_aay"/> @@ -324,10 +352,16 @@ </signal> <signal name="SignalWithStructureAndHash"> - <arg type="(ii)" name="point" /> - <arg type="(s(ii))" name="described-point" /> - <arg type="a{ss}" name="hash_of_string_to_stirng" /> - <arg type="a{s(ii)}" name="hash_of_string_to_point" /> + <arg type="(ii)" name="point"> + <annotation name="org.gtk.EggDBus.Type" value="Point"/> + </arg> + <arg type="(s(ii))" name="described-point"> + <annotation name="org.gtk.EggDBus.Type" value="DescribedPoint"/> + </arg> + <arg type="a{ss}" name="hash_of_string_to_string" /> + <arg type="a{s(ii)}" name="hash_of_string_to_point"> + <annotation name="org.gtk.EggDBus.Type" value="Dict<String,Point>"/> + </arg> </signal> <method name="EmitTestSignals"> |