From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 24 Apr 2023 08:39:08 +0000 (+0200)
Subject: Update tests (partly correct)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c49470fe3e289dd3aa69b9dd5871d56cc901cb0d;p=thirdparty%2Fvala.git

Update tests (partly correct)
---

diff --git a/tests/annotations/deprecated-struct-minimal.c-expected b/tests/annotations/deprecated-struct-minimal.c-expected
index 3d4d43d76..efadce833 100644
--- 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 f2eb831a6..1528525f3 100644
--- 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 724f406c6..8bd3bb795 100644
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -1924,7 +1924,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 202d5e0db..8eff9c933 100644
--- 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 ()")]