diff --git a/src/main/scripts/init b/src/main/scripts/init index 3a3b681..7283ba4 100755 --- a/src/main/scripts/init +++ b/src/main/scripts/init @@ -29,7 +29,9 @@ if [ -z ${DB2UNIT_PATH} ] ; then fi if [ -z ${DB2UNIT_SRC_MAIN_CODE_PATH} ] ; then - export DB2UNIT_SRC_MAIN_CODE_PATH=${DB2UNIT_PATH}/sql-pl - export DB2UNIT_SRC_MAIN_SCRIPT_PATH=${DB2UNIT_PATH} + DB2UNIT_SRC_MAIN_CODE_PATH=${DB2UNIT_PATH}/sql-pl + DB2UNIT_SRC_MAIN_SCRIPT_PATH=${DB2UNIT_PATH} + DB2UNIT_SRC_TEST_CODE_PATH=${DB2UNIT_PATH}/sql-pl + DB2UNIT_SRC_TEST_SCRIPT_PATH=${DB2UNIT_PATH} fi diff --git a/src/main/scripts/init.bat b/src/main/scripts/init.bat index f637b35..25e36f6 100644 --- a/src/main/scripts/init.bat +++ b/src/main/scripts/init.bat @@ -32,5 +32,7 @@ if "%DB2UNIT_PATH%" EQU "" ( if "%DB2UNIT_SRC_MAIN_CODE_PATH%" EQU "" ( set DB2UNIT_SRC_MAIN_CODE_PATH=%DB2UNIT_PATH%sql-pl set DB2UNIT_SRC_MAIN_SCRIPT_PATH=%DB2UNIT_PATH% + set DB2UNIT_SRC_TEST_CODE_PATH=%DB2UNIT_PATH%sql-pl + set DB2UNIT_SRC_TEST_SCRIPT_PATH=%DB2UNIT_PATH% ) diff --git a/src/main/scripts/init.ps1 b/src/main/scripts/init.ps1 index 15045ad..191b03b 100644 --- a/src/main/scripts/init.ps1 +++ b/src/main/scripts/init.ps1 @@ -31,5 +31,7 @@ if ( ! ( Test-Path Variable:\DB2UNIT_PATH ) ) { if ( ! ( Test-Path Variable:\DB2UNIT_SRC_MAIN_CODE_PATH ) ) { ${Global:DB2UNIT_SRC_MAIN_CODE_PATH}="${DB2UNIT_PATH}\sql-pl" ${Global:DB2UNIT_SRC_MAIN_SCRIPT_PATH}="${DB2UNIT_PATH}" + ${Global:DB2UNIT_SRC_TEST_CODE_PATH}="${DB2UNIT_PATH}\sql-pl" + ${Global:DB2UNIT_SRC_TEST_SCRIPT_PATH}="${DB2UNIT_PATH}" } diff --git a/src/main/sql-pl/04-Body.sql b/src/main/sql-pl/04-Body.sql index 8cfbca6..929b352 100644 --- a/src/main/sql-pl/04-Body.sql +++ b/src/main/sql-pl/04-Body.sql @@ -324,7 +324,7 @@ ALTER MODULE DB2UNIT ADD CALL LOGGER.GET_LOGGER('DB2UNIT_1.DB2UNIT.WRITE_IN_REPORT', LOGGER_ID); IF (AUTONOMOUS_EXEC = TRUE) THEN - CALL LOGGER.WARN(LOGGER_ID, 'It will get into an autonomous transaction'); + CALL LOGGER.INFO(LOGGER_ID, 'It will get into an autonomous transaction'); CALL WRITE_IN_REPORT_AUTONOMOUS(MSG); ELSE CALL WRITE_IN_REPORT_BODY(MSG); diff --git a/src/test/scripts/init-dev b/src/test/scripts/init-dev index 4f4fb9d..b5d691d 100755 --- a/src/test/scripts/init-dev +++ b/src/test/scripts/init-dev @@ -24,10 +24,12 @@ # Made in COLOMBIA. # This variable indicates the location of the sources. -DB2UNIT_PATH=$(cd ../../.. ; echo "${PWD}") +if [ -z ${DB2UNIT_PATH} ] ; then + DB2UNIT_PATH=$(cd ../../.. ; echo "${PWD}") -DB2UNIT_SRC_MAIN_CODE_PATH=${DB2UNIT_PATH}/src/main/sql-pl -DB2UNIT_SRC_MAIN_SCRIPT_PATH=${DB2UNIT_PATH}/src/main/scripts -DB2UNIT_SRC_TEST_CODE_PATH=${DB2UNIT_PATH}/src/test/sql-pl -DB2UNIT_SRC_TEST_SCRIPT_PATH=${DB2UNIT_PATH}/src/test/scripts + DB2UNIT_SRC_MAIN_CODE_PATH=${DB2UNIT_PATH}/src/main/sql-pl + DB2UNIT_SRC_MAIN_SCRIPT_PATH=${DB2UNIT_PATH}/src/main/scripts + DB2UNIT_SRC_TEST_CODE_PATH=${DB2UNIT_PATH}/src/test/sql-pl + DB2UNIT_SRC_TEST_SCRIPT_PATH=${DB2UNIT_PATH}/src/test/scripts +fi diff --git a/src/test/scripts/init-dev.bat b/src/test/scripts/init-dev.bat index a8cde2b..b55f6f0 100644 --- a/src/test/scripts/init-dev.bat +++ b/src/test/scripts/init-dev.bat @@ -25,10 +25,12 @@ :: Made in COLOMBIA. :: This variable indicates the location of the sources. -set DB2UNIT_PATH=%~dp0..\..\.. +if "%DB2UNIT_PATH%" EQU "" ( + set DB2UNIT_PATH=%~dp0..\..\.. -set DB2UNIT_SRC_MAIN_CODE_PATH=%DB2UNIT_PATH%\src\main\sql-pl -set DB2UNIT_SRC_MAIN_SCRIPT_PATH=%DB2UNIT_PATH%\src\main\scripts -set DB2UNIT_SRC_TEST_CODE_PATH=%DB2UNIT_PATH%\src\test\sql-pl -set DB2UNIT_SRC_TEST_SCRIPT_PATH=%DB2UNIT_PATH%\src\test\scripts + set DB2UNIT_SRC_MAIN_CODE_PATH=%DB2UNIT_PATH%\src\main\sql-pl + set DB2UNIT_SRC_MAIN_SCRIPT_PATH=%DB2UNIT_PATH%\src\main\scripts + set DB2UNIT_SRC_TEST_CODE_PATH=%DB2UNIT_PATH%\src\test\sql-pl + set DB2UNIT_SRC_TEST_SCRIPT_PATH=%DB2UNIT_PATH%\src\test\scripts +) diff --git a/src/test/scripts/init-dev.ps1 b/src/test/scripts/init-dev.ps1 index fa73840..92ea0f4 100644 --- a/src/test/scripts/init-dev.ps1 +++ b/src/test/scripts/init-dev.ps1 @@ -24,10 +24,12 @@ # Made in COLOMBIA. # This variable indicates the location of the sources. -${DB2UNIT_PATH}="..\..\.." +if ( ! ( Test-Path Variable:\DB2UNIT_PATH ) ) { + ${DB2UNIT_PATH}="..\..\.." -${Global:DB2UNIT_SRC_MAIN_CODE_PATH}="${DB2UNIT_PATH}\src\main\sql-pl" -${Global:DB2UNIT_SRC_MAIN_SCRIPT_PATH}="${DB2UNIT_PATH}\src\main\scripts" -${Global:DB2UNIT_SRC_TEST_CODE_PATH}="${DB2UNIT_PATH}\src\test\sql-pl" -${Global:DB2UNIT_SRC_TEST_SCRIPT_PATH}="${DB2UNIT_PATH}\src\test\scripts" + ${Global:DB2UNIT_SRC_MAIN_CODE_PATH}="${DB2UNIT_PATH}\src\main\sql-pl" + ${Global:DB2UNIT_SRC_MAIN_SCRIPT_PATH}="${DB2UNIT_PATH}\src\main\scripts" + ${Global:DB2UNIT_SRC_TEST_CODE_PATH}="${DB2UNIT_PATH}\src\test\sql-pl" + ${Global:DB2UNIT_SRC_TEST_SCRIPT_PATH}="${DB2UNIT_PATH}\src\test\scripts" +} diff --git a/src/test/scripts/test b/src/test/scripts/test index 0118eb6..070f8ed 100755 --- a/src/test/scripts/test +++ b/src/test/scripts/test @@ -44,7 +44,7 @@ else db2 "DROP SCHEMA ERRORSCHEMA RESTRICT" > /dev/null # Installs the tests. - db2 -td@ -f ../sql-pl/Tests_${SCHEMA}.sql + db2 -td@ -f ${DB2UNIT_SRC_TEST_CODE_PATH}/Tests_${SCHEMA}.sql fi # Execute the tests. diff --git a/src/test/scripts/test.bat b/src/test/scripts/test.bat index 749bd94..0bf3176 100644 --- a/src/test/scripts/test.bat +++ b/src/test/scripts/test.bat @@ -78,7 +78,7 @@ goto:eof db2 "DROP SCHEMA ERRORSCHEMA RESTRICT" > NUL :: Installs the tests. - db2 -td@ -f ../sql-pl/Tests_%SCHEMA%.sql + db2 -td@ -f %DB2UNIT_SRC_TEST_CODE_PATH%/Tests_%SCHEMA%.sql ) :: Execute the tests. diff --git a/src/test/scripts/test.ps1 b/src/test/scripts/test.ps1 index 0a963b1..43e4eb0 100644 --- a/src/test/scripts/test.ps1 +++ b/src/test/scripts/test.ps1 @@ -45,7 +45,7 @@ if ( $LastExitCode -ne 0 ) { db2 "DROP SCHEMA ERRORSCHEMA RESTRICT" | Out-Null # Installs the tests. - db2 -td@ -f ../sql-pl/Tests_${SCHEMA}.sql + db2 -td@ -f ${DB2UNIT_SRC_TEST_CODE_PATH}/Tests_${SCHEMA}.sql } # Execute the tests. diff --git a/src/test/sql-pl/Tests_DB2UNIT_ASSERTIONS.sql b/src/test/sql-pl/Tests_DB2UNIT_ASSERTIONS.sql index 58f1533..f4114a3 100644 --- a/src/test/sql-pl/Tests_DB2UNIT_ASSERTIONS.sql +++ b/src/test/sql-pl/Tests_DB2UNIT_ASSERTIONS.sql @@ -2932,6 +2932,12 @@ CREATE OR REPLACE PROCEDURE TEST_TABLE_17() PREPARE STMT FROM SENTENCE; EXECUTE STMT; + DELETE FROM DB2UNIT_ASSERTIONS.REPORT_TESTS + WHERE MESSAGE = EXPECTED_MSG + AND DATE = (SELECT MAX(DATE) FROM DB2UNIT_ASSERTIONS.REPORT_TESTS); + DELETE FROM DB2UNIT_ASSERTIONS.REPORT_TESTS + WHERE MESSAGE = 'TABLE_EQUALS' + AND DATE = (SELECT MAX(DATE) FROM DB2UNIT_ASSERTIONS.REPORT_TESTS); DELETE FROM DB2UNIT_ASSERTIONS.REPORT_TESTS WHERE MESSAGE = EXPECTED_MSG AND DATE = (SELECT MAX(DATE) FROM DB2UNIT_ASSERTIONS.REPORT_TESTS);