X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FPing.pm;h=af61b3cd8561d292815f0df0eafcf0be668197ce;hb=240409d8b919d306703c2418bf0552a7b6f47bfd;hp=402a98ee0820985cd1a1a945d6cc57c9c4602463;hpb=8c6e0b6d4792ace87bcb69f1ee6c8c52fbff9a87;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm
index 402a98e..af61b3c 100644
--- a/lib/ZOOM/IRSpy/Test/Ping.pm
+++ b/lib/ZOOM/IRSpy/Test/Ping.pm
@@ -1,4 +1,4 @@
-# $Id: Ping.pm,v 1.1 2006-06-20 16:32:42 mike Exp $
+# $Id: Ping.pm,v 1.6 2006-07-18 10:40:13 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -15,77 +15,30 @@ our @ISA;
 
 sub run {
     my $this = shift();
+    my $irspy = $this->irspy();
+    my $pod = $irspy->pod();
+
+    $pod->callback(ZOOM::Event::CONNECT, \&connected);
+    $pod->callback("exception", \&not_connected);
+    my $err = $pod->wait($irspy);
 
-    print "Running 'Ping' test\n";
-    ### Now actually do it
     return 0;
 }
 
 
-# Some of this Pod-using code may be useful.
-#
-#my $pod = new ZOOM::Pod(@ARGV);
-#$pod->option(elementSetName => "b");
-#$pod->callback(ZOOM::Event::RECV_SEARCH, \&completed_search);
-#$pod->callback(ZOOM::Event::RECV_RECORD, \&got_record);
-##$pod->callback(exception => \&exception_thrown);
-#$pod->search_pqf("the");
-#my $err = $pod->wait();
-#die "$pod->wait() failed with error $err" if $err;
-#
-#sub completed_search {
-#    my($conn, $state, $rs, $event) = @_;
-#    print $conn->option("host"), ": found ", $rs->size(), " records\n";
-#    $state->{next_to_fetch} = 0;
-#    $state->{next_to_show} = 0;
-#    request_records($conn, $rs, $state, 2);
-#    return 0;
-#}
-#
-#sub got_record {
-#    my($conn, $state, $rs, $event) = @_;
-#
-#    {
-#	# Sanity-checking assertions.  These should be impossible
-#	my $ns = $state->{next_to_show};
-#	my $nf = $state->{next_to_fetch};
-#	if ($ns > $nf) {
-#	    die "next_to_show > next_to_fetch ($ns > $nf)";
-#	} elsif ($ns == $nf) {
-#	    die "next_to_show == next_to_fetch ($ns)";
-#	}
-#    }
-#
-#    my $i = $state->{next_to_show}++;
-#    my $rec = $rs->record($i);
-#    print $conn->option("host"), ": record $i is ", render_record($rec), "\n";
-#    request_records($conn, $rs, $state, 3)
-#	if $i == $state->{next_to_fetch}-1;
-#
-#    return 0;
-#}
-#
-#sub exception_thrown {
-#    my($conn, $state, $rs, $exception) = @_;
-#    print "Uh-oh!  $exception\n";
-#    return 0;
-#}
-#
-#sub request_records {
-#    my($conn, $rs, $state, $count) = @_;
-#
-#    my $i = $state->{next_to_fetch};
-#    ZOOM::Log::log("irspy", "requesting $count records from $i");
-#    $rs->records($i, $count, 0);
-#    $state->{next_to_fetch} += $count;
-#}
-#
-#sub render_record {
-#    my($rec) = @_;
-#
-#    return "undefined" if !defined $rec;
-#    return "'" . $rec->render() . "'";
-#}
+sub connected { maybe_connected(@_, 1) }
+sub not_connected { maybe_connected(@_, 0) }
+
+sub maybe_connected {
+    my($conn, $irspy, $rs, $event, $ok) = @_;
+
+    my $rec = $irspy->record($conn);
+    $irspy->log("irspy_test", $conn->option("host"),
+		($ok ? "" : " not"), " connected");
+    $rec->failed(1) if !$ok;
+    ### At this point we should note the successful connection in $rec
+    return 0;
+}
 
 
 1;