Skip to content

Commit

Permalink
Merge 697e443 into 58b557f
Browse files Browse the repository at this point in the history
  • Loading branch information
jgebal committed Mar 19, 2019
2 parents 58b557f + 697e443 commit e63b7f5
Show file tree
Hide file tree
Showing 232 changed files with 7,137 additions and 4,249 deletions.
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,50 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**Provide version info**
Information about utPLSQL and Database version,
```sql
set serveroutput on
declare
l_version varchar2(255);
l_compatibility varchar2(255);
begin
dbms_utility.db_version( l_version, l_compatibility );
dbms_output.put_line( l_version );
dbms_output.put_line( l_compatibility );
end;
/
select substr(ut.version(),1,60) as ut_version from dual;
select * from v$version;
select * from nls_session_parameters;
select substr(dbms_utility.port_string,1,60) as port_string from dual;
```

**Information about client software**
What client was used to run utPLSQL tests? Was it from TOAD, SQLDeveloper, SQLPlus, PLSQL Developer etc...

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Example code**
If applicable, add sample code to help explain your problem.
Please avoid putting your company private/protected code in an issue, as it might violate your company's privacy and security policies.

**Additional context**
Add any other context about the problem here.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.

**Note**
> Please do not create issues for generic SQL or PL/SQL questions. There are other forums and communities to help you with those. See [ASKTom](https://asktom.oracle.com) for example.
**Want to discuss**
If you want to discuss your issue, join [our SLACK chat](http://utplsql-slack-invite.herokuapp.com/).
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -27,3 +27,4 @@ coverage.xml
tfs_test_results.xml
junit_test_results.xml
test_results.xml
*debug*.xml
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -38,6 +38,7 @@ env:
- CACHE_DIR=$HOME/.cache
# Database Env
- SQLCLI="$HOME/sqlcl/bin/sql"
- OJDBC_HOME="$HOME/sqlcl/lib"
- ORACLE_PWD="oracle"
- UT3_DOCKER_REPO="utplsqlv3/oracledb"
- DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
Expand Down Expand Up @@ -90,12 +91,11 @@ before_script:
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_old_tests.sh; fi

script:
- if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi
- if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then bash .travis/run_sonar_scanner.sh; fi
- if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi

notifications:
Expand Down
Empty file modified .travis/build_docs.sh 100644 → 100755
Empty file.
Empty file modified .travis/build_release_archive.sh 100644 → 100755
Empty file.
Empty file modified .travis/coveralls_uploader.sh 100644 → 100755
Empty file.
Empty file modified .travis/download.sh 100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion .travis/get_project_build_version.sh 100644 → 100755
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
echo `sed -r "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`
echo `sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`
2 changes: 1 addition & 1 deletion .travis/get_project_version.sh 100644 → 100755
Expand Up @@ -8,7 +8,7 @@ else
version=`cat VERSION`
#When on develop branch, add "-develop" to the version text
if [[ "${CURRENT_BRANCH}" == "develop" ]]; then
version=`sed -r "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
version=`sed -E "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
fi
fi
echo ${version}
Empty file modified .travis/install.sh 100644 → 100755
Empty file.
Empty file modified .travis/install_sqlcl.sh 100644 → 100755
Empty file.
Empty file modified .travis/install_utplsql_release.sh 100644 → 100755
Empty file.
Empty file modified .travis/maven_cfg.sh 100644 → 100755
Empty file.
Empty file modified .travis/push_docs_to_gh_pages.sh 100644 → 100755
Empty file.
Empty file modified .travis/push_release_version.sh 100644 → 100755
Empty file.
Empty file modified .travis/run_examples.sh 100644 → 100755
Empty file.
10 changes: 0 additions & 10 deletions .travis/run_old_tests.sh

This file was deleted.

14 changes: 13 additions & 1 deletion .travis/run_sonar_scanner.sh
Expand Up @@ -12,6 +12,9 @@ PR_KEY_PROPERTY="sonar.pullrequest.key"
PR_SONAR_BASE_PROPERTY="sonar.pullrequest.base"
PR_SONAR_TOKEN_PROPERTY="sonar.pullrequest.github.token.secured"

DB_URL_SONAR_PROPERTY="sonar.plsql.jdbc.url"
DB_DRIVER_PATH="sonar.plsql.jdbc.driver.path"

#Add property to file
function add_sonar_property {
echo "$1=$2" >> sonar-project.properties
Expand Down Expand Up @@ -52,5 +55,14 @@ else
echo "No need to update sonar we building on release or develop"
fi

#Address issue : Could not find ref 'develop' in refs/heads or refs/remotes/origin
git fetch --no-tags https://github.com/utPLSQL/utPLSQL.git +refs/heads/develop:refs/remotes/origin/develop

echo "Adding OJDBC Driver Path ${OJDBC_HOME}/ojdbc8.jar"
add_sonar_property "${DB_URL_SONAR_PROPERTY}" "jdbc:oracle:thin:@${CONNECTION_STR}"
add_sonar_property "${DB_DRIVER_PATH}" "${OJDBC_HOME}/ojdbc8.jar"


#Execute Sonar scanner
sonar-scanner
echo "Executing sonar scanner"
sonar-scanner
Empty file modified .travis/start_db.sh 100644 → 100755
Empty file.
Empty file modified .travis/trigger_travis.sh 100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions .travis/update_project_version.sh 100644 → 100755
Expand Up @@ -6,6 +6,9 @@ echo Update version in project source files
find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \;
echo Source files updated with version tag: ${UTPLSQL_BUILD_VERSION}

echo Update version in documentation files
find docs -type f -name '*.md' -exec sed -i -r "s/(badge\/version-).*(-blue\.svg)/\1${UTPLSQL_BUILD_VERSION/-/--}\2/" {} \;

echo Update of sonar-project.properties sonar.projectVersion
sed -i -r "s/(sonar\.projectVersion=).*?/\1${UTPLSQL_VERSION}/" sonar-project.properties

Expand Down
Empty file modified .travis/validate_report_files.sh 100644 → 100755
Empty file.
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at utplsql@utplsql.org. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
11 changes: 2 additions & 9 deletions CONTRIBUTING.md
Expand Up @@ -138,9 +138,7 @@ Whenever a new version of utPLSQL or a new version of utPLSQL-cli is available,

## Running unit tests

Currently we use two forms of unit tests in our CI build:
- sql scripts as unit tests in the `old_tests` directory
- utPLSQL v3 unit tests in the `test` directory
utPLSQL v3 unit tests are located in the `test` directory

Before you push any changes and create a pull request to the utPLSQL project repository, make sure that all of the tests are executing successfully in your local environment.

Expand All @@ -150,18 +148,13 @@ Every new functionality needs to be documented by unit tests that cover both hap
> We do our best to keep utPLSQL covered with unit tests.
> Lack of sufficient unit testing is a perfect reason for PR to be rejected.
To suite of legacy unit tests execute:
```bash
development/env.sh
old_tests/runAll.sh
```
To run a full suite of unit tests execute:
```bash
development/env.sh
test/install_and_run_tests.sh
```

You can review the results of tests as well as see information about code coverage in `./old_tests/coverage.html, ./coverage.html` files.
You can review the results of tests as well as see information about code coverage in `./coverage.html` file.


## Modules
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
v3.1.3
v3.1.4-develop
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file modified development/refresh_ut3.sh 100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions docs/about/authors.md
@@ -1,3 +1,4 @@
![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg)

### utPLSQL v3 Major Contributors

Expand All @@ -7,11 +8,11 @@
| ---------------- | --------------
| David Pyke | [Shoelace](https://github.com/Shoelace)
| Jacek Gebal | [jgebal](https://github.com/jgebal)
| Lukasz Wasylow | [lwasylow](https://github.com/lwasylow/)
| Pavel Kaplya | [Pazus](https://github.com/Pazus)
| Robert Love | [rlove](https://github.com/rlove)
| Vinicius Avellar | [viniciusam](https://github.com/viniciusam/)
| Samuel Nitsche | [pesse](https://github.com/pesse/)
| Lukasz Wasylow | [lwasylow](https://github.com/lwasylow/)
| Vinicius Avellar | [viniciusam](https://github.com/viniciusam/)



Expand Down
2 changes: 2 additions & 0 deletions docs/about/license.md
@@ -1,3 +1,5 @@
![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg)

# Version Information

**utPLSQL version 3** is licensed under
Expand Down
2 changes: 2 additions & 0 deletions docs/about/project-details.md
@@ -1,3 +1,5 @@
![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg)

# utPLSQL Project Details

[![chat](http://img.shields.io/badge/GitHub_Project-Active-blue.svg)](https://github.com/utPLSQL/utPLSQL)
Expand Down
2 changes: 2 additions & 0 deletions docs/about/support.md
@@ -1,3 +1,5 @@
![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg)

# How to get support

- Feel free to post questions, bugs or issues in the [issues area of GitHub](https://github.com/utPLSQL/utPLSQL/issues)
Expand Down
Binary file added docs/images/supported_by_redgate_100.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/venn21.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/venn22.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion docs/index.md
@@ -1,3 +1,5 @@
![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg)

# Introduction to utPLSQL

utPLSQL is a Unit Testing framework for Oracle PL/SQL.
Expand All @@ -11,7 +13,7 @@ The framework follows industry standards and best patterns of modern Unit Testin
- [Advanced data comparison](userguide/advanced_data_comparison.md)
- [Running unit tests](userguide/running-unit-tests.md)
- [Querying for test suites](userguide/querying_suites.md)
- [Testing best pracitces](userguide/best-practices.md)
- [Testing best practices](userguide/best-practices.md)
- [Upgrade utPLSQL](userguide/upgrade.md)
- Reporting
- [Using reporters](userguide/reporters.md)
Expand Down

0 comments on commit e63b7f5

Please sign in to comment.