From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 27 May 2024 17:02:10 +0000 (+0200)
Subject: tests: Update property notify test for G_PARAM_EXPLICIT_NOTIFY
X-Git-Tag: 0.56.18~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b1d90a1af768c3c1527d77c0a189d403a1daa13;p=thirdparty%2Fvala.git

tests: Update property notify test for G_PARAM_EXPLICIT_NOTIFY

GLib 2.42 is mandatory for some time.
---

diff --git a/tests/objects/property-notify.c-expected b/tests/objects/property-notify.c-expected
index 306ba683c..f2586df58 100644
--- a/tests/objects/property-notify.c-expected
+++ b/tests/objects/property-notify.c-expected
@@ -336,9 +336,14 @@ _vala_main (void)
 	Foo* foo = NULL;
 	Foo* _tmp0_;
 	GValue _tmp1_ = {0};
+	GValue _tmp2_ = {0};
 	_tmp0_ = foo_new ();
 	foo = _tmp0_;
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::foo", (GCallback) _fail_g_object_notify, NULL);
+	g_value_init (&_tmp1_, G_TYPE_STRING);
+	g_value_set_string (&_tmp1_, "foo");
+	g_object_set_property (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "foo", &_tmp1_);
+	G_IS_VALUE (&_tmp1_) ? (g_value_unset (&_tmp1_), NULL) : NULL;
 	foo_set_foo (foo, "foo");
 	counter = 0;
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::bar", (GCallback) _count_g_object_notify, NULL);
@@ -346,10 +351,10 @@ _vala_main (void)
 	_vala_assert (counter == 1, "counter == 1");
 	counter = 0;
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::manam", (GCallback) _count_g_object_notify, NULL);
-	g_value_init (&_tmp1_, G_TYPE_STRING);
-	g_value_set_string (&_tmp1_, "manam");
-	g_object_set_property (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "manam", &_tmp1_);
-	G_IS_VALUE (&_tmp1_) ? (g_value_unset (&_tmp1_), NULL) : NULL;
+	g_value_init (&_tmp2_, G_TYPE_STRING);
+	g_value_set_string (&_tmp2_, "manam");
+	g_object_set_property (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "manam", &_tmp2_);
+	G_IS_VALUE (&_tmp2_) ? (g_value_unset (&_tmp2_), NULL) : NULL;
 	_vala_assert (counter == 1, "counter == 1");
 	_g_object_unref0 (foo);
 }
diff --git a/tests/objects/property-notify.vala b/tests/objects/property-notify.vala
index d2e02b27d..40d302903 100644
--- a/tests/objects/property-notify.vala
+++ b/tests/objects/property-notify.vala
@@ -20,8 +20,7 @@ void main () {
 	var foo = new Foo ();
 
 	foo.notify["foo"].connect (fail);
-	//FIXME Requires --target-glib=2.42 for G_PARAM_EXPLICIT_NOTIFY to be actually added
-	//foo.set_property ("foo", "foo");
+	foo.set_property ("foo", "foo");
 	foo.foo = "foo";
 
 	counter = 0;