Skip to content

Commit 20f034c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 76c7e4a + d40f186 commit 20f034c

File tree

4 files changed

+38
-72
lines changed

4 files changed

+38
-72
lines changed

.github/workflows/build.yml

+19
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
branches: [ develop ]
88

99
workflow_dispatch:
10+
11+
repository_dispatch:
12+
type: [utPLSQL-build,utPLSQL-java-api-build]
1013

1114
jobs:
1215
build:
@@ -74,3 +77,19 @@ jobs:
7477
if: always()
7578
with:
7679
files: target/**/TEST**.xml
80+
81+
slack-workflow-status:
82+
if: always()
83+
name: Post Workflow Status To Slack
84+
needs: [ build ]
85+
runs-on: ubuntu-latest
86+
steps:
87+
- name: Slack Workflow Notification
88+
uses: Gamesight/slack-workflow-status@master
89+
with:
90+
# Required Input
91+
repo_token: ${{secrets.GITHUB_TOKEN}}
92+
slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}
93+
# Optional Input
94+
name: 'Github Actions[bot]'
95+
icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png'

.github/workflows/release.yml

+16
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,19 @@ jobs:
5656
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
5757
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
5858
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
59+
60+
slack-workflow-status:
61+
if: always()
62+
name: Post Workflow Status To Slack
63+
needs: [ build ]
64+
runs-on: ubuntu-latest
65+
steps:
66+
- name: Slack Workflow Notification
67+
uses: Gamesight/slack-workflow-status@master
68+
with:
69+
# Required Input
70+
repo_token: ${{secrets.GITHUB_TOKEN}}
71+
slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}
72+
# Optional Input
73+
name: 'Github Actions[bot]'
74+
icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png'

src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoTest.java

+3-20
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,11 @@ public void db_config_using_system_properties() throws Exception {
322322
}
323323

324324
/**
325-
* Exclude object from coverage report
325+
* DB configuration from System Properties
326326
* <p>
327-
* Given : a pom.xml with excludeObject set
327+
* Given : a pom.xml without dbUrl, dbUser and dbPass configured
328328
* When : pom is read
329-
* Then : excludeObject is present
329+
* Then : System Properties must be used to configure database
330330
*/
331331
@Test
332332
public void exclude_object() throws Exception {
@@ -338,23 +338,6 @@ public void exclude_object() throws Exception {
338338
assertEquals("app.pkg_test_me,app.test_pkg_test_me", utPlsqlMojo.excludeObject);
339339
}
340340

341-
/**
342-
* Include object from coverage report
343-
* <p>
344-
* Given : a pom.xml with includeObject set
345-
* When : pom is read
346-
* Then : includeObject is present
347-
*/
348-
@Test
349-
public void include_object() throws Exception {
350-
UtPlsqlMojo utPlsqlMojo = createUtPlsqlMojo("include_object");
351-
assertNotNull(utPlsqlMojo);
352-
353-
utPlsqlMojo.execute();
354-
355-
assertEquals("app.pkg_test_me,app.test_pkg_test_me", utPlsqlMojo.includeObject);
356-
}
357-
358341
private UtPlsqlMojo createUtPlsqlMojo(String directory) throws Exception {
359342
return (UtPlsqlMojo) rule.lookupConfiguredMojo(new File("src/test/resources/unit-tests/" + directory), "test");
360343
}

src/test/resources/unit-tests/include_object/pom.xml

-52
This file was deleted.

0 commit comments

Comments
 (0)