Update tests (partly correct)

diff --git a/tests/annotations/deprecated-struct-minimal.c-expected b/tests/annotations/deprecated-struct-minimal.c-expected
index 3d4d43d767475dd1be0e16d2cb625b7087892b3d..efadce8338752c3b000c4f948101b5865643e89d 100644 (file)
--- a/tests/annotations/deprecated-struct-minimal.c-expected
+++ b/tests/annotations/deprecated-struct-minimal.c-expected
@@ -15,7 +15,7 @@
 typedef struct _Foo Foo;
 
 struct _Foo {
-       void* bar;
+       void* bar G_GNUC_DEPRECATED ;
 } G_GNUC_DEPRECATED ;
 
 static void _vala_main (void);

diff --git a/tests/annotations/deprecated.c-expected b/tests/annotations/deprecated.c-expected
index ae88465b71b37f1a81cd7ccaba6da49c70714205..5898dbe7061ec5e000786d438d4611384ce827c0 100644 (file)
--- a/tests/annotations/deprecated.c-expected
+++ b/tests/annotations/deprecated.c-expected
@@ -97,7 +97,7 @@ struct _FooClassClass {
 };
 
 struct _FooClassPrivate {
-       gint _bar;
+       gint _bar G_GNUC_DEPRECATED ;
 };
 
 struct _AFoo {
@@ -133,8 +133,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (FooClass, g_object_unref)
 VALA_EXTERN gint fooclass_foov (FooClass* self) G_GNUC_DEPRECATED ;
 VALA_EXTERN gint fooclass_foo (FooClass* self) G_GNUC_DEPRECATED ;
 static gint fooclass_real_foov (FooClass* self) G_GNUC_DEPRECATED ;
-VALA_EXTERN FooClass* fooclass_new (void);
-VALA_EXTERN FooClass* fooclass_construct (GType object_type);
+VALA_EXTERN FooClass* fooclass_new (void) G_GNUC_DEPRECATED ;
+VALA_EXTERN FooClass* fooclass_construct (GType object_type) G_GNUC_DEPRECATED ;
 VALA_EXTERN gint fooclass_get_bar (FooClass* self) G_GNUC_DEPRECATED ;
 VALA_EXTERN void fooclass_set_bar (FooClass* self,
                        gint value) G_GNUC_DEPRECATED ;
@@ -153,7 +153,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (AFoo, g_object_unref)
 VALA_EXTERN gint afoo_fooa (AFoo* self) G_GNUC_DEPRECATED ;
 VALA_EXTERN gint afoo_foo (AFoo* self) G_GNUC_DEPRECATED ;
 static gint afoo_real_fooa (AFoo* self) G_GNUC_DEPRECATED ;
-VALA_EXTERN AFoo* afoo_construct (GType object_type);
+VALA_EXTERN AFoo* afoo_construct (GType object_type) G_GNUC_DEPRECATED ;
 static GType afoo_get_type_once (void);
 VALA_EXTERN GType ifoo_get_type (void) G_GNUC_CONST ;
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (IFoo, g_object_unref)

diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index 786dd7784e0f9368a1c8732c992dfa75222ec490..2fb33ba7922cccad3abd4f76166ac6fe05884e99 100644 (file)
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -1914,7 +1914,7 @@
                <field name="priv" readable="0" private="1">
                        <type name="DeprecatedClassTestPrivate" c:type="GirTestDeprecatedClassTestPrivate*"/>
                </field>
-               <constructor name="new" c:identifier="gir_test_deprecated_class_test_new">
+               <constructor name="new" c:identifier="gir_test_deprecated_class_test_new" deprecated="1">
                        <return-value transfer-ownership="full">
                                <type name="GirTest.DeprecatedClassTest" c:type="GirTestDeprecatedClassTest*"/>
                        </return-value>

diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected
index 9ec22e5ad1b1d254475b0a8446c308571a926920..362a5a9d4a1a40592cecf1d0bf2c75429cab64aa 100644 (file)
--- a/tests/girwriter/girtest.vapigen-expected
+++ b/tests/girwriter/girtest.vapigen-expected
@@ -33,6 +33,7 @@ namespace GirTest {
        public class DeprecatedClassTest {
                public int ref_count;
                [CCode (has_construct_function = false)]
+               [Version (deprecated = true)]
                public DeprecatedClassTest ();
        }
        [CCode (cheader_filename = "girtest.h", type_id = "gir_test_generics_object_test_get_type ()")]