1 files changed, 36 insertions, 45 deletions

diff --git a/src/tests/xb_test_tblmgr.cpp b/src/tests/xb_test_tblmgr.cpp
index 451432c..d048594 100755
--- a/src/tests/xb_test_tblmgr.cpp
+++ b/src/tests/xb_test_tblmgr.cpp
@@ -2,7 +2,7 @@
 
 XBase64 Software Library
 
-Copyright (c) 1997,2003,2014, 2022 Gary A Kunkel
+Copyright (c) 1997,2003,2014,2022,2023 Gary A Kunkel
 
 The xb64 software library is covered under the terms of the GPL Version 3, 2007 license.
 
@@ -13,7 +13,7 @@ Email Contact:
 
 */
 
-// This program tests the class xbXBase
+// This program tests the table manager functions.
 // usage:   xb_test_tblmgr QUITE|NORMAL|VERBOSE
 
 
@@ -25,33 +25,35 @@ using namespace xb;
 
 int main( int argCnt, char **av )
 {
-  int rc = 0;
-  int po = 1;          /* print option */
+  int iRc = 0;
+  int iPo = 1;          /* print option */
                        /* 0 - QUIET    */
                        /* 1 - NORMAL   */
                        /* 2 - VERBOSE  */
 
   if( argCnt > 1 ) {
     if( av[1][0] == 'Q' )
-      po = 0;
+      iPo = 0;
     else if( av[1][0] == 'V' )
-      po = 2;
+      iPo = 2;
   }
 
   xbXBase x;
 
-#ifdef XB_LOGGING_SUPPORT
+  #ifdef XB_LOGGING_SUPPORT
+  x.SetLogDirectory( PROJECT_LOG_DIR );
   x.EnableMsgLogging();
-  if( po ){
+  if( iPo ){
     std::cout << "Logfile is [" << x.GetLogFqFileName().Str() << "]" << std::endl;
   }
   xbString sMsg;
   sMsg.Sprintf( "Program [%s] initializing...", av[0] );
   x.WriteLogMessage( sMsg );
-#endif
+  #endif
+
   InitTime();
 
-  if( po == 2 ){
+  if( iPo == 2 ){
     std::cout << "DisplayError Test ==> ";
     x.DisplayError( 0 );
     #ifdef WIN32
@@ -73,14 +75,14 @@ int main( int argCnt, char **av )
     return -1;
   #endif
 
-  rc += TestMethod( po, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableC" ), 0 );
-  rc += TestMethod( po, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableA" ), 0 );
-  rc += TestMethod( po, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableB" ), 0 );
-  rc += TestMethod( po, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableD" ), 0 );
+  iRc += TestMethod( iPo, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableC" ), 0 );
+  iRc += TestMethod( iPo, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableA" ), 0 );
+  iRc += TestMethod( iPo, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableB" ), 0 );
+  iRc += TestMethod( iPo, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableD" ), 0 );
 
 
   // Next line should generate an exception
-  rc += TestMethod( po, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableC" ), XB_DUP_TABLE_OR_ALIAS );
+  iRc += TestMethod( iPo, "AddTblToTblLst()", x.AddTblToTblList( d1, "TestTableC" ), XB_DUP_TABLE_OR_ALIAS );
 
   std::cout << "**** Next list should have one each of TestTableA, B, C, D sorted in alpha order ****" << std::endl;
   x.DisplayTableList();
@@ -90,7 +92,7 @@ int main( int argCnt, char **av )
     std::cout << "[PASS] GetDbfPtr()" << std::endl;
   else{
     std::cout << "[FAIL] GetDbfPtr()" << std::endl;
-    rc--;
+    iRc--;
   }
 
 
@@ -98,70 +100,59 @@ std::cout << "cp0\n";
   x.SetDataDirectory( "/ABCDEFG/" );
 
   #ifdef WIN32
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG\\", 9 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG\\", 9 );
   #else
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG/", 9 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG/", 9 );
   #endif
 std::cout << "cp1\n";
   x.SetDataDirectory( "/ABCDEFG" );
   #ifdef WIN32
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG", 8 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG", 8 );
   #else
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG", 8 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG", 8 );
   #endif
 
 
-  std::cout << "cp2\n";
-
-
   x.SetDataDirectory( "\\ABCDEFG\\");
   #ifdef WIN32
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG\\", 9 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG\\", 9 );
   #else
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG/", 9 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG/", 9 );
   #endif
 
-  std::cout << "cp3\n";
-
-
   x.SetDataDirectory( "\\ABCDEFG" );
   #ifdef WIN32
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG", 8 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG", 8 );
   #else
-    rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG", 8 );
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG", 8 );
   #endif
 
-
-  std::cout << "cp4\n";
-
-
   x.SetDataDirectory( "ABCDEFG" );
-  rc += TestMethod( po, "Set/GetDataDirectory()", x.GetDataDirectory(),  "ABCDEFG", 7 );
-
+  iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "ABCDEFG", 7 );
 
-  rc += TestMethod( po, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableB" ), 0 );
-  rc += TestMethod( po, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableB" ), XB_NOT_FOUND );
+  iRc += TestMethod( iPo, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableB" ), 0 );
+  iRc += TestMethod( iPo, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableB" ), XB_NOT_FOUND );
   std::cout << "**** Next list should not have TestTableB in it ****" << std::endl;
   x.DisplayTableList();
 
 
-  rc += TestMethod( po, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableA" ), 0 );
-  rc += TestMethod( po, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableC" ), 0 );
-  rc += TestMethod( po, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableD" ), 0 );
+  iRc += TestMethod( iPo, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableA" ), 0 );
+  iRc += TestMethod( iPo, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableC" ), 0 );
+  iRc += TestMethod( iPo, "RemoveTblFromDbList()", x.RemoveTblFromTblList( "TestTableD" ), 0 );
 
 
   delete d1;
 
-  if( po > 0 || rc < 0 )
-    fprintf( stdout, "Total Errors = %d\n", rc * -1 );
+  if( iPo > 0 || iRc < 0 )
+    fprintf( stdout, "Total Errors = %d\n", iRc * -1 );
 
 
 #ifdef XB_LOGGING_SUPPORT
-  sMsg.Sprintf( "Program [%s] terminating with [%d] errors...", av[0], rc * -1 );
+  sMsg.Sprintf( "Program [%s] terminating with [%d] errors...", av[0], iRc * -1 );
   x.WriteLogMessage( sMsg );
 #endif
 
 
-  return rc;
+  return iRc;
 }