8 files changed, 77 insertions, 41 deletions

diff --git a/src/sfile.cpp b/src/file.cpp
index 529d8cd..5de5f6c 100644
--- a/src/sfile.cpp
+++ b/src/file.cpp
@@ -1,8 +1,8 @@
-#include "sfile.h"
+#include "file.h"
 #include "exceptions.h"
 #include <errno.h>
 
-Bu::SFile::SFile( const char *sName, const char *sFlags )
+Bu::File::File( const char *sName, const char *sFlags )
 {
         fh = fopen( sName, sFlags );
         if( fh == NULL )
@@ -11,12 +11,12 @@ Bu::SFile::SFile( const char *sName, const char *sFlags )
         }
 }
 
-Bu::SFile::~SFile()
+Bu::File::~File()
 {
         close();
 }
 
-void Bu::SFile::close()
+void Bu::File::close()
 {
         if( fh )
         {
@@ -25,7 +25,7 @@ void Bu::SFile::close()
         }
 }
 
-size_t Bu::SFile::read( void *pBuf, size_t nBytes )
+size_t Bu::File::read( void *pBuf, size_t nBytes )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -38,7 +38,7 @@ size_t Bu::SFile::read( void *pBuf, size_t nBytes )
         return nAmnt;
 }
 
-size_t Bu::SFile::write( const void *pBuf, size_t nBytes )
+size_t Bu::File::write( const void *pBuf, size_t nBytes )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -46,7 +46,7 @@ size_t Bu::SFile::write( const void *pBuf, size_t nBytes )
         return fwrite( pBuf, 1, nBytes, fh );
 }
 
-long Bu::SFile::tell()
+long Bu::File::tell()
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -54,7 +54,7 @@ long Bu::SFile::tell()
         return ftell( fh );
 }
 
-void Bu::SFile::seek( long offset )
+void Bu::File::seek( long offset )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -62,7 +62,7 @@ void Bu::SFile::seek( long offset )
         fseek( fh, offset, SEEK_CUR );
 }
 
-void Bu::SFile::setPos( long pos )
+void Bu::File::setPos( long pos )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -70,7 +70,7 @@ void Bu::SFile::setPos( long pos )
         fseek( fh, pos, SEEK_SET );
 }
 
-void Bu::SFile::setPosEnd( long pos )
+void Bu::File::setPosEnd( long pos )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -78,22 +78,22 @@ void Bu::SFile::setPosEnd( long pos )
         fseek( fh, pos, SEEK_END );
 }
 
-bool Bu::SFile::isEOS()
+bool Bu::File::isEOS()
 {
         return feof( fh );
 }
 
-bool Bu::SFile::canRead()
+bool Bu::File::canRead()
 {
         return true;
 }
 
-bool Bu::SFile::canWrite()
+bool Bu::File::canWrite()
 {
         return true;
 }
 
-bool Bu::SFile::canSeek()
+bool Bu::File::canSeek()
 {
         return true;
 }
diff --git a/src/sfile.h b/src/file.h
index f63b812..bbc620c 100644
--- a/src/sfile.h
+++ b/src/file.h
@@ -1,5 +1,5 @@
-#ifndef SFILE_H
-#define SFILE_H
+#ifndef FILE_H
+#define FILE_H
 
 #include <stdint.h>
 
@@ -7,11 +7,11 @@
 
 namespace Bu
 {
-        class SFile : public Bu::Stream
+        class File : public Bu::Stream
         {
         public:
-                SFile( const char *sName, const char *sFlags );
-                virtual ~SFile();
+                File( const char *sName, const char *sFlags );
+                virtual ~File();
 
                 virtual void close();
                 virtual size_t read( void *pBuf, size_t nBytes );
diff --git a/src/socket.cpp b/src/socket.cpp
new file mode 100644
index 0000000..c5c592b
--- /dev/null
+++ b/src/socket.cpp
@@ -0,0 +1,10 @@
+#include "socket.h"
+
+Bu::Socket::Socket()
+{
+}
+
+Bu::Socket::~Socket()
+{
+}
+
diff --git a/src/ssocket.h b/src/socket.h
index ce02091..8ccde71 100644
--- a/src/ssocket.h
+++ b/src/socket.h
@@ -1,5 +1,5 @@
-#ifndef S_SOCKET_H
-#define S_SOCKET_H
+#ifndef SOCKET_H
+#define SOCKET_H
 
 #include <stdint.h>
 
@@ -10,11 +10,11 @@ namespace Bu
         /**
          *
          */
-        class SSocket : public Stream
+        class Socket : public Stream
         {
         public:
-                SSocket();
-                virtual ~SSocket();
+                Socket();
+                virtual ~Socket();
 
         private:
 
diff --git a/src/ssocket.cpp b/src/ssocket.cpp
deleted file mode 100644
index 85a2da0..0000000
--- a/src/ssocket.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "ssocket.h"
-
-Bu::SSocket::SSocket()
-{
-}
-
-Bu::SSocket::~SSocket()
-{
-}
diff --git a/src/tests/archive.cpp b/src/tests/archive.cpp
index 5b7e285..2035aa6 100644
--- a/src/tests/archive.cpp
+++ b/src/tests/archive.cpp
@@ -1,11 +1,11 @@
 #include "archive.h"
-#include "sfile.h"
+#include "file.h"
 
 using namespace Bu;
 
 int main()
 {
-        SFile f("test.dat", "wb");
+        File f("test.dat", "wb");
         Archive ar( f, Archive::save );
 
         std::string s("Hello there");
diff --git a/src/unit/sfile.cpp b/src/unit/file.cpp
index 2aff312..a45b8d7 100644
--- a/src/unit/sfile.cpp
+++ b/src/unit/file.cpp
@@ -1,5 +1,5 @@
 #include "unitsuite.h"
-#include "sfile.h"
+#include "file.h"
 #include "exceptions.h"
 
 #include <sys/types.h>
@@ -11,7 +11,7 @@ class Unit : public Bu::UnitSuite
 public:
         Unit()
         {
-                setName("SFile");
+                setName("File");
                 addTest( Unit::writeFull );
                 addTest( Unit::readBlocks );
                 addTest( Unit::readError1 );
@@ -25,7 +25,7 @@ public:
         //
         void writeFull()
         {
-                Bu::SFile sf("testfile1", "wb");
+                Bu::File sf("testfile1", "wb");
                 for( int c = 0; c < 256; c++ )
                 {
                         unsigned char ch = (unsigned char)c;
@@ -43,7 +43,7 @@ public:
 
         void readBlocks()
         {
-                Bu::SFile sf("testfile1", "rb");
+                Bu::File sf("testfile1", "rb");
                 unsigned char buf[50];
                 size_t total = 0;
                 for(;;)
@@ -68,7 +68,7 @@ public:
         {
                 try
                 {
-                        Bu::SFile sf("doesn'texist", "rb");
+                        Bu::File sf("doesn'texist", "rb");
                         unitFailed("No exception thrown");
                 }
                 catch( Bu::FileException &e )
@@ -79,7 +79,7 @@ public:
 
         void readError2()
         {
-                Bu::SFile sf("testfile1", "rb");
+                Bu::File sf("testfile1", "rb");
                 char buf[256];
                 int r = sf.read( buf, 256 );
                 unitTest( r == 256 );
diff --git a/src/unitsuite.h b/src/unitsuite.h
index db249b2..6e9270a 100644
--- a/src/unitsuite.h
+++ b/src/unitsuite.h
@@ -8,7 +8,42 @@
 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
         {