Fire test against z3950.indexdata.com/marc instead.

diff --git a/test/test_http.sh b/test/test_http.sh
index 2c62d4b..dafd629 100755 (executable)
--- a/test/test_http.sh
+++ b/test/test_http.sh
@@ -1,39 +1,22 @@
 #!/bin/sh
-# $Id: test_http.sh,v 1.3 2007-05-15 21:40:57 adam Exp $
+# $Id: test_http.sh,v 1.4 2007-05-16 08:31:17 adam Exp $
 #
-# Regression test using pazpar2 against yaz-ztest
+# Regression test using pazpar2 against z3950.indexdata.com/marc
 # Reads Pazpar2 URLs from test_http_urls
 #            Outputs to test_http_<no>.log
-#            Matches against results in test_htttp_<no>.res
+#            Matches against results in test_http_<no>.res
 #
 
 
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-# Find a suitable yaz-ztest
-yt=""
-for d in /usr/bin /usr/local/bin ${srcdir}/../../yaz/ztest ${srcdir}/../../../yaz/ztest; do
-    yt=${d}/yaz-ztest
-    if test -x ${yt}; then
-       break
-    fi
-done
-if test ! -x "${yt}"; then
-    echo "No yaz-ztest found. Skipping"
-    exit 0
-fi
-
-# Fire up yaz-ztest (should match port in test_http.xml)
-$yt -l test_http_ztest.log tcp:@:9764 &
-YTPID=$!
-
 # Fire yp pazpar2
 rm -f pazpar2.log
 ../src/pazpar2 -l pazpar2.log -f ${srcdir}/test_http.cfg -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 &
 PP2PID=$!
 
-# Give both programs room to start properly..
+# Give it a chance to start properly..
 sleep 1
 
 # Set to success by default.. Will be set to non-zero in case of failure
@@ -47,42 +30,41 @@ else
     echo "pazpar2 failed to start"
 fi
 
-if ps -p $YTPID >/dev/null 2>&1; then
-    :
-else
-    code=1
-    YTPID=""
-    echo "yaz-ztest failed to start"
-fi
 # We can start test for real
 
+oIFS="$IFS"
+IFS='
+'
+
 testno=1
 for f in `cat ${srcdir}/test_http_urls`; do
-    OUT1=${srcdir}/test_http_${testno}.res
-    OUT2=test_http_${testno}.log
-    DIFF=test_http_${testno}.dif
-    if test -f $OUT1; then
-       rm -f $OUT2
-       wget -q -O $OUT2 $f
-       if diff $OUT1 $OUT2 >$DIFF; then
-           :
+    if echo $f | grep '^http' >/dev/null; then
+       OUT1=${srcdir}/test_http_${testno}.res
+       OUT2=test_http_${testno}.log
+       DIFF=test_http_${testno}.dif
+       if test -f $OUT1; then
+           rm -f $OUT2
+           wget -q -O $OUT2 $f
+           if diff $OUT1 $OUT2 >$DIFF; then
+               :
+           else
+               echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+               code=1
+           fi
        else
-           echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+           echo "Test $testno: Making for the first time"
+           wget -q -O $OUT1 $f
            code=1
        fi
+       testno=`expr $testno + 1`
     else
-       echo "Test $testno: Making for the first time"
-       wget -q -O $OUT1 $f
-       code=1
+       sleep $f
     fi
-    testno=`expr $testno + 1`
 done
+IFS="$oIFS"
 
 sleep 1
 # Kill programs
-if test -n "$YTPID"; then
-    kill $YTPID
-fi
 
 if test -n "$PP2PID"; then
     kill $PP2PID

diff --git a/test/test_http.xml b/test/test_http.xml
index a0f1089..386a4f9 100644 (file)
--- a/test/test_http.xml
+++ b/test/test_http.xml
@@ -1,7 +1,7 @@
-<settings target="localhost:9764/Default">
+<settings target="z3950.indexdata.com/marc">
 
   <!-- Used by test test_http.sh -->
