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

diff --git a/t/16-packages.t b/t/16-packages.t
index 5c05a0c..1cdd022 100644
--- a/t/16-packages.t
+++ b/t/16-packages.t
@@ -1,5 +1,3 @@
-# $Id: 16-packages.t,v 1.5 2005-12-07 15:28:07 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,15 +12,13 @@
 
 use strict;
 use warnings;
-use Test::More tests => 32;
+use Test::More tests => 39;
 
 BEGIN { use_ok('Net::Z3950::ZOOM') };
 
 
-# For now, use a local database: later establish a public one for this.
 # We will create, and destroy, a new database with a random name
-my $host = "localhost:9999";
-#my $host = "indexdata.com/gils";
+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
@@ -43,34 +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);
-my $rs = Net::Z3950::ZOOM::connection_search_pqf($conn, "the");
-my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
-$errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
-ok($errcode == 109, "database '$dbname' does not yet exist");
+count_hits($conn, $dbname, "the", 109);
 
 # Now create the database and check that it is present but empty
 makedb($conn, $dbname, 0);
-$rs = Net::Z3950::ZOOM::connection_search_pqf($conn, "the");
-$errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
-ok($errcode == 0, "database '$dbname' does now exists");
-my $n = Net::Z3950::ZOOM::resultset_size($rs);
-ok($n == 0, "database '$dbname' is empty");
+count_hits($conn, $dbname, "the", 114);
 
 # Trying to create the same database again will fail EEXIST
 makedb($conn, $dbname, 224);
 
-# Try to add a non-existent record
-updaterec($conn, 465, "samples/records/notthere.grs", 224);
-
 # Add a single record, and check that it can be found
-updaterec($conn, 465, "samples/records/esdd0006.grs", 0);
+updaterec($conn, 1, content_of("samples/records/esdd0006.grs"), 0);
+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, $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, $dbname, "the", 0, 2);
 
 # Now drop the newly-created database
 dropdb($conn, $dbname, 0);
 
-# A second dropping should fail, but does not do so -- I think that
-# "drop" is an always-"successful" no-op.  Yuck.
-dropdb($conn, $dbname, 0);
+# A second dropping should fail, as the database is no longer there.
+dropdb($conn, $dbname, 235);
 
 
 sub makeconn {
@@ -90,7 +84,7 @@ sub makeconn {
     Net::Z3950::ZOOM::connection_connect($conn, $host, 0);
     $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
     ok($errcode == $expected_error,
-       "connection to '$host'" . ($errcode ? " refused $errcode" : ""));
+       "connection to '$host'" . ($errcode ? " refused ($errcode)" : ""));
 
     return $conn;
 }
@@ -111,8 +105,8 @@ sub makedb {
     Net::Z3950::ZOOM::package_send($p, "create");
     my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
     $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
-    ok($errcode == $expected_error,
-       "database creation '$dbname'"  . ($errcode ? " refused $errcode" : ""));
+    ok($errcode == $expected_error, "database creation '$dbname'" .
+       ($errcode ? " refused ($errcode)" : ""));
 
     # Now we can inspect the package options to find out more about
     # how the server dealt with the request.  However, it seems that
@@ -134,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");
@@ -162,9 +156,37 @@ sub updaterec {
     Net::Z3950::ZOOM::package_send($p, "update");
     my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
     $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
-    ok($errcode == $expected_error,
-       "record update $id '$file'"  . ($errcode ? " failed $errcode $errmsg $addinfo" : ""));
+    ok($errcode == $expected_error, "record update $id" .
+       ($errcode ? " failed $errcode '$errmsg' ($addinfo)" : ""));
 
     Net::Z3950::ZOOM::package_destroy($p);
     ok(1, "destroyed update package");
 }
+
+
+sub count_hits {
+    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");
+    $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
+    ok($errcode == $expected_error, "database '$dbname' " .
+       ($errcode == 0 ? "can be searched" : "not searchable ($errcode)"));
+    return if $errcode != 0;
+    my $n = Net::Z3950::ZOOM::resultset_size($rs);
+    ok($n == $expected_count,
+       "database '$dbname' has $n records (expected $expected_count)");
+}
+
+
+sub content_of {
+    my($filename) = @_;
+
+    use IO::File;
+    my $f = new IO::File("<$filename")
+	or die "can't open file '$filename': $!";
+    my $text = join("", <$f>);
+    $f->close();
+
+    return $text;
+}