X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F16-packages.t;h=1cdd0220e47ac2b08269f5d57ed15bb33dcdb38d;hb=87c72eaf97a3dbf51a93dab782c2909539addc48;hp=76d5b33bfd38c358bb8b0840b6af518016759e5f;hpb=16c6a1b7acca3d9f3b3a4c19d1989ec0fbf5043f;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/16-packages.t b/t/16-packages.t
index 76d5b33..1cdd022 100644
--- a/t/16-packages.t
+++ b/t/16-packages.t
@@ -1,5 +1,3 @@
-# $Id: 16-packages.t,v 1.13 2008-09-26 14:41:34 mike Exp $
-
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl 16-packages.t'
 
@@ -14,7 +12,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 40;
+use Test::More tests => 39;
 
 BEGIN { use_ok('Net::Z3950::ZOOM') };
 
@@ -41,32 +39,32 @@ makedb($conn, $dbname, 223);
 Net::Z3950::ZOOM::connection_destroy($conn);
 $conn = makeconn($host, "admin", "fish", 0);
 Net::Z3950::ZOOM::connection_option_set($conn, databaseName => $dbname);
-count_hits($conn, "the", 109);
+count_hits($conn, $dbname, "the", 109);
 
 # Now create the database and check that it is present but empty
 makedb($conn, $dbname, 0);
-count_hits($conn, "the", 0, 0);
+count_hits($conn, $dbname, "the", 114);
 
 # Trying to create the same database again will fail EEXIST
 makedb($conn, $dbname, 224);
 
 # Add a single record, and check that it can be found
 updaterec($conn, 1, content_of("samples/records/esdd0006.grs"), 0);
-count_hits($conn, "the", 0, 1);
+count_hits($conn, $dbname, "the", 0, 1);
 
 # Add the same record with the same ID: overwrite => no change
 updaterec($conn, 1, content_of("samples/records/esdd0006.grs"), 0);
-count_hits($conn, "the", 0, 1);
+count_hits($conn, $dbname, "the", 0, 1);
 
 # Add it again record with different ID => new copy added
 updaterec($conn, 2, content_of("samples/records/esdd0006.grs"), 0);
-count_hits($conn, "the", 0, 2);
+count_hits($conn, $dbname, "the", 0, 2);
 
 # Now drop the newly-created database
 dropdb($conn, $dbname, 0);
 
 # A second dropping should fail, as the database is no longer there.
-dropdb($conn, $dbname, 10004);
+dropdb($conn, $dbname, 235);
 
 
 sub makeconn {
@@ -167,7 +165,7 @@ sub updaterec {
 
 
 sub count_hits {
-    my($conn, $query, $expected_error, $expected_count) = @_;
+    my($conn, $dbname, $query, $expected_error, $expected_count) = @_;
 
     my $rs = Net::Z3950::ZOOM::connection_search_pqf($conn, $query);
     my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");