10 files changed, 457 insertions, 0 deletions

diff --git a/src/unit/hashtable/hashtable.cpp b/src/old/unit/hashtable/hashtable.cpp
index b2e1cf5..b2e1cf5 100644
--- a/src/unit/hashtable/hashtable.cpp
+++ b/src/old/unit/hashtable/hashtable.cpp
diff --git a/src/unit/xml/xml.cpp b/src/old/unit/xml/xml.cpp
index e4d779c..e4d779c 100644
--- a/src/unit/xml/xml.cpp
+++ b/src/old/unit/xml/xml.cpp
diff --git a/src/unit/entities/unit b/src/unit/entities/unit
new file mode 100644
index 0000000..28db45f
--- /dev/null
+++ b/src/unit/entities/unit
@@ -0,0 +1,30 @@
+<?xml version="1.1" ?>
+<entity desc="Unit test framework">
+        <param name="name" required="yes" desc="Name of the class"/>
+        <file
+                name="source"
+                filename="{=name:%tolower}.cpp"
+>#include "bu/unitsuite.h"
+
+class Unit : public Bu::UnitSuite
+{
+public:
+        Unit()
+        {
+                setName("{=name}");
+                addTest( Unit::test01 );
+        }
+
+        virtual ~Unit()
+        {
+        }
+
+        void test01()
+        {
+                unitTest( 0 == 5 );
+        }
+};
+
+int main( int argc, char *argv[] ){ return Unit().run( argc, argv ); }
+</file>
+</entity>
diff --git a/src/unit/file.cpp b/src/unit/file.cpp
new file mode 100644
index 0000000..1eaaf36
--- /dev/null
+++ b/src/unit/file.cpp
@@ -0,0 +1,111 @@
+#include "unitsuite.h"
+#include "file.h"
+#include "exceptions.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+class Unit : public Bu::UnitSuite
+{
+public:
+        Unit()
+        {
+                setName("File");
+                addTest( Unit::writeFull );
+                addTest( Unit::readBlocks );
+                addTest( Unit::readError1 );
+                addTest( Unit::readError2 );
+        }
+
+        virtual ~Unit() { }
+
+        //
+        // Tests go here
+        //
+        void writeFull()
+        {
+                Bu::File sf("testfile1", "wb");
+                for( int c = 0; c < 256; c++ )
+                {
+                        unsigned char ch = (unsigned char)c;
+                        sf.write( &ch, 1 );
+                        unitTest( sf.tell() == c+1 );
+                }
+                //unitTest( sf.canRead() == false );
+                //unitTest( sf.canWrite() == true );
+                //unitTest( sf.canSeek() == true );
+                sf.close();
+                struct stat sdat;
+                stat("testfile1", &sdat );
+                unitTest( sdat.st_size == 256 );
+        }
+
+        void readBlocks()
+        {
+                Bu::File sf("testfile1", "rb");
+                unsigned char buf[50];
+                size_t total = 0;
+                for(;;)
+                {
+                        size_t s = sf.read( buf, 50 );
+                        for( size_t c = 0; c < s; c++ )
+                        {
+                                unitTest( buf[c] == (unsigned char)(c+total) );
+                        }
+                        total += s;
+                        if( s < 50 )
+                        {
+                                unitTest( total == 256 );
+                                unitTest( sf.isEOS() == true );
+                                break;
+                        }
+                }
+                sf.close();
+        }
+
+        void readError1()
+        {
+                try
+                {
+                        Bu::File sf("doesn'texist", "rb");
+                        unitFailed("No exception thrown");
+                }
+                catch( Bu::FileException &e )
+                {
+                        return;
+                }
+        }
+
+        void readError2()
+        {
+                Bu::File sf("testfile1", "rb");
+                char buf[256];
+                int r = sf.read( buf, 256 );
+                unitTest( r == 256 );
+                // You have to read past the end to set the EOS flag.
+                unitTest( sf.isEOS() == false );
+                try
+                {
+                        if( sf.read( buf, 5 ) > 0 )
+                        {
+                                unitFailed("Non-zero read result");
+                        }
+                        else
+                        {
+                                sf.close();
+                        }
+                }
+                catch( Bu::FileException &e )
+                {
+                        sf.close();
+                        return;
+                }
+        }
+};
+
+int main( int argc, char *argv[] )
+{
+        return Unit().run( argc, argv );
+}
+
diff --git a/src/unit/fstring.cpp b/src/unit/fstring.cpp
new file mode 100644
index 0000000..72755eb
--- /dev/null
+++ b/src/unit/fstring.cpp
@@ -0,0 +1,28 @@
+#include "fstring.h"
+#include "unitsuite.h"
+
+class Unit : public Bu::UnitSuite
+{
+public:
+        Unit()
+        {
+                setName("FString");
+                addTest( Unit::test1 );
+        }
+
+        virtual ~Unit()
+        {
+        }
+
+        void test1()
+        {
+                unitTest( 1 == 1 );
+                unitTest( 1 == 0 );
+        }
+};
+
+int main( int argc, char *argv[] )
+{
+        return Unit().run( argc, argv );
+}
+
diff --git a/src/unit/hash.cpp b/src/unit/hash.cpp
new file mode 100644
index 0000000..9ea933f
--- /dev/null
+++ b/src/unit/hash.cpp
@@ -0,0 +1,40 @@
+#include "bu/fstring.h"
+#include "bu/hash.h"
+#include "bu/unitsuite.h"
+
+#include <stdio.h>
+
+class Unit : public Bu::UnitSuite
+{
+private:
+        typedef Bu::Hash<Bu::FString, int> StrIntHash;
+public:
+        Unit()
+        {
+                setName("Hash");
+                addTest( Unit::test_probe );
+        }
+
+        virtual ~Unit()
+        {
+        }
+
+        void test_probe()
+        {
+                StrIntHash h;
+                char buf[20];
+                for(int i=1;i<10000;i++)
+                {
+                        sprintf(buf,"%d",i);
+                        Bu::FString sTmp(buf);
+                        h[sTmp] = i;
+                        unitTest( h.has(sTmp) );
+                }
+        }
+};
+
+int main( int argc, char *argv[] )
+{
+        return Unit().run( argc, argv );
+}
+
diff --git a/src/unit/membuf.cpp b/src/unit/membuf.cpp
new file mode 100644
index 0000000..65ba82a
--- /dev/null
+++ b/src/unit/membuf.cpp
@@ -0,0 +1,37 @@
+#include "bu/unitsuite.h"
+#include "bu/membuf.h"
+
+class Unit : public Bu::UnitSuite
+{
+public:
+        Unit()
+        {
+                setName("MemBuf");
+                addTest( Unit::testWriteRead01 );
+        }
+
+        virtual ~Unit()
+        {
+        }
+
+        void testWriteRead01()
+        {
+                Bu::MemBuf mb;
+                unitTest( mb.write("ab", 2 ) == 2 );
+                unitTest( mb.write("cde", 3 ) == 3 );
+                unitTest( mb.write("FG", 2 ) == 2 );
+
+                mb.setPos( 0 );
+
+                char buf[8];
+                buf[7] = '\0';
+                unitTest( mb.read( buf, 7 ) == 7 );
+                unitTest( !strncmp( buf, "abcdeFG", 7 ) );
+                unitTest( mb.read( buf, 7 ) == 0 );
+                mb.seek( -3 );
+                unitTest( mb.read( buf, 7 ) == 3 );
+                unitTest( !strncmp( buf, "eFG", 3 ) );
+        }
+};
+
+int main( int argc, char *argv[] ){ return Unit().run( argc, argv ); }
diff --git a/src/unit/taf.cpp b/src/unit/taf.cpp
new file mode 100644
index 0000000..5e0e914
--- /dev/null
+++ b/src/unit/taf.cpp
@@ -0,0 +1,48 @@
+#include "unitsuite.h"
+#include "file.h"
+#include "tafreader.h"
+
+#include <string.h>
+#include <unistd.h>
+
+class Unit : public Bu::UnitSuite
+{
+public:
+        Unit()
+        {
+                setName("taf");
+                addTest( Unit::read1 );
+        }
+
+        virtual ~Unit()
+        {
+        }
+
+        void read1()
+        {
+#define FN_TMP ("/tmp/tmpXXXXXXXX")
+                Bu::FString sFnTmp(FN_TMP);
+                Bu::File fOut = Bu::File::tempFile( sFnTmp, "wb" );
+                const char *data =
+"{test: name=\"Bob\"}"
+;
+                fOut.write(data,strlen(data));
+                fOut.close();
+
+                Bu::File fIn(sFnTmp.c_str(), "rb");
+                Bu::TafReader tr(fIn);
+                
+                Bu::TafGroup *tn = tr.readGroup();
+                unitTest( !strcmp("Bob", tn->getProperty("name").c_str()) );
+                delete tn;
+
+                unlink(sFnTmp.c_str());
+#undef FN_TMP
+        }
+};
+
+int main( int argc, char *argv[] )
+{
+        return Unit().run( argc, argv );
+}
+
diff --git a/src/unitsuite.cpp b/src/unitsuite.cpp
new file mode 100644
index 0000000..2a28eb5
--- /dev/null
+++ b/src/unitsuite.cpp
@@ -0,0 +1,67 @@
+#include "unitsuite.h"
+
+Bu::UnitSuite::UnitSuite()
+{
+}
+
+Bu::UnitSuite::~UnitSuite()
+{
+}
+
+int Bu::UnitSuite::run( int argc, char *argv[] )
+{
+        for( TestList::iterator i = lTests.begin(); i != lTests.end(); i++ )
+        {
+                printf("%s: ", i->sName.getStr() );
+                fflush( stdout );
+                try
+                {
+                        (this->*(i->fTest))();
+                        printf("passed.\n");
+                }
+                catch( Failed &e )
+                {
+                        if( e.bFile )
+                        {
+                                printf("unitTest(%s) failed. (%s:%d)\n",
+                                        e.str.getStr(),
+                                        e.sFile.getStr(),
+                                        e.nLine
+                                        );
+                        }
+                        else
+                        {
+                                printf("unitTest(%s) failed.\n",
+                                        e.str.getStr()
+                                        );
+                        }
+                }
+                catch( ... )
+                {
+                        printf("failed with external exception.\n");
+                }
+        }
+
+        return 0;
+}
+
+void Bu::UnitSuite::add( Test fTest, Bu::FString sName )
+{
+        TestInfo ti;
+        ti.sName = sName;
+        long index = ti.sName.rfind("::");
+        if( index != -1 )
+        {
+                FString tmp = sSuiteName;
+                tmp += ti.sName.getStr()+index;
+                ti.sName = tmp;
+        }
+        ti.fTest = fTest;
+        lTests.push_back( ti );
+}
+
+void Bu::UnitSuite::setName( const FString &sName )
+{
+        sSuiteName = sName;
+}
+
diff --git a/src/unitsuite.h b/src/unitsuite.h
new file mode 100644
index 0000000..578b4cc
--- /dev/null
+++ b/src/unitsuite.h
@@ -0,0 +1,96 @@
+#ifndef BU_UNIT_SUITE_H
+#define BU_UNIT_SUITE_H
+
+#include <stdint.h>
+#include <list>
+#include "fstring.h"
+
+namespace Bu
+{
+        /**
+         * Provides a unit testing framework.  This is pretty easy to use, probably
+         * the best way to get started is to use ch to generate a template, or use
+         * the code below with appropriate tweaks:
+         *@code
+         * #include "unitsuite.h"
+         * 
+         * class Unit : public Bu::UnitSuite
+         * {
+         * public:
+         *      Unit()
+         *      {
+         *              setName("Example");
+         *              addTest( Unit::test );
+         *      }
+         * 
+         *      virtual ~Unit() { }
+         * 
+         *      //
+         *      // Tests go here
+         *      //
+         *      void test()
+         *      {
+         *              unitTest( 1 == 1 );
+         *      }
+         * };
+         * 
+         * int main( int argc, char *argv[] )
+         * {
+         *      return Unit().run( argc, argv );
+         * }
+         *
+         @endcode
+         * The main function can contain other things, but using this one exactly
+         * makes all of the test suites work exactly the same.  Using the optional
+         * setName at the top of the constructor replaces the class name with the
+         * chosen name when printing out stats and info.
+         */
+        class UnitSuite
+        {
+        public:
+                UnitSuite();
+                virtual ~UnitSuite();
+
+                int run( int argc=0, char *argv[]=NULL );
+
+                typedef void (UnitSuite::*Test)();
+
+                class Failed
+                {
+                public:
+                        Failed() : str(""), bFile( false ) { }
+                        Failed( const FString &s ) : str( s ), bFile( false ) { }
+                        Failed( const FString &s, const FString &sFile, int nLine ) :
+                                str( s ), sFile( sFile ), nLine( nLine ), bFile( true ) { }
+
+                        FString str;
+                        FString sFile;
+                        int nLine;
+                        bool bFile;
+                };
+                
+        protected:
+                void add( Test fTest, Bu::FString sName );
+                void setName( const FString &sName );
+
+        private:
+                typedef struct TestInfo
+                {
+                        FString sName;
+                        Test fTest;
+                } TestInfo;
+
+                typedef std::list<TestInfo> TestList;
+                TestList lTests;
+                FString sSuiteName;
+        };
+}
+
+#define addTest( fn ) add( static_cast<Bu::UnitSuite::Test>(&fn), #fn )
+#define unitTest( tst ) if( !(tst) )                                                    \
+{                                                                                                                               \
+        throw Bu::UnitSuite::Failed( #tst, __FILE__, __LINE__ );        \
+}
+#define unitFailed( msg ) throw Bu::UnitSuite::Failed(msg, __FILE__, __LINE__);
+
+#endif