X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F2-ZOOM.t;h=d64406838c8f12f98d3c3deae569dcfeb8d4a276;hb=ecc0ec8f7c966c6566128351e46b5e0ba92d17d9;hp=98d4ded68ab13d379212d95b8541643434731cc2;hpb=428d1d65fbccec06c6146b33cfe7f4b48c852df4;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/2-ZOOM.t b/t/2-ZOOM.t
index 98d4ded..d644068 100644
--- a/t/2-ZOOM.t
+++ b/t/2-ZOOM.t
@@ -1,35 +1,50 @@
-# $Id: 2-ZOOM.t,v 1.3 2005-10-12 14:31:53 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 => 11;
+use warnings;
+use Test::More tests => 23;
 BEGIN { use_ok('ZOOM') };
 
-#########################
+my $msg = ZOOM::diag_str(ZOOM::Error::INVALID_QUERY);
+ok($msg eq "Invalid query", "diagnostic string lookup works");
 
-# 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.
+$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' OK");
+ok(!$@, "connection to '$host'");
+
+$conn->destroy();
+ok(1, "destroyed connection");
+
+eval { $conn = create ZOOM::Connection() };
+ok(!$@, "unconnected connection object created");
+eval { $conn->connect($host, 0) };
+ok(!$@, "delayed connection to '$host'");
+
+my $val1 = "foo";
+my $val2 = "$val1\0bar";
+$conn->option(xyz => $val2);
+my $val = $conn->option("xyz");
+ok($val eq $val1, "option() treats value as NUL-terminated");
+$conn->option_binary(xyz => $val2, length($val2));
+$val = $conn->option_binary("xyz");
+ok($val eq $val2, "option_setl() treats value as opaque chunk, val='$val'");
 
 my $syntax = "usmarc";
 $conn->option(preferredRecordSyntax => $syntax);
-my $val = $conn->option("preferredRecordSyntax");
+$val = $conn->option("preferredRecordSyntax");
 ok($val eq $syntax, "preferred record syntax set to '$val'");
 
 my $query = '@attr @and 1=4 minerals';
@@ -39,19 +54,31 @@ ok($@ && $@->isa("ZOOM::Exception") &&
    $@->code() == ZOOM::Error::INVALID_QUERY,
    "search for invalid query '$query' fails");
 
+my($xcode, $xmsg, $xinfo, $xset) = $conn->error_x();
+ok($xcode == $@->code() && $xmsg eq $@->message() && $xinfo eq $@->addinfo() &&
+   $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");
+ok($conn->diagset() eq $@->diagset(),
+   "diagset() consistent with exception");
+
 $query = '@attr 1=4 minerals';
 eval { $rs = $conn->search_pqf($query) };
-ok(!$@, "search for '$query' OK");
+ok(!$@, "search for '$query'");
 
 my $n = $rs->size($rs);
 ok($n == 1, "found 1 record as expected");
 
 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");