1 files changed, 22 insertions, 16 deletions

diff --git a/libvxi11client/perlbits/VXI11-Client.t b/libvxi11client/perlbits/VXI11-Client.t
index 1c91965..ef2aae0 100644
--- a/libvxi11client/perlbits/VXI11-Client.t
+++ b/libvxi11client/perlbits/VXI11-Client.t
@@ -8,7 +8,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 17;
+use Test::More tests => 16;
 BEGIN { use_ok('VXI11::Client') };
 
 #########################
@@ -16,19 +16,25 @@ BEGIN { use_ok('VXI11::Client') };
 # 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.
 
-is(&VXI11::Client::open("roi", 0), 1, "Open");
-is(&VXI11::Client::lock(0), 1, "Lock");
-is(&VXI11::Client::write("*IDN?", 6, 0, 0), 6, "Write");
-ok(&VXI11::Client::readstatusbyte(0) >= 0 , "Read status byte");
-is(&VXI11::Client::create_intr_chan(), 1, "Create intr channel");
-is(&VXI11::Client::enable_srq(1), 1, "Enable interrupts");
+&VXI11::Client::startinterruptserver();
+
+my $instr = &VXI11::Client::open("roi", 0);
+
+is($instr->lock(0), 1, "Lock");
+is($instr->write("*IDN?", 6, 0, 0), 6, "Write");
+ok($instr->readstatusbyte(0) >= 0 , "Read status byte");
+is($instr->create_intr_chan(), 1, "Create intr channel");
+is($instr->enable_srq(1, "myhandle"), 1, "Enable interrupts");
 is(&VXI11::Client::wait_for_interrupt, 1, "Wait for interrupt");
-is(&VXI11::Client::enable_srq(0), 1, "Disable interrupts");
-is(&VXI11::Client::destroy_intr_chan(), 1, "Destroy intr channel");
-is(&VXI11::Client::abort(), 1, "Abort");
-is(&VXI11::Client::clear(0), 1, "Clear");
-is(&VXI11::Client::trigger(0), 1, "Trigger");
-is(&VXI11::Client::local(0), 1, "Local");
-is(&VXI11::Client::remote(0), 1, "Remote");
-is(&VXI11::Client::unlock(), 1, "Unlock");
-is(&VXI11::Client::close(), 1, "Close");
+is($instr->enable_srq(0, ""), 1, "Disable interrupts");
+is($instr->destroy_intr_chan(), 1, "Destroy intr channel");
+is($instr->abort(), 1, "Abort");
+is($instr->clear(0), 1, "Clear");
+is($instr->trigger(0), 1, "Trigger");
+is($instr->local(0), 1, "Local");
+is($instr->remote(0), 1, "Remote");
+is($instr->unlock(), 1, "Unlock");
+
+is($instr->close(), 1, "Close");
+
+&VXI11::Client::stopinterruptserver();