X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F16-packages.t;h=1cdd0220e47ac2b08269f5d57ed15bb33dcdb38d;hb=ecc0ec8f7c966c6566128351e46b5e0ba92d17d9;hp=1e725a2fb2c8d1842e65b3b59ee52ebce873dc77;hpb=1fb35dd962ed0d11bf485e2426851f00ae0933f8;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/16-packages.t b/t/16-packages.t
index 1e725a2..1cdd022 100644
--- a/t/16-packages.t
+++ b/t/16-packages.t
@@ -1,5 +1,3 @@
-# $Id: 16-packages.t,v 1.11 2006-04-12 12:23:02 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,13 +12,13 @@
 
 use strict;
 use warnings;
-use Test::More tests => 40;
+use Test::More tests => 39;
 
 BEGIN { use_ok('Net::Z3950::ZOOM') };
 
 
 # We will create, and destroy, a new database with a random name
-my $host = "test.indexdata.com:2118";
+my $host = "z3950.indexdata.com:2100";
 my $dbname = join("", map { chr(ord("a") + int(rand(26))) } 1..10);
 
 # Connect anonymously, and expect this to fail
@@ -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 {
@@ -130,12 +128,12 @@ sub dropdb {
     my $p = Net::Z3950::ZOOM::connection_package($conn, $o);
     # No need to keep ok()ing this, or checking the option-setting
     Net::Z3950::ZOOM::package_option_set($p, databaseName => $dbname);
-
     Net::Z3950::ZOOM::package_send($p, "drop");
     my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
     $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
     ok($errcode == $expected_error,
-       "database drop '$dbname'"  . ($errcode ? " refused $errcode" : ""));
+       ("database drop '$dbname'" . ($errcode ? " refused $errcode" : "") .
+	($expected_error ? " expected $expected_error but succeeded" : "")));
 
     Net::Z3950::ZOOM::package_destroy($p);
     ok(1, "destroyed dropdb package");
@@ -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");