-# $Id: 22-query.t,v 1.4 2005-12-22 08:58:27 mike Exp $
+# $Id: 22-query.t,v 1.6 2005-12-22 09:25:14 mike Exp $
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl 22-query.t'
use strict;
use warnings;
-use Test::More tests => 31;
+use Test::More tests => 32;
BEGIN { use_ok('ZOOM') };
#ZOOM::Log::init_level(ZOOM::Log::mask_str("zoom"));
ok(1, "[no need to create empty query]");
eval { $q = new ZOOM::Query::CQL('title=utah and description=epicenter') };
ok(!$@, "created CQL query");
-#check_failure($conn, $q, 107, "Bib-1");
+my $rs;
+eval { $rs = $conn->search($q) };
+ok($@ && $@->isa("ZOOM::Exception") &&
+ $@->code() == 107 && $@->diagset() eq "Bib-1",
+ "query rejected: error " . $@->code());
+$q->destroy();
# Client-side compiled CQL: this will fail due to lack of config-file
ok(1, "[no need to create empty query]");
$conn) };
ok(!$@, "created CQL2RPN query: \@=$@");
check_record($conn, $q);
+$q->destroy();
$conn->destroy();
ok(1, "destroyed all objects");
$rs->destroy();
}
-
-
-sub check_failure {
- my($conn, $q, $expected_error, $expected_dset) = @_;
-
- my $rs;
- eval { $rs = $conn->search($q) };
- ok($@ && $@->isa("ZOOM::Exception") &&
- $@->code() == $expected_error && $@->diagset() eq $expected_dset,
- "query rejected: error " . $@->code());
- $rs->destroy();
-}