Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit adbb543

Browse files
jgebaljgebal
committed
Testing schema UT3 with tests in schema UT3_TESTER and most recently released version of framework installed in UT3_LATEST_RELEASE schema.
1 parent c79afbd commit adbb543

6 files changed

Lines changed: 39 additions & 29 deletions

File tree

‎.travis.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ addons:
1515
branches:
1616
- develop
1717
- master
18+
- feature/using_released_to_test_develop
1819

1920
services:
2021
- docker
@@ -27,7 +28,7 @@ env:
2728
- UT3_USER="UT3\$USER#"
2829
- UT3_USER_PASSWORD=ut3
2930
- UT3_TESTER=ut3_tester
30-
- UT3_TESTER_PASSWORD=UT3
31+
- UT3_TESTER_PASSWORD=ut3
3132
- UT3_TABLESPACE=users
3233
# Environment for building a release
3334
- CURRENT_BRANCH=${TRAVIS_BRANCH}
@@ -58,9 +59,12 @@ cache:
5859
before_install:
5960
# download latest utPLSQL release
6061
- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
62+
# download utPLSQL-cli develop
63+
- curl -Lk -o utPLSQL-cli.zip https://bintray.com/viniciusam/utPLSQL-cli/download_file?file_path=utPLSQL-cli-develop-201706191645.zip
6164

6265
install:
6366
- unzip utPLSQL.zip
67+
- unzip utPLSQL-cli.zip
6468
- pip install mkdocs
6569
- bash .travis/install_sqlcl.sh
6670
- sudo mkdir -p /dev/pdbs
@@ -80,7 +84,7 @@ script:
8084
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
8185
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install_utplsql_release.sh; fi
8286
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples_and_tests.sh; fi
83-
- if [ "${TRAVIS_TAG}" = "" ]; then bash tests/install_and_run_tests.sh; fi
87+
- if [ "${TRAVIS_TAG}" = "" ]; then bash test/install_and_run_tests.sh; fi
8488
- if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then sonar-scanner; fi
8589
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/coveralls_uploader.sh; fi
8690
- bash .travis/build_docs.sh

‎sonar-project.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ sonar.projectVersion=v3.0.2
99
# If not set, SonarQube starts looking for source code from the directory containing
1010
# the sonar-project.properties file.
1111
sonar.sources=./source
12-
sonar.coverageReportPaths=./tests/coverage.xml
12+
sonar.coverageReportPaths=./tests/coverage.xml,coverage.xml
13+
sonar.tests=./test
14+
sonar.testExecutionReportPaths=test_results.xml
1315
sonar.links.issue=https://github.com/utPLSQL/utPLSQL/issues
1416
sonar.links.ci=https://travis-ci.org/utPLSQL/utPLSQL
1517
sonar.links.homepage=https://github.com/utPLSQL/utPLSQL

tests/run_tests.sh renamed to test/install_and_run_tests.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
#!/bin/bash
22
set -ev
3-
#replace "/" with "@"
4-
conn_str=${CONNECTION_STR//\//@}
53

6-
"$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} <<-SQL
7-
@ut_utils/test_ut_utils.pks
8-
@ut_utils/test_ut_utils.pkb
9-
exit
10-
SQL
4+
cd test
115

12-
utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}${conn_str} \
6+
"$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql
7+
8+
cd ..
9+
10+
utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \
1311
-source_path=source -test_path=tests \
1412
-f=ut_documentation_reporter -c \
1513
-f=ut_coverage_sonar_reporter -o=coverage.xml \

‎test/install_tests.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
@ut_utils/test_ut_utils.pks
3+
@ut_utils/test_ut_utils.pkb
4+
exit

tests/ut_utils/test_ut_utils.pkb renamed to test/ut_utils/test_ut_utils.pkb

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
create or replace package body test_ut_utils as
22

33
procedure clob_to_table_test(
4-
a_clob clob, a_expected ut_varchar2_list,
4+
a_clob clob, a_expected ut3.ut_varchar2_list,
55
a_delimiter varchar2 := ',',
66
a_overflow_limit integer := 1000
77
) is
8-
l_result ut_varchar2_list;
8+
l_result ut3.ut_varchar2_list;
99
begin
1010
--Act
1111
l_result := ut3.ut_utils.clob_to_table(a_clob, a_overflow_limit, a_delimiter);
@@ -15,21 +15,21 @@ create or replace package body test_ut_utils as
1515

1616
procedure clob_to_table_by_delim is
1717
begin
18-
clob_to_table_test( a_clob => 'a,b,c,d', a_expected => ut_varchar2_list('a','b','c','d') );
18+
clob_to_table_test( a_clob => 'a,b,c,d', a_expected => ut3.ut_varchar2_list('a','b','c','d') );
1919
end;
2020

2121
--%test(clob_to_table returns empty table for null clob)
2222
procedure clob_to_table_null_data is
2323
begin
24-
clob_to_table_test( a_clob => null, a_expected => ut_varchar2_list() );
24+
clob_to_table_test( a_clob => null, a_expected => ut3.ut_varchar2_list() );
2525
end;
2626