-  <!-- $Id: test_http.xml,v 1.1 2007-05-15 15:50:48 adam Exp $ -->
+  <!-- $Id: test_http.xml,v 1.2 2007-05-16 08:31:17 adam Exp $ -->
 
   <set name="pz:name" value="Local Test"/>
 

diff --git a/test/test_http_5.res b/test/test_http_5.res
index e9f1ea8..d09a94a 100644 (file)
--- a/test/test_http_5.res
+++ b/test/test_http_5.res
@@ -1,15 +1,15 @@
 <show>
 <status>OK</status>
 <activeclients>0</activeclients>
-<merged>6</merged>
-<total>7</total>
+<merged>9</merged>
+<total>10</total>
 <start>0</start>
-<num>6</num>
+<num>9</num>
 <hit>
 
 <md-title>How to program a computer</md-title>
-<md-author>Jack Collins</md-author><location id="localhost:9764/Default" name="Local Test"></location>
-<location id="localhost:9764/Default" name="Local Test"></location>
+<md-author>Jack Collins</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
+<location id="z3950.indexdata.com/marc" name="Local Test"></location>
 <count>2</count>
 <recid>0</recid>
 </hit>
@@ -17,35 +17,55 @@
 
 <md-title>The Computer Bible</md-title>
 <md-date>1973-1980</md-date>
-<md-author>Freedman, David Noel</md-author><location id="localhost:9764/Default" name="Local Test"></location>
+<md-author>Freedman, David Noel</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
 <recid>2</recid>
 </hit>
 <hit>
 
+<md-title>A plan for community college computer development</md-title>
+<md-date>1971</md-date><location id="z3950.indexdata.com/marc" name="Local Test"></location>
+<recid>8</recid>
+</hit>
+<hit>
+
+<md-title>Washington metropolitan area rail computer feasibility study; final report</md-title>
+<md-date>1971</md-date>
+<md-author>Englund, Carl R</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
+<recid>7</recid>
+</hit>
+<hit>
+
+<md-title>The use of passwords for controlled access to computer resources</md-title>
+<md-date>1977</md-date>
+<md-author>Wood, Helen M</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
+<recid>6</recid>
+</hit>
+<hit>
+
 <md-title>The Puget Sound Region : a portfolio of thematic computer maps</md-title>
 <md-date>1974</md-date>
-<md-author>Hoerauf, Eugene A</md-author><location id="localhost:9764/Default" name="Local Test"></location>
+<md-author>Hoerauf, Eugene A</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
 <recid>3</recid>
 </hit>
 <hit>
 
 <md-title>Computer processing of dynamic images from an Anger scintillation camera : the proceedings of a workshop</md-title>
 <md-date>1974</md-date>
-<md-author>Larson, Kenneth B</md-author><location id="localhost:9764/Default" name="Local Test"></location>
+<md-author>Larson, Kenneth B</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
 <recid>1</recid>
 </hit>
 <hit>
 
 <md-title>Computer science &amp; technology : proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title>
 <md-date>1977</md-date>
-<md-author>Evans, John Martin</md-author><location id="localhost:9764/Default" name="Local Test"></location>
+<md-author>Evans, John Martin</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
 <recid>5</recid>
 </hit>
 <hit>
 
 <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine : proceedings of the workshop</md-title>
 <md-date>1977</md-date>
-<md-author>Ter-Pogossian, Michel M</md-author><location id="localhost:9764/Default" name="Local Test"></location>
+<md-author>Ter-Pogossian, Michel M</md-author><location id="z3950.indexdata.com/marc" name="Local Test"></location>
 <recid>4</recid>
 </hit>
 </show>

diff --git a/test/test_http_urls b/test/test_http_urls
index 90eceae..7ccb1e7 100644 (file)
--- a/test/test_http_urls
+++ b/test/test_http_urls
@@ -2,4 +2,5 @@ http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=1&command=stat
 http://localhost:9763/search.pz2?session=1&command=ping
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
+2
 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1