Skip to content

Commit 597ad61

Browse files
simaschsimasch
committed
Merge branch 'feature/testability_improvement' into develop
2 parents b1c7d90 + b93daed commit 597ad61

File tree

87 files changed

+992
-900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+992
-900
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,15 @@ jobs:
5656
restore-keys: |
5757
${{ runner.os }}-maven-
5858
59-
- name: Maven deploy snapshot and run Sonar
60-
run: mvn deploy sonar:sonar -Pcoverage -Dsonar.projectKey=org.utplsql:utplsql-maven-plugin
59+
- name: Maven verify and sonar
60+
run: mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=org.utplsql:utplsql-maven-plugin
6161
env:
6262
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6363
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
64+
65+
- name: Maven deploy snapshot
66+
run: mvn deploy -DskipTests
67+
env:
6468
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
6569
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
6670
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
67-

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
${{ runner.os }}-maven-
5252
5353
- name: Maven deploy release
54-
run: mvn deploy -Prelease
54+
run: mvn clean deploy -Prelease
5555
env:
5656
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
5757
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ Please refer to the following usage example for the parameters descriptions:
231231
</project>
232232
```
233233

234-
More project samples are available in the src/test/resources directory:
234+
More project samples are available in the src/test/resources/integration-tests directory:
235235
* **simple-project:** Minimalist test project with standard project directory structure.
236236
* **regex-project:** Overrides project directory structure and use additional parameters (sourcesRegexExpression, testsRegexExpression, ...), to tell utPLSQL how project files should be mapped into database objects.
237237
* **type-mapping-project:** Example how to use regex and custom type parameters together.

‎pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<maven.compiler.source>1.8</maven.compiler.source>
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5656
<maven.version>3.5.2</maven.version>
57-
<powermock.version>2.0.9</powermock.version>
5857
<jaxb.version>2.3.1</jaxb.version>
58+
<powermock.version>2.0.9</powermock.version>
5959
<sonar.organization>utplsql</sonar.organization>
6060
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
6161
</properties>
@@ -144,19 +144,6 @@
144144
<scope>test</scope>
145145
</dependency>
146146

147-
<dependency>
148-
<groupId>org.powermock</groupId>
149-
<artifactId>powermock-module-junit4</artifactId>
150-
<version>${powermock.version}</version>
151-
<scope>test</scope>
152-
</dependency>
153-
<dependency>
154-
<groupId>org.powermock</groupId>
155-
<artifactId>powermock-api-mockito2</artifactId>
156-
<version>${powermock.version}</version>
157-
<scope>test</scope>
158-
</dependency>
159-
160147
<dependency>
161148
<groupId>commons-io</groupId>
162149
<artifactId>commons-io</artifactId>

‎scripts/sql/create_app_objects.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
whenever sqlerror exit failure rollback
22
whenever oserror exit failure rollback
33

4-
@src/test/resources/simple-project/scripts/sources/TO_TEST_ME.tab
5-
@src/test/resources/simple-project/scripts/sources/APP.PKG_TEST_ME.spc
6-
@src/test/resources/simple-project/scripts/sources/APP.PKG_TEST_ME.bdy
4+
@src/test/resources/integration-tests/simple-project/scripts/sources/TO_TEST_ME.tab
5+
@src/test/resources/integration-tests/simple-project/scripts/sources/APP.PKG_TEST_ME.spc
6+
@src/test/resources/integration-tests/simple-project/scripts/sources/APP.PKG_TEST_ME.bdy
77

8-
@src/test/resources/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.spc
9-
@src/test/resources/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.bdy
8+
@src/test/resources/integration-tests/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.spc
9+
@src/test/resources/integration-tests/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.bdy

‎scripts/sql/create_source_owner_objects.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
whenever sqlerror exit failure rollback
22
whenever oserror exit failure rollback
33

4-
@src/test/resources/owner-param-project/scripts/sources/foo/tables/TO_TEST_ME.tab
5-
@src/test/resources/owner-param-project/scripts/sources/foo/packages/PKG_TEST_ME.sql
6-
@src/test/resources/owner-param-project/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql
4+
@src/test/resources/integration-tests/owner-param-project/scripts/sources/foo/tables/TO_TEST_ME.tab
5+
@src/test/resources/integration-tests/owner-param-project/scripts/sources/foo/packages/PKG_TEST_ME.sql
6+
@src/test/resources/integration-tests/owner-param-project/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql

‎scripts/sql/create_tests_owner_objects.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ whenever oserror exit failure rollback
33

44
create synonym TO_TEST_ME for CODE_OWNER.TO_TEST_ME;
55
create synonym PKG_TEST_ME for CODE_OWNER.PKG_TEST_ME;
6-
@src/test/resources/owner-param-project/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql
7-
@src/test/resources/owner-param-project/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql
6+
@src/test/resources/integration-tests/owner-param-project/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql
7+
@src/test/resources/integration-tests/owner-param-project/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql

0 commit comments

Comments
 (0)