Merge branch 'develop'

simasch · simasch · commit a00fe88c3ffb · 2021-12-14T16:17:27.000+01:00
# Conflicts:
#	src/test/java/org/utplsql/maven/plugin/util/StringUtilTest.java
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ Please refer to the following usage example for the parameters descriptions:
             <plugin>
                 <groupId>org.utplsql</groupId>
                 <artifactId>utplsql-maven-plugin</artifactId>
-                <version>3.1.7</version>
+                <version>3.1.8</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.utplsql</groupId>
     <artifactId>utplsql-maven-plugin</artifactId>
-    <version>3.1.7</version>
+    <version>3.1.8</version>
     <packaging>maven-plugin</packaging>
 
     <name>utPLSQL Maven Plugin</name>
@@ -149,6 +149,11 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/src/main/java/org/utplsql/maven/plugin/UtPlsqlMojo.java b/src/main/java/org/utplsql/maven/plugin/UtPlsqlMojo.java
@@ -174,9 +174,9 @@ public void execute() throws MojoExecutionException {
                 if (isNotBlank(includeObject)) {
                     if (includeObject.contains(",")) {
                         String[] includes = includeObject.split(",");
-                        runner.excludeObjects(Arrays.asList(includes));
+                        runner.includeObjects(Arrays.asList(includes));
                     } else {
-                        runner.excludeObject(includeObject);
+                        runner.includeObject(includeObject);
                     }
                 }
 
diff --git a/src/main/java/org/utplsql/maven/plugin/util/StringUtil.java b/src/main/java/org/utplsql/maven/plugin/util/StringUtil.java
@@ -14,9 +14,8 @@ public static boolean isNotEmpty(CharSequence cs) {
     }
 
     public static boolean isBlank(CharSequence cs) {
-        int strLen;
-        if (cs != null && (strLen = cs.length()) != 0) {
-            for (int i = 0; i < strLen; ++i) {
+        if (cs != null && cs.length() > 0) {
+            for (int i = 0; i < cs.length(); ++i) {
                 if (!Character.isWhitespace(cs.charAt(i))) {
                     return false;
                 }
diff --git a/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoIT.java b/src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoIT.java
@@ -68,4 +68,11 @@ void exclude_object(MavenExecutionResult result) {
 
         assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");
     }
+
+    @MavenTest
+    void include_object(MavenExecutionResult result) {
+        assertThat(result).isSuccessful();
+
+        assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");
+    }
 }
diff --git a/src/test/java/org/utplsql/maven/plugin/util/StringUtilTest.java b/src/test/java/org/utplsql/maven/plugin/util/StringUtilTest.java
@@ -0,0 +1,73 @@
+package org.utplsql.maven.plugin.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+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 isEmpty_with_empty() {
+        assertTrue(isEmpty(""));
+    }
+
+    @Test
+    void isEmpty_with_null() {
+        assertTrue(isEmpty(null));
+    }
+
+    @Test
+    void isEmpty_with_string() {
+        assertFalse(isEmpty("abc"));
+    }
+
+    @Test
+    void isNotEmpty_with_string() {
+        assertTrue(isNotEmpty("abc"));
+    }
+
+    @Test
+    void isNotEmpty_with_empty() {
+        assertFalse(isNotEmpty(""));
+    }
+
+    @Test
+    void isNotEmpty_with_blank() {
+        assertTrue(isNotEmpty(" "));
+    }
+
+    @Test
+    void isBlank_with_blank() {
+        assertTrue(isBlank(" "));
+    }
+
+    @Test
+    void isBlank_with_null() {
+        assertTrue(isBlank(null));
+    }
+
+    @Test
+    void isBlank_with_string() {
+        assertFalse(isBlank("abc"));
+    }
+
+    @Test
+    void isBlank_with_whitespaces_before_string() {
+        assertFalse(isBlank("   abc"));
+    }
+
+    @Test
+    void isNotBlank_with_string() {
+        assertTrue(isNotBlank("abc"));
+    }
+
+    @Test
+    void isNotBlank_with_empty() {
+        assertFalse(isNotBlank(""));
+    }
+}
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/expected-output/utplsql/coverage-sonar-report.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/expected-output/utplsql/coverage-sonar-report.xml
@@ -0,0 +1 @@
+<coverage version="1"><file path="package body tests_owner.test_pkg_test_me"><lineToCover lineNumber="8" covered="true"/><lineToCover lineNumber="16" covered="true"/><lineToCover lineNumber="23" covered="true"/><lineToCover lineNumber="29" covered="true"/><lineToCover lineNumber="36" covered="true"/><lineToCover lineNumber="42" covered="true"/><lineToCover lineNumber="48" covered="true"/><lineToCover lineNumber="55" covered="true"/><lineToCover lineNumber="62" covered="true"/><lineToCover lineNumber="71" covered="true"/><lineToCover lineNumber="72" covered="true"/><lineToCover lineNumber="73" covered="true"/><lineToCover lineNumber="74" covered="true"/><lineToCover lineNumber="85" covered="true"/><lineToCover lineNumber="86" covered="true"/><lineToCover lineNumber="87" covered="true"/><lineToCover lineNumber="88" covered="true"/><lineToCover lineNumber="91" covered="true"/><lineToCover lineNumber="92" covered="true"/><lineToCover lineNumber="95" covered="true"/><lineToCover lineNumber="96" covered="true"/><lineToCover lineNumber="97" covered="true"/><lineToCover lineNumber="104" covered="true"/><lineToCover lineNumber="105" covered="true"/><lineToCover lineNumber="107" covered="false"/><lineToCover lineNumber="108" covered="false"/><lineToCover lineNumber="117" covered="true"/><lineToCover lineNumber="118" covered="true"/><lineToCover lineNumber="120" covered="true"/><lineToCover lineNumber="122" covered="true"/></file></coverage>
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/expected-output/utplsql/sonar-test-report.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/expected-output/utplsql/sonar-test-report.xml
@@ -0,0 +1,11 @@
+<testExecutions version="1">
+<file path="plsql.examples.test_pkg_test_me">
+<testCase name="test_fc_input_1" duration="1" ></testCase>
+<testCase name="test_fc_input_0" duration="1" ></testCase>
+<testCase name="test_fc_input_null" duration="1" ></testCase>
+<testCase name="test_pr_test_me_null" duration="1" ></testCase>
+<testCase name="test_pr_test_me_not_null" duration="1" ></testCase>
+<testCase name="test_pr_test_me_exists" duration="1" ></testCase>
+<testCase name="test_pr_test_me_cursor" duration="1" ></testCase>
+</file>
+</testExecutions>
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/pom.xml b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/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>owner-param</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <dbUrl>jdbc:oracle:thin:@localhost:1521:xe</dbUrl>
+        <dbUser>UT3</dbUser>
+        <dbPass>UT3</dbPass>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.utplsql</groupId>
+                <artifactId>utplsql-maven-plugin</artifactId>
+                <version>@project.version@</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <ignoreFailure>false</ignoreFailure>
+                            <paths>
+                                <path>TESTS_OWNER</path>
+                            </paths>
+                            <reporters>
+                                <reporter>
+                                    <name>UT_COVERAGE_SONAR_REPORTER</name>
+                                    <fileOutput>utplsql/coverage-sonar-report.xml</fileOutput>
+                                    <consoleOutput>true</consoleOutput>
+                                </reporter>
+                                <reporter>
+                                    <name>UT_SONAR_TEST_REPORTER</name>
+                                    <fileOutput>utplsql/sonar-test-report.xml</fileOutput>
+                                    <consoleOutput>true</consoleOutput>
+                                </reporter>
+                            </reporters>
+                            <includeObject>tests_owner.test_pkg_test_me</includeObject>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql
@@ -0,0 +1,27 @@
+CREATE OR REPLACE PACKAGE BODY CODE_OWNER.PKG_TEST_ME IS
+  --
+  -- This 
+  --
+  FUNCTION FC_TEST_ME(PPARAM1 IN VARCHAR2) RETURN NUMBER IS
+  BEGIN
+    IF PPARAM1 IS NULL THEN
+      RETURN NULL;
+    ELSIF PPARAM1 = '1' THEN
+      RETURN 1;
+    ELSE
+      RETURN 0;
+    END IF;
+  END FC_TEST_ME;
+
+  PROCEDURE PR_TEST_ME(PSNAME IN VARCHAR2) IS
+  BEGIN
+    IF PSNAME IS NULL THEN
+      NULL;
+    ELSE
+      INSERT INTO TO_TEST_ME (SNAME) VALUES (PSNAME);
+      COMMIT;
+    END IF;
+  END PR_TEST_ME;
+
+END PKG_TEST_ME;
+/
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/packages/PKG_TEST_ME.sql b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/packages/PKG_TEST_ME.sql
@@ -0,0 +1,8 @@
+--
+-- This package is used TO demonstrate the utPL/SQL possibilities 
+--
+CREATE OR REPLACE PACKAGE CODE_OWNER.PKG_TEST_ME AS
+  FUNCTION FC_TEST_ME(PPARAM1 IN VARCHAR2) RETURN NUMBER;
+  PROCEDURE PR_TEST_ME(PSNAME IN VARCHAR2);
+END PKG_TEST_ME;
+/
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/tables/TO_TEST_ME.tab b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/sources/foo/tables/TO_TEST_ME.tab
@@ -0,0 +1,8 @@
+--
+-- This is a table used to demonstrate the UNIT test framework.
+--
+CREATE TABLE TO_TEST_ME
+(
+  SNAME VARCHAR2(10)
+)
+/
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql
@@ -0,0 +1,126 @@
+CREATE OR REPLACE PACKAGE BODY TESTS_OWNER.TEST_PKG_TEST_ME AS
+
+  ---------------------------------------------------------------------------
+  PROCEDURE SETUP_GLOBAL IS
+  BEGIN
+    -- Put here the code which is valid for all tests and that should be
+    -- executed once.
+    NULL;
+  END SETUP_GLOBAL;
+
+  ---------------------------------------------------------------------------
+  PROCEDURE TEARDOWN_GLOBAL IS
+  BEGIN
+    -- Put here the code that should be called only once after all the test
+    -- have executed
+    NULL;
+  END TEARDOWN_GLOBAL;
+
+  ---------------------------------------------------------------------------
+  PROCEDURE SETUP_TEST IS
+  BEGIN
+    -- Nothing to clean up globally
+    NULL;
+  END SETUP_TEST;
+
+  PROCEDURE TEARDOWN_TEST IS
+  BEGIN
+    -- Nothing to clean up globally
+    NULL;
+  END TEARDOWN_TEST;
+
+  PROCEDURE TEST_FC_INPUT_1 IS
+  BEGIN
+    -- Ok this is a real test where I check that the function return 1
+    -- when called with a '1' parameter
+    UT.EXPECT(PKG_TEST_ME.FC_TEST_ME('1')).TO_EQUAL(1);
+  END;
+
+  PROCEDURE SETUP_TEST_FC_INPUT_1 IS
+  BEGIN
+    -- Nothing to be done really
+    NULL;
+  END;
+
+  PROCEDURE TEARDOWN_TEST_FC_INPUT_1 IS
+  BEGIN
+    -- Nothing to be done really
+    NULL;
+  END;
+
+  PROCEDURE TEST_FC_INPUT_0 IS
+  BEGIN
+    -- Ok this is a real test where I check that the function return 0
+    -- when called with a '0' parameter
+    UT.EXPECT(PKG_TEST_ME.FC_TEST_ME('0')).TO_EQUAL(0);
+  END;
+
+  PROCEDURE TEST_FC_INPUT_NULL IS
+  BEGIN
+    -- Ok I check that the function return NULL
+    -- when called with a NULL parameter
+    UT.EXPECT(PKG_TEST_ME.FC_TEST_ME(NULL)).TO_BE_NULL;
+  END TEST_FC_INPUT_NULL;
+
+  PROCEDURE TEST_PR_TEST_ME_NULL IS
+    VNCOUNT1 PLS_INTEGER;
+    VNCOUNT2 PLS_INTEGER;
+  BEGIN
+    -- In this example I check that the procedure does
+    -- not insert anything when passing it a NULL parameter
+    SELECT COUNT(1) INTO VNCOUNT1 FROM TO_TEST_ME;
+    PKG_TEST_ME.PR_TEST_ME(NULL);
+    SELECT COUNT(1) INTO VNCOUNT2 FROM TO_TEST_ME;
+    UT.EXPECT(VNCOUNT1).TO_EQUAL(VNCOUNT2);
+  END;
+
+  PROCEDURE TEST_PR_TEST_ME_NOT_NULL IS
+    VNCOUNT1 PLS_INTEGER;
+    VNCOUNT2 PLS_INTEGER;
+    VSNAME   TO_TEST_ME.SNAME%TYPE;
+  BEGIN
+    -- In this test I will check that I do insert a value
+    -- when the parameter is not null. I futher check that
+    -- the procedure has inserted the value I specified.
+    SELECT COUNT(1) INTO VNCOUNT1 FROM TO_TEST_ME;
+    VSNAME := TO_CHAR(VNCOUNT1);
+    PKG_TEST_ME.PR_TEST_ME(VSNAME);
+    SELECT COUNT(1) INTO VNCOUNT2 FROM TO_TEST_ME;
+  
+    -- Check that I have inserted the value
+    UT.EXPECT(VNCOUNT1 + 1).TO_EQUAL(VNCOUNT2);
+    SELECT COUNT(1) INTO VNCOUNT2 FROM TO_TEST_ME T WHERE T.SNAME = VSNAME;
+  
+    -- Check that I inserted the one I said I would insert
+    UT.EXPECT(VNCOUNT2).TO_EQUAL(1);
+    DELETE FROM TO_TEST_ME T WHERE T.SNAME = VSNAME;
+    COMMIT;
+  END;
+
+  PROCEDURE TEST_PR_TEST_ME_EXISTS IS
+  BEGIN
+    -- In case the value exists the procedure should fail with an exception.
+    BEGIN
+      PKG_TEST_ME.PR_TEST_ME('EXISTS');
+      PKG_TEST_ME.PR_TEST_ME('EXISTS');
+    EXCEPTION
+      WHEN OTHERS THEN
+        UT.FAIL('Unexpected exception raised');
+    END;
+  END;
+
+  PROCEDURE TEST_PR_TEST_ME_CURSOR IS
+    TYPE REF_CURSOR IS REF CURSOR;
+    VEXPECTED REF_CURSOR;
+    VACTUAL   REF_CURSOR;
+  BEGIN
+    EXECUTE IMMEDIATE 'TRUNCATE TABLE CODE_OWNER.TO_TEST_ME';
+    OPEN VEXPECTED FOR
+      SELECT T.SNAME FROM TO_TEST_ME T;
+    OPEN VACTUAL FOR
+      SELECT T.SNAME FROM TO_TEST_ME T;
+    UT.EXPECT(VEXPECTED).TO_(EQUAL(VACTUAL));
+  END;
+
+END;
+/
diff --git a/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql b/src/test/resources-its/org/utplsql/maven/plugin/UtPlsqlMojoIT/include_object/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,9 @@ public void execute() throws MojoExecutionException {`
`174`	`174`	`if (isNotBlank(includeObject)) {`
`175`	`175`	`if (includeObject.contains(",")) {`
`176`	`176`	`String[] includes = includeObject.split(",");`
`177`		`- runner.excludeObjects(Arrays.asList(includes));`
	`177`	`+ runner.includeObjects(Arrays.asList(includes));`
`178`	`178`	`} else {`
`179`		`- runner.excludeObject(includeObject);`
	`179`	`+ runner.includeObject(includeObject);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,8 @@ public static boolean isNotEmpty(CharSequence cs) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public static boolean isBlank(CharSequence cs) {`
`17`		`- int strLen;`
`18`		`- if (cs != null && (strLen = cs.length()) != 0) {`
`19`		`- for (int i = 0; i < strLen; ++i) {`
	`17`	`+ if (cs != null && cs.length() > 0) {`
	`18`	`+ for (int i = 0; i < cs.length(); ++i) {`
`20`	`19`	`if (!Character.isWhitespace(cs.charAt(i))) {`
`21`	`20`	`return false;`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,11 @@ void exclude_object(MavenExecutionResult result) {`
`68`	`68`
`69`	`69`	`assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");`
`70`	`70`	`}`
	`71`	`+`
	`72`	`+ @MavenTest`
	`73`	`+ void include_object(MavenExecutionResult result) {`
	`74`	`+ assertThat(result).isSuccessful();`
	`75`	`+`
	`76`	`+ assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");`
	`77`	`+ }`
`71`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+<coverage version="1"><file path="package body tests_owner.test_pkg_test_me"><lineToCover lineNumber="8" covered="true"/><lineToCover lineNumber="16" covered="true"/><lineToCover lineNumber="23" covered="true"/><lineToCover lineNumber="29" covered="true"/><lineToCover lineNumber="36" covered="true"/><lineToCover lineNumber="42" covered="true"/><lineToCover lineNumber="48" covered="true"/><lineToCover lineNumber="55" covered="true"/><lineToCover lineNumber="62" covered="true"/><lineToCover lineNumber="71" covered="true"/><lineToCover lineNumber="72" covered="true"/><lineToCover lineNumber="73" covered="true"/><lineToCover lineNumber="74" covered="true"/><lineToCover lineNumber="85" covered="true"/><lineToCover lineNumber="86" covered="true"/><lineToCover lineNumber="87" covered="true"/><lineToCover lineNumber="88" covered="true"/><lineToCover lineNumber="91" covered="true"/><lineToCover lineNumber="92" covered="true"/><lineToCover lineNumber="95" covered="true"/><lineToCover lineNumber="96" covered="true"/><lineToCover lineNumber="97" covered="true"/><lineToCover lineNumber="104" covered="true"/><lineToCover lineNumber="105" covered="true"/><lineToCover lineNumber="107" covered="false"/><lineToCover lineNumber="108" covered="false"/><lineToCover lineNumber="117" covered="true"/><lineToCover lineNumber="118" covered="true"/><lineToCover lineNumber="120" covered="true"/><lineToCover lineNumber="122" covered="true"/></file></coverage>