Added the first of many unit tests. For now the unit tests are just built with

everything else in the all target of the makefile, which is fine, but relies on
CppTest, which can be found at http://cpptest.sf.net

Also fixed some things I've been meaning to get to for a while in the xml
system, including a few bugs that will make coping with malformed data not hang
other programs, and do the error reporting in a nice way.

2 files changed, 150 insertions, 0 deletions

diff --git a/src/unit/hashtable.cpp b/src/unit/hashtable.cpp
new file mode 100644
index 0000000..b2e1cf5
--- /dev/null
+++ b/src/unit/hashtable.cpp
@@ -0,0 +1,107 @@
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <cpptest.h>
+#include <string.h>
+#include <set>
+#include <map>
+
+#include "hashfunctionstring.h"
+#include "hashfunctioncasestring.h"
+#include "hashfunctionint.h"
+
+class HashFunctionSuite : public Test::Suite
+{
+public:
+        HashFunctionSuite()
+        {
+                TEST_ADD( HashFunctionSuite::functionString )
+                TEST_ADD( HashFunctionSuite::functionCaseString )
+                TEST_ADD( HashFunctionSuite::functionInt )
+        }
+
+private:
+        void functionStringWorker( HashFunction &hf, std::set<unsigned long> &sCodes, char *str, int nLevel, int nMax )
+        {
+                for( char let = 'A'; let <= 'z'; let += 3 )
+                {
+                        str[nLevel+1] = '\0';
+                        str[nLevel] = let;
+                        unsigned long x = hf.hash( str );
+                        TEST_ASSERT( sCodes.find( x ) == sCodes.end() );
+                        TEST_ASSERT( hf.cmpIDs( str, str ) );
+                        sCodes.insert( x );
+
+                        if( nLevel < nMax )
+                                functionStringWorker( hf, sCodes, str, nLevel+1, nMax );
+                }
+        }
+        
+        void functionString()
+        {
+                HashFunctionString hf;
+                char str[10];
+
+                std::set<unsigned long> sCodes;
+
+                functionStringWorker( hf, sCodes, str, 0, 3 );
+        }
+        
+        void functionCaseStringWorker( HashFunction &hf, std::map<unsigned long, char *> &sCodes, char *str, int nLevel, int nMax )
+        {
+                for( char let = 'A'; let <= 'z'; let += 3 )
+                {
+                        str[nLevel+1] = '\0';
+                        str[nLevel] = let;
+                        unsigned long x = hf.hash( str );
+                        std::map<unsigned long, char *>::iterator i = sCodes.find( x );
+                        if( i == sCodes.end() )
+                        {
+                                sCodes[x] = strdup( str );
+                        }
+                        else
+                        {
+                                TEST_ASSERT( strcasecmp( (*i).second, str ) == 0 );
+                                TEST_ASSERT( hf.cmpIDs( (*i).second, str ) == true );
+                        }
+
+                        if( nLevel < nMax )
+                                functionCaseStringWorker( hf, sCodes, str, nLevel+1, nMax );
+                }
+        }
+        
+        void functionCaseString()
+        {
+                HashFunctionCaseString hf;
+                char str[10];
+
+                std::map<unsigned long, char *> sCodes;
+
+                functionCaseStringWorker( hf, sCodes, str, 0, 3 );
+
+                std::map<unsigned long, char *>::iterator i;
+                for( i = sCodes.begin(); i != sCodes.end(); i++ )
+                {
+                        free( (*i).second );
+                }
+        }
+
+        void functionInt()
+        {
+                HashFunctionInt hf;
+
+                for( long i = -100000; i <= 100000; i += 100 )
+                {
+                        TEST_ASSERT( ((long)hf.hash( (void *)i )) == i );
+                        TEST_ASSERT( ((long)hf.cmpIDs( (void *)i, (void *)i )) );
+                }
+        }
+};
+
+int main( int argc, char *argv[] )
+{
+        Test::TextOutput output( Test::TextOutput::Verbose );
+        HashFunctionSuite ts;
+        return ts.run( output ) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
diff --git a/src/unit/xml.cpp b/src/unit/xml.cpp
new file mode 100644
index 0000000..559b2f4
--- /dev/null
+++ b/src/unit/xml.cpp
@@ -0,0 +1,43 @@
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <cpptest.h>
+#include <string.h>
+
+#include "xmlstringreader.h"
+#include "xmlexception.h"
+
+class XmlCoreTestSuite : public Test::Suite
+{
+public:
+        XmlCoreTestSuite()
+        {
+                TEST_ADD( XmlCoreTestSuite::badXml01 )
+                TEST_ADD( XmlCoreTestSuite::badXml02 )
+                TEST_ADD( XmlCoreTestSuite::badXml03 )
+        }
+        
+private:
+        void badXml01()
+        {
+                TEST_THROWS( XmlStringReader r("<hello></bye>"), XmlException & );
+        }
+        
+        void badXml02()
+        {
+                TEST_THROWS( XmlStringReader r("<hello>"), XmlException & );
+        }
+
+        void badXml03()
+        {
+                TEST_THROWS( XmlStringReader r("<hello param=\"stuff?"), XmlException & );
+        }
+};
+
+int main( int argc, char *argv[] )
+{
+        Test::TextOutput output( Test::TextOutput::Verbose );
+        XmlCoreTestSuite ts;
+        return ts.run( output ) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+