some updates for the test suite

Author: monkeyiq

.gitignore

@@ -1,5 +1,7 @@
 .cvsignore
 CVS/
+compile
+archives
 FerrisStreams/.cvsignore
 FerrisStreams/CVS/
 FerrisStreams/Makefile
@@ -64,3 +66,16 @@ debian/prerm.ex
 debian/shlibs.local.ex
 debian/tmp/
 debian/watch.ex
+
+ferrisstreams.log
+ferrisstreams.sum
+
+testsuite/ut_close_signal
+testsuite/ut_fd_streams
+testsuite/ut_limiting_istream
+testsuite/ut_nullstream
+testsuite/ut_proxy_streams
+testsuite/ut_radix_dump
+testsuite/ut_stringstream
+testsuite/ut_tee_stream
+

FerrisStreams/Streams.hh

@@ -75,7 +75,6 @@
 #include <sigc++/sigc++.h>
 #include <sigc++/signal.h>
 #include <sigc++/slot.h>
-#include <sigc++/object.h>
 #include <sigc++/connection.h>
 
 #include <stdio.h>

configure.in

@@ -1,4 +1,4 @@
-AC_INIT(ferrisstreams, 0.6.6)
+AC_INIT(ferrisstreams, 0.7.0)
 
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION

runtest.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -rf /tmp/sampledata
+/usr/bin/cp -avf testsuite/sampledata /tmp
+runtest -v  -v  --tool ferrisstreams EXBASE=`pwd`/ SDATA=`pwd`/testsuite/sampledata --srcdir `pwd`/testsuite
+

testsuite/sampledata/alice13a.txt

@@ -74,12 +74,12 @@ fh_ostream& E()
 
 void runtest()
 {
-    fh_ifstream base_iss("/tmp/alice13a.txt" );
+    fh_ifstream base_iss("/tmp/sampledata/file.txt" );
 
     std::streampos be = 200;
     std::streampos en = 200 + 20;
-    string expected = "esearch Electronic L";
-    // dd if=/tmp/alice13a.txt of=/tmp/chunk bs=20 count=1 skip=10
+    string expected = "/lZaKDh/8ANZ7owpNGkf";
+    // dd if=/tmp/sampledata/file.txt of=/tmp/chunk bs=20 count=1 skip=10
 
     fh_istream ss = Factory::MakeLimitingIStream( base_iss, be, en );
     string s;

testsuite/ut_limiting_istream.cpp

@@ -74,13 +74,13 @@ fh_ostream& E()
 
 void runtest()
 {
-    fh_ifstream* base_iss = new fh_ifstream("/tmp/alice13a.txt" );
+    fh_ifstream* base_iss = new fh_ifstream("/tmp/sampledata/file.txt" );
     fh_istream ss = Factory::MakeProxyStream( base_iss, true );
     base_iss = 0;
 
-    ss.seekg( 200 );
+    ss.seekg( 999 * 77  );
     string s;
-    string expected = "esearch";
+    string expected = "u0";
     ss >> s;
     if( s != expected )
     {
@@ -89,7 +89,7 @@ void runtest()
             << " got:" << s << endl;
     }
 
-    expected = "Electronic";
+    expected = "KljEoLUKJ";
     ss >> s;
     if( s != expected )
     {

testsuite/ut_proxy_streams.cpp

@@ -101,17 +101,17 @@ void runtest()
 
     {
         fh_stringstream ss1;
-        fh_ofstream ss2("/tmp/alice13a.txt.out",ios::trunc|ios::out);
+        fh_ofstream ss2("/tmp/sampledata/file.txt.out",ios::trunc|ios::out);
 
         fh_ostream oss = Factory::MakeTeeStream( ss1, ss2 );
-        fh_ifstream iss("/tmp/alice13a.txt" );
+        fh_ifstream iss("/tmp/sampledata/file.txt" );
 
         copy( iss, oss );
         cout << "ss1.size:" << ss1.str().size() << endl;
-        if( 153477 != ss1.str().size() )
+        if( 100002 != ss1.str().size() )
         {
             E() << "ss1 in memory copy of alice13a is incorrect size"
-                << " expected:" << 153477
+                << " expected:" << 100002
                 << " got:" << ss1.str().size()
                 << endl;
         }