X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=t%2F2-ZOOM.t;h=cba0e4d2eca3b738b75a053b1b57d95c15c3692f;hb=ce460f89feee123e409d9da994a8ea66e87942bb;hp=603ce10bef40817ca73f678114d0a83b630163c3;hpb=a81c9cd6426a63bb0b98984fd8be773a84914fad;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/2-ZOOM.t b/t/2-ZOOM.t
index 603ce10..cba0e4d 100644
--- a/t/2-ZOOM.t
+++ b/t/2-ZOOM.t
@@ -1,11 +1,11 @@
-# $Id: 2-ZOOM.t,v 1.7 2005-10-18 16:27:29 mike Exp $
+# $Id: 2-ZOOM.t,v 1.9 2005-11-16 16:25:02 mike Exp $
 
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl 2-ZOOM.t'
 
 use strict;
 use warnings;
-use Test::More tests => 21;
+use Test::More tests => 22;
 BEGIN { use_ok('ZOOM') };
 
 my $msg = ZOOM::diag_str(ZOOM::Error::INVALID_QUERY);
@@ -54,14 +54,15 @@ ok($@ && $@->isa("ZOOM::Exception") &&
 
 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) };
@@ -72,7 +73,7 @@ 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");