From ff48a7090649d032f3e81e88ac24027f8b639376 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 4 Jan 2011 16:01:39 +0000
Subject: [PATCH 4/6] Test that interfaces, methods, properties, signals can be annotated

---
 test/interfaces/Makefile.am           |   20 ++++++++++++++++++--
 test/interfaces/valid-annotations.xml |   21 +++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 test/interfaces/valid-annotations.xml

diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
index ed5bc16..a3d2da0 100644
--- a/test/interfaces/Makefile.am
+++ b/test/interfaces/Makefile.am
@@ -20,7 +20,15 @@ else
 TESTS=
 endif
 
-EXTRA_DIST=run-test.sh test-goodbye.xml  test-hello.xml  test-song.xml test-dup-prop-a.xml test-dup-prop-b.xml
+EXTRA_DIST = \
+	run-test.sh \
+	test-goodbye.xml \
+	test-hello.xml \
+	test-song.xml \
+	test-dup-prop-a.xml \
+	test-dup-prop-b.xml \
+	valid-annotations.xml \
+	$(NULL)
 
 if DBUS_BUILD_TESTS
 
@@ -52,7 +60,10 @@ BUILT_SOURCES = \
 	test-dup-prop-a-bindings.h \
 	test-dup-prop-a-bindings.h \
 	test-dup-prop-b-bindings.h \
-	test-dup-prop-b-bindings.h
+	test-dup-prop-b-bindings.h \
+	valid-annotations-glue.h \
+	valid-annotations-bindings.h \
+	$(NULL)
 
 test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
@@ -84,6 +95,11 @@ test-dup-prop-b-glue.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-to
 test-dup-prop-b-bindings.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_dup_prop_b --mode=glib-client --output=test-dup-prop-b-bindings.h $(srcdir)/test-dup-prop-b.xml
 
+valid-annotations-glue.h: valid-annotations.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+	$(DBUS_BINDING_TOOL) --prefix=test_annotated --mode=glib-server --output=$@ $<
+
+valid-annotations-bindings.h: valid-annotations.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+	$(DBUS_BINDING_TOOL) --prefix=test_annotated --mode=glib-client --output=$@ $<
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
diff --git a/test/interfaces/valid-annotations.xml b/test/interfaces/valid-annotations.xml
new file mode 100644
index 0000000..6c6cc85
--- /dev/null
+++ b/test/interfaces/valid-annotations.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><!-- ex:set et ts=2: -->
+<node name="/org/freedesktop/DBus/GLib/Test/Interfaces">
+  <interface name="org.freedesktop.DBus.GLib.Test.Interfaces.Annotated">
+    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="test_annotated"/>
+    <annotation name="com.example.Annotatable" value="yes"/>
+
+    <method name="DoThings">
+      <annotation name="com.example.Annotatable" value="yeah"/>
+      <arg name="message" type="s" direction="out" />
+    </method>
+
+    <signal name="ThingsDone">
+      <annotation name="com.example.Annotatable" value="fd.o#27598 says so"/>
+      <arg name="message" type="s" />
+    </signal>
+
+    <property name="Things" type="s" access="read">
+      <annotation name="com.example.Annotatable" value="hopefully"/>
+    </property>
+  </interface>
+</node>
-- 
1.7.2.3