test/finish.sql: use set_hasnt() instead of a hand-rolled ok()

pgTAP's set_hasnt() asserts a set has none of a given set of values,
which is exactly what the search_path check needs, and reports which
schema leaked into search_path on failure instead of just failing.
Split into two assertions, one per schema, so a failure names the
specific schema.

Author: jnasbyupgrade

test/expected/_object_v.out

@@ -1,5 +1,6 @@
 \set ECHO none
-1..2
+1..3
 ok 1 - _object_v__for_update matches _object_v
-ok 2 - object_reference schema(s) must not be part of the resolved search_path
+ok 2 - object_reference schema must not be part of the resolved search_path
+ok 3 - _object_reference schema must not be part of the resolved search_path
 # TRANSACTION INTENTIONALLY LEFT OPEN!

test/expected/all.out

@@ -1,5 +1,5 @@
 \set ECHO none
-1..74
+1..75
 ok 1 - All object types are being tested.
 ok 2 - Verify object_reference.unsupported()
 ok 3 - prereq: CREATE DOMAIN "test domain" int
@@ -73,5 +73,6 @@ ok 70 - DROP index "test table test index"
 ok 71 - Drop should fail while reference exists
 ok 72 - DROP table "test table"
 ok 73 - No object references remain
-ok 74 - object_reference schema(s) must not be part of the resolved search_path
+ok 74 - object_reference schema must not be part of the resolved search_path
+ok 75 - _object_reference schema must not be part of the resolved search_path
 # TRANSACTION INTENTIONALLY LEFT OPEN!

test/expected/base.out

@@ -1,5 +1,5 @@
 \set ECHO none
-1..11
+1..12
 ok 1 - Role object_reference__dependency should be granted USAGE on schema _object_reference
 ok 2 - Role object_reference__dependency should be granted REFERENCES on table _object_reference.object
 ok 3 - CREATE TEMP TABLE test_object AS SELECT object_reference.object__getsert('table', 'test_table') AS object_id;
@@ -10,5 +10,6 @@ ok 7 - Existing object works, provides correct ID
 ok 8 - secondary may not be specified for table objects
 ok 9 - temp objects are rejected
 ok 10 - CREATE EXTENSION test_factory
-ok 11 - object_reference schema(s) must not be part of the resolved search_path
+ok 11 - object_reference schema must not be part of the resolved search_path
+ok 12 - _object_reference schema must not be part of the resolved search_path
 # TRANSACTION INTENTIONALLY LEFT OPEN!

test/expected/capture.out

@@ -1,5 +1,5 @@
 \set ECHO none
-1..70
+1..71
 ok 1 - prereq: CREATE DOMAIN "test domain" int
 ok 2 - prereq: CREATE FUNCTION tg_null() RETURNS trigger LANGUAGE plpgsql AS $body$BEGIN RETURN NEW; END$body$
 ok 3 - prereq: CREATE TYPE "test type"
@@ -69,5 +69,6 @@ ok 66 - Drop should fail while reference exists
 ok 67 - DROP table "test table"
 ok 68 - object_group_ids still has correct record count
 ok 69 - No object references remain
-ok 70 - object_reference schema(s) must not be part of the resolved search_path
+ok 70 - object_reference schema must not be part of the resolved search_path
+ok 71 - _object_reference schema must not be part of the resolved search_path
 # TRANSACTION INTENTIONALLY LEFT OPEN!

test/expected/event_trigger.out

@@ -1,5 +1,5 @@
 \set ECHO none
-1..43
+1..44
 ok 1 - Register schema-drop test objects
 ok 2 - Create objects_view
 ok 3 - Exactly 3 test view records
@@ -42,5 +42,6 @@ ok 39 - Verify filler column record is deleted
 ok 40 - Verify objects still registered correctly
 ok 41 - Drop schema
 ok 42 - objects_view is empty
-ok 43 - object_reference schema(s) must not be part of the resolved search_path
+ok 43 - object_reference schema must not be part of the resolved search_path
+ok 44 - _object_reference schema must not be part of the resolved search_path
 # TRANSACTION INTENTIONALLY LEFT OPEN!

test/expected/object_group.out

@@ -1,5 +1,5 @@
 \set ECHO none
-1..30
+1..31
 ok 1 - Register test table 1
 ok 2 - object_group__create(...) for group name that is too long throws error
 ok 3 - object_group__create('object reference test group')
@@ -29,5 +29,6 @@ ok 26 - Object exists before cleanup test
 ok 27 - Remove from group triggers automatic cleanup attempt
 ok 28 - Object was automatically cleaned up after group removal
 ok 29 - Removing empty group works
-ok 30 - object_reference schema(s) must not be part of the resolved search_path
+ok 30 - object_reference schema must not be part of the resolved search_path
+ok 31 - _object_reference schema must not be part of the resolved search_path
 # TRANSACTION INTENTIONALLY LEFT OPEN!

test/finish.sql

@@ -1,5 +1,5 @@
 /*
- * Asserts object_reference's own schema(s) are absent from the resolved
+ * Asserts object_reference's own schemas are absent from the resolved
  * search_path -- checked here (file end, before finish()) rather than only
  * at setup, so a test that mutates search_path mid-file and never restores
  * it is caught. Not foolproof: mutate-then-restore before this line still
@@ -13,9 +13,16 @@
  * test in the suite passing means nothing accidentally relied on
  * search_path to resolve one of the extension's own objects.
  */
-SELECT ok(
-    NOT ( 'object_reference' = ANY (current_schemas(false)) OR '_object_reference' = ANY (current_schemas(false)) )
-  , 'object_reference schema(s) must not be part of the resolved search_path'
+SELECT set_hasnt(
+    $$ SELECT unnest(current_schemas(false)) $$
+  , $$ VALUES ('object_reference') $$
+  , 'object_reference schema must not be part of the resolved search_path'
+);
+
+SELECT set_hasnt(
+    $$ SELECT unnest(current_schemas(false)) $$
+  , $$ VALUES ('_object_reference') $$
+  , '_object_reference schema must not be part of the resolved search_path'
 );
 
 \i test/pgxntool/finish.sql

test/sql/_object_v.sql

@@ -6,7 +6,7 @@ SELECT plan(
   0
 
   + 1 -- equality
-  + 1 -- schema-qualification (search_path)
+  + 2 -- schema-qualification (search_path)
 );
 
 -- TODO: load some damn data first

test/sql/all.sql

@@ -28,7 +28,7 @@ SELECT plan( (
   + c * 2 -- drop
 
   + 1 -- verify object table is now empty
-  + 1 -- schema-qualification (search_path)
+  + 2 -- schema-qualification (search_path)
 )::int )
   FROM (SELECT count(*) c FROM test_object) c
 ;

test/sql/base.sql

@@ -11,7 +11,7 @@ SELECT plan(
   +2 -- new functions
   +3 -- errors (includes temp object test)
   +1 -- create extensions
-  +1 -- schema-qualification (search_path)
+  +2 -- schema-qualification (search_path)
 );
 
 -- Schema