Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.1.2-develop
v3.1.2
14 changes: 8 additions & 6 deletions development/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@ With every build, the build process on Travis updates files with an appropriate
This step is performed, to confirm that the update of versions works properly.

To create a release:
- create release branch and wait for release build to complete successfully
- merge release branch to master and wait for master build to complete successfully
- create a release from the master branch using github web page and populate release description using information found on the issues and pull requests for release
- create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z`
- update, commit and push at least one file change in the release branch, to kickoff a Travis build
- wait for th build to complete successfully
- merge the release branch to master and wait for master build to complete successfully
- create a release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release.
To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state)

The following will happen:
- build executed on branch `release/v1.2.3-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name
- build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name
- changes to those two files are committed and pushed back to release branch by Travis
- when a release is created, a new tag is added in on the repository and a tag build is executed
- the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag.

Note:
The released version does not provide access to un-versioned source files (the default zip file from GitHub is empty).
The sources for release are provided in separate zip files delivered from the Travis build process.
This is because we do not keep version in our source files in develop branch.
The built zip files include HTML documentation generated from MD files.
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The framework follows industry standards and best patterns of modern Unit Testin
- [Using reporters](userguide/reporters.md)
- [Reporting errors](userguide/exception-reporting.md)
- [Code coverage](userguide/coverage.md)
- [Cheat-sheet](https://www.cheatography.com/jgebal/cheat-sheets/utplsql-v3/#downloads)
- [Cheat-sheet](https://www.cheatography.com/jgebal/cheat-sheets/utplsql-v3-1-2/#downloads)
- About
- [Project Details](about/project-details.md)
- [License](about/license.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/userguide/annotations.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ We strongly recommend putting package level annotations at the very top of packa
| `--%suitepath(<path>)` | Package | Similar to java package. The annotation allows logical grouping of suites into hierarchies. |
| `--%displayname(<description>)` | Package/procedure | Human-readable and meaningful description of a suite/test. `%displayname(Name of the suite/test)`. The annotation is provided for flexibility and convenience only. It has exactly the same meaning as `<description>` in `test` and `suite` annotations. If description is provided using both `suite`/`test` and `displayname`, then the one defined as last takes precedence. |
| `--%test(<description>)` | Procedure | Denotes that the annotated procedure is a unit test procedure. Optional test description can by provided (see `displayname`). |
| `--%throws(<exception|>[,...])`| Procedure | Denotes that the annotated test procedure must throw one of the exceptions provided. Supported forms of exceptions are: numeric literals, numeric contant names, exception constant names, predefined Oracle exception names. |
| `--%throws(<exception>[,...])`| Procedure | Denotes that the annotated test procedure must throw one of the exceptions provided. Supported forms of exceptions are: numeric literals, numeric contant names, exception constant names, predefined Oracle exception names. |
| `--%beforeall` | Procedure | Denotes that the annotated procedure should be executed once before all elements of the suite. |
| `--%beforeall([[<owner>.]<package>.]<procedure>[,...])` | Package | Denotes that the mentioned procedure(s) should be executed once before all elements of the suite. |
| `--%afterall` | Procedure | Denotes that the annotated procedure should be executed once after all elements of the suite. |
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Published releases are available for download on the [utPLSQL GitHub Releases Pa

Full documentation of the project is automatically published on [utPLSQL github pages](https://utplsql.github.io/utPLSQL/)

[Cheat-sheet](https://www.cheatography.com/jgebal/cheat-sheets/utplsql-v3/#downloads)
[Cheat-sheets](https://www.cheatography.com/jgebal/lists/utplsql-v3-cheat-sheets/)

# Installation

Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sonar.projectKey=utPLSQL
# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
sonar.projectName=utPLSQL
sonar.projectVersion=v3.1.2-develop
sonar.projectVersion=v3.1.2

# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
# Since SonarQube 4.2, this property is optional if sonar.modules is set.
Expand Down
2 changes: 1 addition & 1 deletion source/core/ut_utils.pks
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
*
*/

gc_version constant varchar2(50) := 'v3.1.2.2125-develop';
gc_version constant varchar2(50) := 'v3.1.2.2130';

/* Constants: Event names */
subtype t_event_name is varchar2(30);
Expand Down
2 changes: 1 addition & 1 deletion test/core/test_output_buffer.pkb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ create or replace package body test_output_buffer is
l_duration := localtimestamp - l_start;

ut.expect(l_result).to_equal(l_expected);
ut.expect(l_duration).to_be_greater_than(interval '1' second);
ut.expect(l_duration).to_be_greater_than(interval '0.99' second);
select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id;

ut.expect(l_remaining).to_equal(0);
Expand Down