X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F1-Net-Z3950-ZOOM.t;h=a23ba4884d96d45f8082379cd75572693dd11160;hb=ecc0ec8f7c966c6566128351e46b5e0ba92d17d9;hp=5085778bcabefca5ff88a064d4e63e2b4dcae9d7;hpb=720e06f262e496047baeff7baca97a1a931f4b75;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/1-Net-Z3950-ZOOM.t b/t/1-Net-Z3950-ZOOM.t
index 5085778..a23ba48 100644
--- a/t/1-Net-Z3950-ZOOM.t
+++ b/t/1-Net-Z3950-ZOOM.t
@@ -1,33 +1,28 @@
-# $Id: 1-Net-Z3950-ZOOM.t,v 1.9 2005-10-17 13:49:23 mike Exp $
-
 # Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl Net-Z3950-ZOOM.t'
-
-#########################
-
-# change 'tests => 1' to 'tests => last_test_to_print';
+# `make test'. After `make install' it should work as `perl 1-Net-Z3950-ZOOM.t'
 
 use strict;
-use Test::More tests => 21;
+use warnings;
+use Test::More tests => 23;
 BEGIN { use_ok('Net::Z3950::ZOOM') };
 
-#########################
-
-# Insert your test code below, the Test::More module is use()ed here so read
-# its man page ( perldoc Test::More ) for help writing this test script.
-
 my $msg = Net::Z3950::ZOOM::diag_str(Net::Z3950::ZOOM::ERROR_INVALID_QUERY);
 ok($msg eq "Invalid query", "diagnostic string lookup works");
 
+$msg = Net::Z3950::ZOOM::diag_srw_str(27);
+ok($msg eq "Empty term unsupported", "SRW diagnostic string lookup works");
+
 my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
 
 my $host = "no.such.host";
 my $conn = Net::Z3950::ZOOM::connection_new($host, 0);
 $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
-ok($errcode == Net::Z3950::ZOOM::ERROR_CONNECT && $addinfo eq $host,
-   "connection to non-existent host '$host' fails");
+# For some reason, Red Hat signals this as a TIMEOUT rather than a CONNECT
+ok(($errcode == Net::Z3950::ZOOM::ERROR_CONNECT && $addinfo eq $host) ||
+   ($errcode == Net::Z3950::ZOOM::ERROR_TIMEOUT && $addinfo eq ""),
+   "connection to non-existent host '$host' fails: errcode=$errcode, addinfo=$addinfo");
 
-$host = "indexdata.com/gils";
+$host = "z3950.indexdata.com/gils";
 $conn = Net::Z3950::ZOOM::connection_new($host, 0);
 $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
 ok($errcode == 0, "connection to '$host'");
@@ -51,7 +46,7 @@ ok($val eq $val1, "option_set() treats value as NUL-terminated");
 Net::Z3950::ZOOM::connection_option_setl($conn, xyz => $val2, length($val2));
 my $vallen = 0;
 $val = Net::Z3950::ZOOM::connection_option_getl($conn, "xyz", $vallen);
-ok($val eq $val2, "option_setl() treats value as opaque chunk, val='$val'");
+ok($val eq $val2, "option_setl() treats value as opaque chunk, val='$val' len=$vallen");
 
 my $syntax = "usmarc";
 Net::Z3950::ZOOM::connection_option_set($conn,
@@ -75,7 +70,8 @@ ok(Net::Z3950::ZOOM::connection_errmsg($conn) eq $errmsg,
    "errmsg() consistent with error()");
 ok(Net::Z3950::ZOOM::connection_addinfo($conn) eq $addinfo,
    "addinfo() consistent with error()");
-### These is no ZOOM_connection_diagset() -- surely that's a mistake?
+ok(Net::Z3950::ZOOM::connection_diagset($conn) eq $xset,
+   "diagset() consistent with error()");
 
 $query = '@attr 1=4 minerals';
 $rs = Net::Z3950::ZOOM::connection_search_pqf($conn, $query);
@@ -86,12 +82,11 @@ my $n = Net::Z3950::ZOOM::resultset_size($rs);
 ok($n == 1, "found 1 record as expected");
 
 my $rec = Net::Z3950::ZOOM::resultset_record($rs, 0);
-my $len = 0;
-my $data = Net::Z3950::ZOOM::record_get($rec, "render", $len);
-ok($data =~ /245 +\$a ISOTOPIC DATES OF ROCKS AND MINERALS/,
+my $data = Net::Z3950::ZOOM::record_get($rec, "render");
+ok($data =~ /^245 +\$a ISOTOPIC DATES OF ROCKS AND MINERALS$/m,
    "rendered record has expected title");
-my $raw = Net::Z3950::ZOOM::record_get($rec, "raw", $len);
-ok($raw =~ /^00981n/, "raw record contains expected header");
+my $raw = Net::Z3950::ZOOM::record_get($rec, "raw");
+ok($raw =~ /^00966n/, "raw record contains expected header");
 
 Net::Z3950::ZOOM::resultset_destroy($rs);
 ok(1, "destroyed result-set");