2727
--%test(clob_to_table splits table by char limit when no delimiter)
2828
procedure clob_to_table_char_limit is
2929
begin
3030
clob_to_table_test(
3131
a_clob => '1,2,3,4',
32-
a_expected => ut_varchar2_list('1,2,','3,4'),
32+
a_expected => ut3.ut_varchar2_list('1,2,','3,4'),
3333
a_delimiter => '',
3434
a_overflow_limit => 4
3535
);
@@ -40,7 +40,7 @@ create or replace package body test_ut_utils as
4040
begin
4141
clob_to_table_test(
4242
a_clob => 'abcdefg,hijk,axa,a',
43-
a_expected => ut_varchar2_list('abc','def','g','hij','k','axa','a'),
43+
a_expected => ut3.ut_varchar2_list('abc','def','g','hij','k','axa','a'),
4444
a_overflow_limit => 3
4545
);
4646
end;
@@ -50,33 +50,33 @@ create or replace package body test_ut_utils as
5050
begin
5151
clob_to_table_test(
5252
a_clob => ',a,,c,d,',
53-
a_expected => ut_varchar2_list('','a','','c','d','')
53+
a_expected => ut3.ut_varchar2_list('','a','','c','d','')
5454
);
5555
end;
5656

5757
--%test(test_result_to_char)
5858
procedure test_result_to_char is
5959
begin
60-
ut.expect( ut_utils.test_result_to_char(NULL)).to_equal('Unknown(NULL)');
61-
ut.expect( ut_utils.test_result_to_char(-1)).to_equal('Unknown(-1)');
62-
ut.expect( ut_utils.test_result_to_char(ut_utils.tr_disabled)).to_equal(ut_utils.tr_disabled_char);
63-
ut.expect( ut_utils.test_result_to_char(ut_utils.tr_success)).to_equal(ut_utils.tr_success_char);
64-
ut.expect( ut_utils.test_result_to_char(ut_utils.tr_failure)).to_equal(ut_utils.tr_failure_char);
65-
ut.expect( ut_utils.test_result_to_char(ut_utils.tr_error)).to_equal(ut_utils.tr_error_char);
60+
ut.expect( ut3.ut_utils.test_result_to_char(NULL)).to_equal('Unknown(NULL)');
61+
ut.expect( ut3.ut_utils.test_result_to_char(-1)).to_equal('Unknown(-1)');
62+
ut.expect( ut3.ut_utils.test_result_to_char(ut3.ut_utils.tr_disabled)).to_equal(ut3.ut_utils.tr_disabled_char);
63+
ut.expect( ut3.ut_utils.test_result_to_char(ut3.ut_utils.tr_success)).to_equal(ut3.ut_utils.tr_success_char);
64+
ut.expect( ut3.ut_utils.test_result_to_char(ut3.ut_utils.tr_failure)).to_equal(ut3.ut_utils.tr_failure_char);
65+
ut.expect( ut3.ut_utils.test_result_to_char(ut3.ut_utils.tr_error)).to_equal(ut3.ut_utils.tr_error_char);
6666
end;
6767

6868
--%test(to_test_result converts boolean value to test result integer)
6969
procedure to_test_result is
7070
begin
71-
ut.expect( ut_utils.to_test_result(true)).to_equal(ut_utils.tr_success);
72-
ut.expect( ut_utils.to_test_result(false)).to_equal(ut_utils.tr_failure);
73-
ut.expect( ut_utils.to_test_result(null)).to_equal(ut_utils.tr_failure);
71+
ut.expect( ut3.ut_utils.to_test_result(true)).to_equal(ut3.ut_utils.tr_success);
72+
ut.expect( ut3.ut_utils.to_test_result(false)).to_equal(ut3.ut_utils.tr_failure);
73+
ut.expect( ut3.ut_utils.to_test_result(null)).to_equal(ut3.ut_utils.tr_failure);
7474
end;
7575

7676
--%test(to_string on null blob)
7777
procedure to_string_null_blob is
7878
begin
79-
ut.expect( ut_utils.to_string(to_blob(null)) ).to_equal('NULL');
79+
ut.expect( ut3.ut_utils.to_string(to_blob(null)) ).to_equal('NULL');
8080
end;
8181

8282
--%test(to_string on blob)
@@ -85,7 +85,7 @@ create or replace package body test_ut_utils as
8585
l_value blob := utl_raw.cast_to_raw(l_text);
8686
l_expected varchar2(32767) := ''''||rawtohex(l_value)||'''';
8787
begin
88-
ut.expect( ut_utils.to_string(l_value) ).to_equal(l_expected);
88+
ut.expect( ut3.ut_utils.to_string(l_value) ).to_equal(l_expected);
8989
end;
9090

9191
-- --%test(to_string on null clob)
@@ -128,3 +128,5 @@ create or replace package body test_ut_utils as
128128

129129
end;
130130
/
131+
132+
show errors

tests/ut_utils/test_ut_utils.pks renamed to test/ut_utils/test_ut_utils.pks

File renamed without changes.

0 commit comments

Comments
 (0)