Skip to content

Commit 01d83e8

Browse files
committed
Testing project_path branch from @viniciusam
1 parent d7c5631 commit 01d83e8

5 files changed

+8
-189
lines changed

Diff for: .travis.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ addons:
1212
branches:
1313
- develop
1414
- master
15+
- test_ut_run_script
1516

1617
env:
1718
global:
@@ -26,17 +27,14 @@ env:
2627
- DB_USER=ut3_demo
2728
- DB_PASS=LHZYPbWvYdu2ctp8
2829
##utPLSQL variables
29-
- UTPLSQL_DOWNLOAD_URL=$(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
30-
- UTPLSQL_DOWNLOAD_FILE="${UTPLSQL_DOWNLOAD_URL##*/}"
31-
- UTPLSQL_DIR="${UTPLSQL_DOWNLOAD_FILE%.*}"
30+
- UTPLSQL_DIR="utPLSQL"
3231
before_install:
3332
- npm install -g phantomjs-prebuilt casperjs
3433
# download Oracle XE installer for Travis
3534
- .travis/oracle/download.sh
36-
# download utPLSQL
37-
- curl -LOk "${UTPLSQL_DOWNLOAD_URL}"
38-
- unzip -q "${UTPLSQL_DOWNLOAD_FILE}"
39-
- cp ${UTPLSQL_DIR}/client_source/sqlplus/ut_run.sql .
35+
# download latest utPLSQL develop branch
36+
- git clone --depth 1 --branch develop https://github.com/utPLSQL/utPLSQL.git ${UTPLSQL_DIR}
37+
- cp ${UTPLSQL_DIR}/client_source/sqlplus/* .
4038

4139
install:
4240
# Install Oracle Database
@@ -50,6 +48,6 @@ install:
5048

5149
script:
5250
# Run tests
53-
- test/run.sh
51+
- ./ut_run ${DB_USER}/${DB_PASS} -source_path=source -test_path=test -f=ut_documentation_reporter -c -f=ut_coverage_sonar_reporter -o=coverage.xml -f=ut_sonar_test_reporter -o=test_results.xml
5452
# Run sonar scanner and publish to sonar
5553
- sonar-scanner

Diff for: sonar-project.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ sonar.organization=utplsql
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=./sonar-coverage.xml
12+
sonar.coverageReportPaths=./coverage.xml
1313
sonar.tests=./test
14-
sonar.testExecutionReportPaths=./sonar-test-results.xml
14+
sonar.testExecutionReportPaths=./test_results.xml
1515
sonar.links.issue=https://github.com/utPLSQL/utPLSQL-demo-project/issues
1616
sonar.links.ci=https://travis-ci.org/utPLSQL/utPLSQL-demo-project
1717
sonar.links.homepage=https://github.com/utPLSQL/utPLSQL-demo-project

Diff for: test/install.sh

-12
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@
22

33
set -ev
44

5-
#adding sonar test reporter
6-
sqlplus -L -S / AS SYSDBA <<SQL
7-
alter session set current_schema=ut3;
8-
9-
@@test/ut_sonar_test_reporter.tps
10-
@@test/ut_sonar_test_reporter.tpb
11-
create public synonym ut_sonar_test_reporter for ut_sonar_test_reporter;
12-
grant execute on ut_sonar_test_reporter to public;
13-
14-
exit
15-
SQL
16-
175
sqlplus -L -S ${DB_USER}/${DB_PASS} <<SQL
186
whenever sqlerror exit failure rollback
197
whenever oserror exit failure rollback

Diff for: test/ut_sonar_test_reporter.tpb

-117
This file was deleted.

Diff for: test/ut_sonar_test_reporter.tps

-50
This file was deleted.

0 commit comments

Comments
 (0)