1 files changed, 41 insertions, 11 deletions

diff --git a/src/tests/xb_test_log.cpp b/src/tests/xb_test_log.cpp
index 28ae552..a586809 100755
--- a/src/tests/xb_test_log.cpp
+++ b/src/tests/xb_test_log.cpp
@@ -41,7 +41,7 @@ int main( int argCnt, char **av )
   }
 
   xbXBase x;
-  x.SetLogDirectory( PROJECT_LOG_DIR );
+
   x.EnableMsgLogging();
   InitTime();
   if( po ){
@@ -51,28 +51,58 @@ int main( int argCnt, char **av )
   sMsg.Sprintf( "Program [%s] initializing...", av[0] );
   x.WriteLogMessage( sMsg );
 
-  xbString sNewLogFileName = "Logfile2.txt";
-  sMsg.Sprintf( "Switching to logfile [%s]", sNewLogFileName.Str() );
-  x.WriteLogMessage( sMsg );
+  // verify first logfile location is correct
+  xbString sWork;
+  x.GetHomeDir( sWork );
+  std::cout << "Home Dir = " << sWork.Str() << std::endl;
+
+  // verify home directory > 0 length
+  xbInt32 iLen = (xbInt32) sWork.Len();
+  if( sWork.Len() == 0 )
+    rc += TestMethod( po, "GetHomeDir()", iLen, 1 );
+  else
+	rc += TestMethod( po, "GetHomeDir()", iLen, iLen );
+  
+  sWork.Sprintf( "%s%cxbase64%clogs", sWork.Str(), 
+      x.GetPathSeparator(), x.GetPathSeparator());
+
+  // verify path exists
+  // std::cout << "Home Dir = " << sHomeDir.Str() << std::endl;
+  xbFile f( &x );
+  rc += TestMethod( po, "FileExists()", f.FileExists( sWork ), xbTrue );
+
+ 
+  sWork.Sprintf( "%s%c%s", sWork.Str(), 
+      x.GetPathSeparator(), x.GetLogFileName().Str() );
+
+  // std::cout << "Home Dir = " << sWork.Str() << std::endl;
+  rc += TestMethod( po, "FileExists()", f.FileExists( sWork ), xbTrue );
+  rc += TestMethod( po, "Get Log Status()", x.GetLogStatus(), xbTrue );
+
 
   x.DisableMsgLogging();
-  rc += TestMethod( po, "Set/Get Log Status()", x.GetLogStatus(), xbFalse );
-  x.SetLogFileName( sNewLogFileName );
+  rc += TestMethod( po, "Get Log Status()", x.GetLogStatus(), xbFalse );
 
+  xbString sNewLogFileName = "Logfile2.txt";
+  x.SetLogDirectory( PROJECT_LOG_DIR );
+  x.SetLogFileName( sNewLogFileName );
+  sWork.Sprintf( "%s%c%s",
+     PROJECT_LOG_DIR,  x.GetPathSeparator(), sNewLogFileName.Str());
+  
+  sMsg.Sprintf( "Switching to logfile [%s]", sWork.Str() );
   x.EnableMsgLogging();
-  rc += TestMethod( po, "Set/Get Log Status()", x.GetLogStatus(), 1 );
-  rc += TestMethod( po,"WriteLogMessage()", x.WriteLogMessage( "Test log message........" ), XB_NO_ERROR );
+  rc += TestMethod( po, "Get Log Status()", x.GetLogStatus(), xbTrue );
+  rc += TestMethod( po, "FileExists()", f.FileExists( sWork ), xbTrue );
 
-  sMsg.Sprintf( "Program [%s] terminating with [%d] errors...", av[0], rc * -1 );
   x.WriteLogMessage( sMsg );
+  rc += TestMethod( po, "Get Log Status()", x.GetLogStatus(), xbTrue );
+  x.WriteLogMessage( "Test Log Message" );
 
   if( po > 0 || rc < 0 )
     fprintf( stdout, "Total Errors = %d\n", rc * -1 );
 
-
   #endif         /* XB_LOGGING_SUPPORT */
 
-
   return rc;
 }