Update upstream source from tag 'upstream/4.1.4'

Update to upstream version '4.1.4'
with Debian dir 403f575aa88344456029245280a05149f0173f2e

1 files changed, 113 insertions, 0 deletions

diff --git a/src/tests/xb_test_xbase.cpp b/src/tests/xb_test_xbase.cpp
index 4751c25..a0affd6 100755
--- a/src/tests/xb_test_xbase.cpp
+++ b/src/tests/xb_test_xbase.cpp
@@ -90,6 +90,119 @@ int main( int argCnt, char **av )
     std::cout << "DisplayError Test ==> ";
     x.DisplayError( 0 );
   }
+
+  #ifdef WIN32
+  char cSep = '\\';
+  iRc += TestMethod( iPo, "GetPathSeparator()", x.GetPathSeparator(), cSep );
+  #else
+  char cSep = '/';
+  iRc += TestMethod( iPo, "GetPathSeparator()", x.GetPathSeparator(), cSep );
+  #endif
+
+
+
+  xbString sDir  = "\\dir\\path";
+  xbString sFile = "myfile";
+  xbString sExt  = "DBF";
+  xbString sFqn;
+  iRc += TestMethod( iPo, "CreateFQN()", x.CreateFqn( sDir, sFile, sExt, sFqn ), XB_NO_ERROR );
+  //std::cout << "FQN = [" << sFqn.Str() << "]\n";
+  #ifdef WIN32 
+    iRc += TestMethod( iPo, "CreateFQN()", sFqn.Str(), "\\dir\\path\\myfile.DBF", 20 );
+  #else
+    iRc += TestMethod( iPo, "CreateFQN()", sFqn.Str(), "/dir/path/myfile.DBF", 20 );
+  #endif
+
+  sDir  = "/dir/path";
+  iRc += TestMethod( iPo, "CreateFQN()", x.CreateFqn( sDir, sFile, sExt, sFqn ), XB_NO_ERROR );
+  #ifdef WIN32 
+    iRc += TestMethod( iPo, "CreateFQN()", sFqn.Str(), "\\dir\\path\\myfile.DBF", 20 );
+  #else
+    iRc += TestMethod( iPo, "CreateFQN()", sFqn.Str(), "/dir/path/myfile.DBF", 20 );
+  #endif
+
+
+  x.SetDataDirectory( "/ABCDEFG/" );
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG\\", 9 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG/", 9 );
+  #endif
+
+  x.SetDataDirectory( "/ABCDEFG" );
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG", 8 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG", 8 );
+  #endif
+
+  x.SetDataDirectory( "\\ABCDEFG\\");
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG\\", 9 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG/", 9 );
+  #endif
+
+  x.SetDataDirectory( "\\ABCDEFG" );
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "\\ABCDEFG", 8 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetDataDirectory()", x.GetDataDirectory(),  "/ABCDEFG", 8 );
+  #endif
+
+#ifdef XB_LOGGING_SUPPORT
+
+  x.SetLogDirectory( "ABCDEFG" );
+  iRc += TestMethod( iPo, "Set/GetLogDirectory()", x.GetLogDirectory(),  "ABCDEFG", 7 );
+  x.SetLogDirectory( "/ABCDEFG/" );
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetLogDirectory()", x.GetLogDirectory(),  "\\ABCDEFG\\", 9 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetLogDirectory()", x.GetLogDirectory(),  "/ABCDEFG/", 9 );
+  #endif
+
+  x.SetLogDirectory( "/ABCDEFG" );
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetLogDirectory()", x.GetLogDirectory(),  "\\ABCDEFG", 8 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetLogDirectory()", x.GetLogDirectory(),  "/ABCDEFG", 8 );
+  #endif
+
+  x.SetLogDirectory( "\\ABCDEFG\\");
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetLogDirectory()", x.GetLogDirectory(),  "\\ABCDEFG\\", 9 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetLogDirectory()", x.GetLogDirectory(),  "/ABCDEFG/", 9 );
+  #endif
+
+  x.SetLogFileName( "LogFileNameTest" );
+  iRc += TestMethod( iPo, "Set/GetLogFileName()", x.GetLogFileName(),  "LogFileNameTest", 15 );
+#endif
+
+  x.SetTempDirectory( "/ABCDEFG/" );
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetTempDirectory()", x.GetTempDirectory(),  "\\ABCDEFG\\", 9 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetTempDirectory()", x.GetTempDirectory(),  "/ABCDEFG/", 9 );
+  #endif
+
+  x.SetTempDirectory( "/ABCDEFG" );
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetTempDirectory()", x.GetTempDirectory(),  "\\ABCDEFG", 8 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetTempDirectory()", x.GetTempDirectory(),  "/ABCDEFG", 8 );
+  #endif
+
+  x.SetTempDirectory( "\\ABCDEFG\\");
+  #ifdef WIN32
+    iRc += TestMethod( iPo, "Set/GetTempDirectory()", x.GetTempDirectory(),  "\\ABCDEFG\\", 9 );
+  #else
+    iRc += TestMethod( iPo, "Set/GetTempDirectory()", x.GetTempDirectory(),  "/ABCDEFG/", 9 );
+  #endif
+
+
+//  std::cout << "path separator = [" << x.GetPathSeparator() << "]\n";
+
   if( iPo > 0 || iRc < 0 )
     fprintf( stdout, "Total Errors = %d\n", iRc * -1 );