Merge branch 'main' into develop

Author: simasch

README.md

@@ -81,7 +81,7 @@ Please refer to the following usage example for the parameters descriptions:
         <!-- -DdbUser="user" -->
         <dbUser>user</dbUser>
         <!-- Database connection password. -->
-        <!-- -DdbPass="password" -->
+        <!-- -DdbPassword="password" -->
         <dbPass>password</dbPass>
     </properties>
 
@@ -100,6 +100,7 @@ Please refer to the following usage example for the parameters descriptions:
                             <!-- REQUIRED PARAMETERS -->
 
                             <!-- A list of tests suite paths. -->
+                          
                             <!-- The path(s) can be in one of the following formats: -->
                             <!--     schema[.package[.procedure]] -->
                             <!--     schema:suite[.suite[.suite][...]][.procedure] -->
@@ -207,7 +208,7 @@ Please refer to the following usage example for the parameters descriptions:
                             <!-- See coverage reporting options in framework documentation. -->
                             <sourcesOwner>code_owner</sourcesOwner>
                             <sourcesRegexExpression>.*/\w+/(\w+)/(\w+)\.\w{3}</sourcesRegexExpression>
-                            <sourcesOwnerSubexpression>3</sourcesOwnerSubexpression>
+                            <sourcesOwnerSubexpression>app</sourcesOwnerSubexpression>
                             <sourcesNameSubexpression>2</sourcesNameSubexpression>
                             <sourcesTypeSubexpression>1</sourcesTypeSubexpression>
                             <sourcesCustomTypeMapping>
@@ -221,7 +222,7 @@ Please refer to the following usage example for the parameters descriptions:
                             <!-- See coverage reporting options in framework documentation. -->
                             <testsOwner>tests_owner</testsOwner>
                             <testsRegexExpression>.*/\w+/(\w+)/(\w+)\.\w{3}</testsRegexExpression>
-                            <testsOwnerSubexpression>3</testsOwnerSubexpression>
+                            <testsOwnerSubexpression>test</testsOwnerSubexpression>
                             <testsNameSubexpression>2</testsNameSubexpression>
                             <testsTypeSubexpression>1</testsTypeSubexpression>
                             <testsCustomTypeMapping>

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

@@ -306,11 +306,11 @@ public void db_config_using_system_properties() throws Exception {
     }
 
     /**
-     * DB configuration from System Properties
+     * Exclude object from coverage report
      * <p>
-     * Given : a pom.xml without dbUrl, dbUser and dbPass configured
+     * Given : a pom.xml with excludeObject set
      * When : pom is read
-     * Then : System Properties must be used to configure database
+     * Then : excludeObject is present
      */
     @Test
     public void exclude_object() throws Exception {
@@ -322,6 +322,23 @@ public void exclude_object() throws Exception {
         assertEquals("app.pkg_test_me,app.test_pkg_test_me", utPlsqlMojo.excludeObject);
     }
 
+    /**
+     * Include object from coverage report
+     * <p>
+     * Given : a pom.xml with includeObject set
+     * When : pom is read
+     * Then : includeObject is present
+     */
+    @Test
+    public void include_object() throws Exception {
+        UtPlsqlMojo utPlsqlMojo = createUtPlsqlMojo("include_object");
+        assertNotNull(utPlsqlMojo);
+
+        utPlsqlMojo.execute();
+
+        assertEquals("app.pkg_test_me,app.test_pkg_test_me", utPlsqlMojo.includeObject);
+    }
+
     private UtPlsqlMojo createUtPlsqlMojo(String directory) throws Exception {
         return (UtPlsqlMojo) rule.lookupConfiguredMojo(new File("src/test/resources/unit-tests/" + directory), "test");
     }

src/test/java/org/utplsql/maven/plugin/util/StringUtilTest.java

@@ -0,0 +1,32 @@
+package org.utplsql.maven.plugin.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.utplsql.maven.plugin.util.StringUtil.isBlank;
+import static org.utplsql.maven.plugin.util.StringUtil.isEmpty;
+import static org.utplsql.maven.plugin.util.StringUtil.isNotBlank;
+import static org.utplsql.maven.plugin.util.StringUtil.isNotEmpty;
+
+class StringUtilTest {
+
+    @Test
+    void is_empty() {
+        assertTrue(isEmpty(""));
+    }
+
+    @Test
+    void is_not_empty() {
+        assertTrue(isNotEmpty("abc"));
+    }
+
+    @Test
+    void is_blank() {
+        assertTrue(isBlank(" "));
+    }
+
+    @Test
+    void is_not_blank() {
+        assertTrue(isNotBlank("abc"));
+    }
+}

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

@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.utplsql</groupId>
+    <artifactId>utplsql-maven-plugin-test</artifactId>
+    <version>3.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <dbUrl>jdbc:oracle:thin:@127.0.0.1:1521:xe</dbUrl>
+        <dbUser>UT3</dbUser>
+        <dbPass>UT3</dbPass>
+    </properties>
+
+    <build>
+        <directory>../../../target</directory>
+        <plugins>
+            <plugin>
+                <groupId>org.utplsql</groupId>
+                <artifactId>utplsql-maven-plugin</artifactId>
+                <version>@proj</version>
+                <goals>
+                    <goal>test</goal>
+                </goals>
+                <configuration>
+                    <ignoreFailure>false</ignoreFailure>
+                    <paths>
+                        <path>app</path>
+                    </paths>
+                    <reporters>
+                        <reporter>
+                            <name>UT_DOCUMENTATION_REPORTER</name>
+                        </reporter>
+                        <reporter>
+                            <name>UT_COVERAGE_SONAR_REPORTER</name>
+                            <fileOutput>coverage-sonar-report.xml</fileOutput>
+                            <consoleOutput>false</consoleOutput>
+                        </reporter>
+                        <reporter>
+                            <name>UT_SONAR_TEST_REPORTER</name>
+                            <fileOutput>utplsql/sonar-test-report.xml</fileOutput>
+                            <consoleOutput>true</consoleOutput>
+                        </reporter>
+                    </reporters>
+                    <includeObject>app.pkg_test_me,app.test_pkg_test_me</includeObject>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>