Add scope annotation value warnings

Refactor and improve the warning messages for the transfer
warnings as well

1 files changed, 22 insertions, 2 deletions

diff --git a/tests/warn/callback-invalid-scope.h b/tests/warn/callback-invalid-scope.h
index 46292aa8..be0ef5bc 100644
--- a/tests/warn/callback-invalid-scope.h
+++ b/tests/warn/callback-invalid-scope.h
@@ -7,5 +7,25 @@
  */
 void test_callback_invalid(GCallback *callback, gpointer user_data);
 
-// EXPECT:5: Warning: Test: Invalid scope 'invalid' for parameter 'callback'
-// EXPECT:3: Warning: Test: test_callback_invalid: argument callback: Missing (scope) annotation for callback without GDestroyNotify (valid: call, async)
+// EXPECT:5: Warning: Test: invalid scope annotation value: 'invalid'
+
+/**
+ * test_callback_invalid2:
+ * @callback: (scope):
+ *
+ */
+void test_callback_invalid2(GCallback *callback, gpointer user_data);
+
+// EXPECT:14: Warning: Test: scope annotation needs a value
+
+/**
+ * test_callback_invalid3:
+ * @callback: (scope invalid foo):
+ *
+ */
+void test_callback_invalid3(GCallback *callback, gpointer user_data);
+
+// EXPECT:23: Warning: Test: scope annotation needs one value, not 2
+
+// EXPECT:12: Warning: Test: test_callback_invalid2: argument callback: Missing (scope) annotation for callback without GDestroyNotify (valid: call, async)
+// EXPECT:21: Warning: Test: test_callback_invalid3: argument callback: Missing (scope) annotation for callback without GDestroyNotify (valid: call, async)