-# $Id: 2-ZOOM.t,v 1.4 2005-10-12 16:13:38 mike Exp $
+# $Id: 2-ZOOM.t,v 1.7 2005-10-18 16:27:29 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 => 12;
+use warnings;
+use Test::More tests => 21;
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");
$host = "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");
+
+my $options = new ZOOM::Options();
+eval { $conn = create ZOOM::Connection($options) };
+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';
$@->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 "ZOOM", "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
+
$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");