-# $Id: 2-ZOOM.t,v 1.6 2005-10-17 13:50:06 mike Exp $
+# $Id: 2-ZOOM.t,v 1.13 2007-09-14 10:36:13 mike Exp $
# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl ZOOM.t'
-
-#########################
-
-# change 'tests => 1' to 'tests => last_test_to_print';
+# `make test'. After `make install' it should work as `perl 2-ZOOM.t'
use strict;
-use Test::More tests => 21;
+use warnings;
+use Test::More tests => 23;
BEGIN { use_ok('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 = ZOOM::diag_str(ZOOM::Error::INVALID_QUERY);
ok($msg eq "Invalid query", "diagnostic string lookup works");
+$msg = ZOOM::diag_srw_str(27);
+ok($msg eq "Empty term unsupported", "SRW diagnostic string lookup works");
+
my $host = "no.such.host";
my $conn;
eval { $conn = new ZOOM::Connection($host, 0) };
+# For some reason, Red Hat signals this as a TIMEOUT rather than a CONNECT
ok($@ && $@->isa("ZOOM::Exception") &&
- $@->code() == ZOOM::Error::CONNECT && $@->addinfo() eq $host,
- "connection to non-existent host '$host' fails");
+ (($@->code() == ZOOM::Error::CONNECT && $@->addinfo() eq $host) ||
+ ($@->code() == ZOOM::Error::TIMEOUT && $@->addinfo() eq "")),
+ "connection to non-existent host '$host' fails: \$\@=$@");
-$host = "indexdata.com/gils";
+$host = "z3950.indexdata.com/gils";
eval { $conn = new ZOOM::Connection($host, 0) };
ok(!$@, "connection to '$host'");
$conn->destroy();
ok(1, "destroyed connection");
-my $options = new ZOOM::Options();
-eval { $conn = create ZOOM::Connection($options) };
+eval { $conn = create ZOOM::Connection() };
ok(!$@, "unconnected connection object created");
eval { $conn->connect($host, 0) };
ok(!$@, "delayed connection to '$host'");
my($xcode, $xmsg, $xinfo, $xset) = $conn->error_x();
ok($xcode == $@->code() && $xmsg eq $@->message() && $xinfo eq $@->addinfo() &&
- $xset eq "ZOOM", "error_x() consistent with exception");
+ $xset eq $@->diagset(), "error_x() consistent with exception");
ok($conn->errcode() == $@->code(),
"errcode() consistent with exception");
ok($conn->errmsg() eq $@->message(),
"errmsg() consistent with exception");
ok($conn->addinfo() eq $@->addinfo(),
"addinfo() consistent with exception");
-### No $conn->diagset() yet, due to lack of underlying support
+ok($conn->diagset() eq $@->diagset(),
+ "diagset() consistent with exception");
$query = '@attr 1=4 minerals';
eval { $rs = $conn->search_pqf($query) };
my $rec = $rs->record(0);
my $data = $rec->render();
-ok($data =~ /245 +\$a ISOTOPIC DATES OF ROCKS AND MINERALS/,
+ok($data =~ /^245 +\$a ISOTOPIC DATES OF ROCKS AND MINERALS$/m,
"rendered record has expected title");
my $raw = $rec->raw();
-ok($raw =~ /^00981n/, "raw record contains expected header");
+ok($raw =~ /^00966n/, "raw record contains expected header");
$rs->destroy();
ok(1, "destroyed result-set");