Skip to content

Commit 5bc8698

Browse files
jgebaljgebal
committed
Restructuring tests
1 parent a715ab4 commit 5bc8698

10 files changed

Lines changed: 13 additions & 85 deletions

‎scripts/0_start_db.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docker run -d --name ora-utplsql -p 1521:1521 -e ORACLE_PASSWORD=oracle gvenzl/oracle-xe:18.4.0-slim
1+
docker run -d --name ora-utplsql -p 1521:1521 -e ORACLE_PASSWORD=oracle gvenzl/oracle-xe:18-slim

‎scripts/1_install_utplsql.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
git clone --depth=1 --branch=${UTPLSQL_VERSION} https://github.com/utPLSQL/utPLSQL.git utPLSQL
22

33
docker run --rm -v $(pwd)/utPLSQL:/utPLSQL -w /utPLSQL/source --network host \
4-
--entrypoint sqlplus truemark/sqlplus:19.8 sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users
4+
--entrypoint sqlplus gvenzl/oracle-xe:18-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users

‎scripts/2_install_demo_project.sh‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
2-
sys/oracle@//127.0.0.1:1521/XE as sysdba @source/create_users.sql
3-
4-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
5-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/award_bonus/employees_test.sql
6-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
7-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/award_bonus/award_bonus.prc
8-
9-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
10-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/between_string/betwnstr.fnc
11-
12-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
13-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/remove_rooms_by_name/rooms.sql
14-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
15-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/remove_rooms_by_name/remove_rooms_by_name.prc
16-
1+
docker run --rm -v $(pwd):/work -w /work/ --network host \
2+
--entrypoint sqlplus gvenzl/oracle-xe:18-slim \
3+
sys/oracle@//127.0.0.1:1521/XE as sysdba @source/install.sql

‎scripts/3_install_tests.sh‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
2-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/award_bonus/test_award_bonus.pks
3-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
4-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/award_bonus/test_award_bonus.pkb
5-
6-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
7-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/between_string/test_betwnstr.pks
8-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
9-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/between_string/test_betwnstr.pkb
10-
11-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
12-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/remove_rooms_by_name/test_remove_rooms_by_name.pks
13-
docker run --rm -v $(pwd):/work -w /work/ --network host --entrypoint sqlplus truemark/sqlplus:19.8 \
14-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/remove_rooms_by_name/test_remove_rooms_by_name.pkb
1+
docker run --rm -v $(pwd):/work -w /work/ --network host \
2+
--entrypoint sqlplus gvenzl/oracle-xe:18-slim \
3+
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/install.sql

‎scripts/4_run_tests.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
set -ev
44

55
utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE \
6-
-source_path=source -test_path=test \
7-
-f=ut_documentation_reporter -c \
8-
-f=ut_coverage_sonar_reporter -o=coverage.xml \
9-
-f=ut_sonar_test_reporter -o=test_results.xml \
10-
--failure-exit-code=0
6+
-source_path=source -test_path=test \
7+
-f=ut_documentation_reporter -c \
8+
-f=ut_coverage_sonar_reporter -o=coverage.xml \
9+
-f=ut_sonar_test_reporter -o=test_results.xml \
10+
--failure-exit-code=0
1111

source/create_users.sql renamed to source/create_user.sql

File renamed without changes.

source/install.sh renamed to source/install.sql

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
#!/bin/bash
2-
3-
set -ev
4-
5-
sql -L -S ${DB_USER}/${DB_PASS}@//${CONNECTION_STR} <<SQL
6-
whenever sqlerror exit failure rollback
7-
whenever oserror exit failure rollback
8-
91
@source/award_bonus/employees_test.sql
102
@source/award_bonus/award_bonus.prc
11-
123
@source/between_string/betwnstr.fnc
13-
144
@source/remove_rooms_by_name/rooms.sql
155
@source/remove_rooms_by_name/remove_rooms_by_name.prc
16-
17-
exit
18-
SQL

‎source/setup_db_account.sh‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

test/install.sh renamed to test/install.sql

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1-
#!/bin/bash
2-
3-
set -ev
4-
5-
sql -L -S ${DB_USER}/${DB_PASS}@//${CONNECTION_STR} <<SQL
6-
whenever sqlerror exit failure rollback
7-
whenever oserror exit failure rollback
8-
91
@test/award_bonus/test_award_bonus.pks
102
@test/award_bonus/test_award_bonus.pkb
11-
123
@test/between_string/test_betwnstr.pks
134
@test/between_string/test_betwnstr.pkb
14-
155
@test/remove_rooms_by_name/test_remove_rooms_by_name.pks
166
@test/remove_rooms_by_name/test_remove_rooms_by_name.pkb
17-
18-
exit
19-
SQL

‎test/run.sh‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)