From e96e7bc92ab442c65ea2f4fb72db35a1ab12e938 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Tue, 20 Jun 2006 16:32:03 +0000
Subject: [PATCH] Slightly more explicit logging. ZOOM::Pod is now, correctly,
 created in initialise() rather than check() Much
 commented-out sample code removed into IRSpy/Test/Ping.pm
 check() now returns a useful value(). Added _run_test()
 which runs a named test loaded from a plugin.

---
 lib/ZOOM/IRSpy.pm |  100 ++++++++++++++++-------------------------------------
 1 file changed, 30 insertions(+), 70 deletions(-)

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 8988a5d..7ed3046 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.2 2006-06-20 12:36:13 mike Exp $
+# $Id: IRSpy.pm,v 1.3 2006-06-20 16:32:03 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -137,19 +137,14 @@ sub initialise {
     foreach my $target (keys %target2record) {
 	my $record = $target2record{$target};
 	if (!defined $record) {
-	    $this->log("irspy", "new record for '$target'");
+	    $this->log("irspy", "made new record for '$target'");
 	    $target2record{$target} = new ZOOM::IRSpy::Record($target);
 	} else {
-	    $this->log("irspy", "existing record for '$target' $record");
+	    $this->log("irspy", "using existing record for '$target'");
 	}
     }
-}
-
-
-sub check {
-    my $this = shift();
 
-    $this->{pod} = new ZOOM::Pod(@{ $this->{targets} })
+    $this->{pod} = new ZOOM::Pod(@{ $this->{targets} });
 }
 
 
@@ -167,68 +162,33 @@ sub _render_record {
 }
 
 
-#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) = @_;
+# Returns:
+#	0 all tests successfully run
+#	1 some tests skipped
 #
-#    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 check {
+    my $this = shift();
+
+    return $this->_run_test("Main");
+}
+
+
+sub _run_test {
+    my $this = shift();
+    my($tname) = @_;
+
+    eval {
+	require "ZOOM/IRSpy/Test/$tname.pm";
+    }; if ($@) {
+	$this->log("warn", "can't load test '$tname': skipping",
+		   $@ =~ /^Can.t locate/ ? () : " ($@)");
+	return 1;
+    }
+
+    $this->log("irspy", "running test '$tname'");
+    my $test = "ZOOM::IRSpy::Test::$tname"->new($this);
+    return $test->run();
+}
 
 
 =head1 SEE ALSO
-- 
1.7.10.4