Skip to content

Commit 955f8bf

Browse files
committed
Clean up of test files
1 parent 58e269e commit 955f8bf

File tree

59 files changed

+55
-592
lines changed

Some content is hidden

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

59 files changed

+55
-592
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ dependency-reduced-pom.xml
2626
doc/
2727
/utPLSQL/
2828
/utPLSQL.zip
29+
/tree.txt

scripts/sql/create_app_objects.sql

+5-5
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-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/TO_TEST_ME.tab
5-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.spc
6-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.bdy
4+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/TO_TEST_ME.sql
5+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.pks
6+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/sources/APP.PKG_TEST_ME.pkb
77

8-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.spc
9-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.bdy
8+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.pks
9+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/simple/scripts/tests/APP.TEST_PKG_TEST_ME.pkb
+3-3
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-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.tab
5-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.sql
6-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql
4+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/tables/TO_TEST_ME.sql
5+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.pks
6+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/package_bodies/PKG_TEST_ME.pkb

scripts/sql/create_tests_owner_objects.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ whenever oserror exit failure rollback
44
create synonym TO_TEST_ME for CODE_OWNER.TO_TEST_ME;
55
create synonym PKG_TEST_ME for CODE_OWNER.PKG_TEST_ME;
66

7-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql
8-
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql
7+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/packages/TEST_PKG_TEST_ME.pks
8+
@src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.pkb

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public void sources_tests_parameters() throws Exception {
8787
// check tests
8888
FileMapperOptions tests = utPlsqlMojo.buildTestsOptions();
8989
assertEquals(2, tests.getFilePaths().size());
90-
assertTrue(tests.getFilePaths().contains("te/st/file.bdy"));
91-
assertTrue(tests.getFilePaths().contains("te/st/spec.spc"));
90+
assertTrue(tests.getFilePaths().contains("te/st/file.pkb"));
91+
assertTrue(tests.getFilePaths().contains("te/st/spec.pks"));
9292
assertEquals("tests_owner", tests.getObjectOwner());
9393
assertEquals(".*/\\w+/(\\w+)/(\\w+)\\.\\w{3}", tests.getRegexPattern());
9494
assertEquals(Integer.valueOf(54), tests.getNameSubExpression());

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql

-27
This file was deleted.

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/packages/PKG_TEST_ME.sql

-8
This file was deleted.

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql

-126
This file was deleted.

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql

-86
This file was deleted.

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/expected-output/utplsql/coverage-sonar-report.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<coverage version="1">
2-
<file path="scripts/sources/foo/package_bodies/PKG_TEST_ME.sql">
2+
<file path="scripts/sources/foo/package_bodies/PKG_TEST_ME.pkb">
33
<lineToCover lineNumber="7" covered="true"/>
44
<lineToCover lineNumber="8" covered="true"/>
55
<lineToCover lineNumber="9" covered="true"/>

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/expected-output/utplsql/sonar-test-report.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<testExecutions version="1">
2-
<file path="scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql">
2+
<file path="scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.pkb">
33
<testCase name="test_fc_input_1" duration="1" >
44
</testCase>
55
<testCase name="test_fc_input_0" duration="1" >
@@ -15,4 +15,4 @@
1515
<testCase name="test_pr_test_me_cursor" duration="1" >
1616
</testCase>
1717
</file>
18-
</testExecutions>
18+
</testExecutions>

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/pom.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
<source>
4747
<directory>scripts/sources</directory>
4848
<includes>
49-
<include>**/*sql</include>
49+
<include>**/**.sql</include>
50+
<include>**/**.pks</include>
51+
<include>**/**.pkb</include>
5052
</includes>
5153
</source>
5254
</sources>
@@ -64,7 +66,8 @@
6466
<test>
6567
<directory>scripts/test</directory>
6668
<includes>
67-
<include>**/*sql</include>
69+
<include>**/**.pks</include>
70+
<include>**/**.pkb</include>
6871
</includes>
6972
</test>
7073
</tests>

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql

-27
This file was deleted.

src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/owner_param/scripts/sources/foo/packages/PKG_TEST_ME.sql

-8
This file was deleted.

0 commit comments

Comments
 (0)