summaryrefslogtreecommitdiff
path: root/src/tests/xb_test_expression.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/xb_test_expression.cpp')
-rwxr-xr-xsrc/tests/xb_test_expression.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/tests/xb_test_expression.cpp b/src/tests/xb_test_expression.cpp
index e3b47cc..75ed3e5 100755
--- a/src/tests/xb_test_expression.cpp
+++ b/src/tests/xb_test_expression.cpp
@@ -65,7 +65,9 @@ xbInt16 DevTester( xbXBase * xb, xbDbf * dbf, const char * sExpIn ){
std::cout << "dump nodes\n";
n = exp.GetNextNodeTest( NULL );
if( iRc == XB_NO_ERROR ){
+ #ifdef XB_DEBUG_SUPPORT
exp.DumpTree( xbTrue );
+ #endif // XB_DEBUG_SUPPORT
std::cout << "dump nodes\n";
n = exp.GetNextNodeTest( NULL );
if( !n ){
@@ -203,13 +205,17 @@ xbInt16 TestMethod( xbXBase *xb, xbDbf *d, xbInt16 PrintOption, const char * tit
if( sResult != sExpectedResult ){
std::cout << std::endl << "[FAIL 5] " << title << std::endl;
std::cout << " Expected Result = [" << sExpectedResult << "] Actual Result =[" << sResult.Str() << "]" << std::endl;
+ #ifdef XB_DEBUG_SUPPORT
exp.DumpTree( 1 );
+ #endif // XB_DEBUG_SUPPORT
return -1;
}
if( exp.GetResultLen() != iExpectedResultLen ){
std::cout << std::endl << "[FAIL 6] " << title << std::endl;
std::cout << " Expected Result Len = [" << iExpectedResultLen << "] Actual Result =[" << exp.GetResultLen() << "]" << std::endl;
+ #ifdef XB_DEBUG_SUPPORT
exp.DumpTree( 1 );
+ #endif // XB_DEBUG_SUPPORT
return -1;
}
if( PrintOption == 2 )
@@ -255,7 +261,9 @@ xbInt16 TestMethod( xbXBase * xb, xbDbf * d, xbInt16 PrintOption, const char * t
std::cout << std::endl << "[FAIL 5] " << title << std::endl;
std::cout << " Expected Result = [" << dExpectedResult << "] Actual Result =[" << dResult << "]" << std::endl;
// dump out the tree
+ #ifdef XB_DEBUG_SUPPORT
exp.DumpTree( 1 );
+ #endif // XB_DEBUG_SUPPORT
return -1;
}
if( PrintOption == 2 )
@@ -297,7 +305,9 @@ xbInt16 TestMethod( xbXBase * xb, xbDbf * d, xbInt16 PrintOption, const char * t
std::cout << std::endl << "[FAIL 5] " << title << std::endl;
std::cout << " Expected Result = [" << dtExpectedResult.Str() << "] Actual Result =[" << dtResult.Str() << "]" << std::endl;
// dump out the tree
+ #ifdef XB_DEBUG_SUPPORT
exp.DumpTree( 1 );
+ #endif // XB_DEBUG_SUPPORT
return -1;
}
if( PrintOption == 2 )
@@ -341,7 +351,9 @@ xbInt16 TestMethod( xbXBase * xb, xbDbf * d, xbInt16 PrintOption, const char * t
std::cout << std::endl << "[FAIL 5] " << title << std::endl;
std::cout << " Expected Result = [" << bExpectedResult << "] Actual Result =[" << bResult << "]" << std::endl;
// dump out the tree
+ #ifdef XB_DEBUG_SUPPORT
exp.DumpTree( 1 );
+ #endif //XB_DEBUG_SUPPORT
return -1;
}
if( PrintOption == 2 )
@@ -634,7 +646,9 @@ int main( int argCnt, char **av )
iRc += TestMethod( &x, MyFile, po, "DateTest5", "DATE2 - DATE1", (xbDouble) 8528 );
dtTest1.Set( "20120705" );
+
iRc += TestMethod( &x, MyFile, po, "DateTest6", "DATE2 - 3", dtTest1 );
+
iRc += TestMethod( &x, MyFile, po, "DateTest7", "DATE2 -= 3", dtTest1 );
dtTest1.Set( "20120718" );