Merge branch 'feature/55_skipUtplsqlTests' into develop

Author: simasch

.travis.yml

@@ -34,7 +34,7 @@ install:
 
 script:
   - echo "Run Verify with Coverage"
-  - mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify -Pintegration -DdbUser="${DB_UT3_USER}" -DdbPass="${DB_UT3_PASS}" -DdbUrl="jdbc:oracle:thin:@${DB_URL}"
+  - mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify -DdbUser="${DB_UT3_USER}" -DdbPass="${DB_UT3_PASS}" -DdbUrl="jdbc:oracle:thin:@${DB_URL}"
 
 before_deploy:
   - echo $GPG_SECRET_KEYS | base64 --decode | ${GPG_EXECUTABLE} --import

README.md

@@ -4,52 +4,54 @@
 # utPLSQL-maven-plugin
 * A maven plugin for running Unit Tests with utPLSQL v3+.
 
-### Compatibility
+## Compatibility
 * This plugin is compatible with utPLSQL 3.1.0+.
 
-### Prerequisites
+## Prerequisites
 * Java SE Runtime Environment 8
 * Maven Version 3.5+
 
-The plugin requires Oracle JDBC driver (ojdbc8) as a maven dependency. 
-In order to download the required driver, you need to configure access to Oracle's Maven Repository in your `settings.xml` file.
+The plugin requires Oracle JDBC driver (ojdbc8) as a Maven dependency. 
 
-http://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9010
+```xml
+<dependency>
+    <groupId>com.oracle.database.jdbc</groupId>
+    <artifactId>ojdbc8</artifactId>
+    <version>21.3.0.0</version>
+</dependency>
+```
+
+## Usage
+
+### Skipping Tests
+
+To skip running the tests for a particular project, set the **skipUtplsqlTests** property to true.
+
+```xml
+<configuration>
+    <skipUtplsqlTests>true</skipUtplsqlTests>
+</configuration>
+```
+
+You can also skip the tests via the command line by executing the following command:
 
-Sections 6.1 and 6.5 are the more important ones, and the only ones you need if you're using the latest Maven version.
+    mvn install -DskipTests
 
-Below is an example of changes needed to your `settings.xml` file.
+#### Skipping by Default
+
+If you want to skip tests by default but want the ability to re-enable tests from the command line, you need to go via a properties section in the pom:
 
 ```xml
-<settings>
- <servers>
-    <server>
-        <id>maven.oracle.com</id>
-        <username>oracle_tech_net_user_name</username>
-        <password>oracle_tech_net_password</password>
-        <configuration>
-            <basicAuthScope>
-                <host>ANY</host>
-                <port>ANY</port>
-                <realm>OAM 11g</realm>
-            </basicAuthScope>
-            <httpConfiguration>
-                <all>
-                    <params>
-                        <property>
-                        <name>http.protocol.allow-circular-redirects</name>
-                        <value>%b,true</value>
-                        </property>
-                    </params>
-                </all>
-            </httpConfiguration>
-        </configuration>
-    </server>
- </servers>
-</settings>
+<configuration>
+    <skipUtplsqlTests>true</skipUtplsqlTests>
+</configuration>
 ```
 
-### Usage
+This will allow you to run with all tests disabled by default and to run them with this command:
+
+    mvn install -DskipTests=false
+
+### Usage Example
 
 Please refer to the following usage example for the parameters descriptions.
 
@@ -81,7 +83,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.0</version>
+                <version>3.1.5</version>
                 <executions>
                     <execution>
                         <goals>
@@ -136,6 +138,10 @@ Please refer to the following usage example for the parameters descriptions.
                             <!-- Defaults to: false -->
                             <skipCompatibilityCheck>false</skipCompatibilityCheck>
 
+                            <!-- Skip the tests -->
+                            <!-- Defaults to: false -->
+                            <skipUtplsqlTests>false</skipUtplsqlTests>
+
                             <!-- A list of tags to run. -->
                             <tags>
                                 <tag>test_tag</tag>
@@ -229,7 +235,7 @@ More project samples are available in the src/test/resources directory:
 * **type-mapping-project:** this project shows how to use regex and custom type parameters together.
 * **owner-param-project:** this project demonstrates how to use sourcesOwner and testsOwner parameters.
 
-### Comparaison with the CLI
+## Comparaison with the CLI
 
 | CLI short parameter | CLI long parameter | maven XML path |
 | --- | --- | --- |

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.utplsql</groupId>
     <artifactId>utplsql-maven-plugin</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.1.5-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>utPLSQL Maven Plugin</name>

src/main/java/org/utplsql/maven/plugin/UtPLSQLMojo.java

@@ -1,13 +1,6 @@
 package org.utplsql.maven.plugin;
 
-import java.io.File;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
+import oracle.jdbc.pool.OracleDataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
@@ -34,12 +27,19 @@
 import org.utplsql.maven.plugin.model.ReporterParameter;
 import org.utplsql.maven.plugin.reporter.ReporterWriter;
 
-import oracle.jdbc.pool.OracleDataSource;
+import java.io.File;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * This class expose the {@link TestRunner} interface to Maven.
- * 
+ *
  * @author Alberto Hernández
+ * @author Simon Martinelli
  */
 @Mojo(name = "test", defaultPhase = LifecyclePhase.TEST)
 public class UtPLSQLMojo extends AbstractMojo {
@@ -116,7 +116,7 @@ public class UtPLSQLMojo extends AbstractMojo {
     private List<CustomTypeMapping> testsCustomTypeMapping;
 
     @Parameter
-    private Set<String> tags = new LinkedHashSet<>();
+    private final Set<String> tags = new LinkedHashSet<>();
 
     @Parameter
     private boolean randomTestOrder;
@@ -130,74 +130,80 @@ public class UtPLSQLMojo extends AbstractMojo {
     @Parameter(defaultValue = "${maven.test.failure.ignore}")
     protected boolean ignoreFailure;
 
+    @Parameter(defaultValue = "${skipUtplsqlTests}")
+    protected boolean skipUtplsqlTests;
+
     // Color in the console, bases on Maven logging configuration.
-    private boolean colorConsole = MessageUtils.isColorEnabled();
+    private final boolean colorConsole = MessageUtils.isColorEnabled();
 
     private ReporterWriter reporterWriter;
 
-    private DatabaseInformation databaseInformation = new DefaultDatabaseInformation();
+    private final DatabaseInformation databaseInformation = new DefaultDatabaseInformation();
 
     /**
      * Executes the plugin.
      */
     @Override
     public void execute() throws MojoExecutionException {
+        if (skipUtplsqlTests) {
+            getLog().debug("utPLSQLTests are skipped.");
+        } else {
+            getLog().debug("Java Api Version = " + JavaApiVersionInfo.getVersion());
+            loadConfFromEnvironment();
 
-        getLog().debug("Java Api Version = " + JavaApiVersionInfo.getVersion());
-        loadConfFromEnvironment();
-
-        Connection connection = null;
-        try {
-            FileMapperOptions sourceMappingOptions = buildSourcesOptions();
-            FileMapperOptions testMappingOptions = buildTestsOptions();
-            OracleDataSource ds = new OracleDataSource();
-            ds.setURL(url);
-            ds.setUser(user);
-            ds.setPassword(password);
-            connection = ds.getConnection();
-
-            Version utlVersion = this.databaseInformation.getUtPlsqlFrameworkVersion(connection);
-            getLog().info("utPLSQL Version = " + utlVersion);
-
-            List<Reporter> reporterList = initReporters(connection, utlVersion, ReporterFactory.createEmpty());
-
-            logParameters(sourceMappingOptions, testMappingOptions, reporterList);
-
-            TestRunner runner = new TestRunner()
-                    .addPathList(paths)
-                    .addReporterList(reporterList)
-                    .sourceMappingOptions(sourceMappingOptions)
-                    .testMappingOptions(testMappingOptions)
-                    .skipCompatibilityCheck(skipCompatibilityCheck)
-                    .colorConsole(colorConsole)
-                    .addTags(tags)
-                    .randomTestOrder(randomTestOrder)
-                    .randomTestOrderSeed(randomTestOrderSeed)
-                    .failOnErrors(!ignoreFailure);
-
-            if (StringUtils.isNotBlank(excludeObject)) {
-                runner.excludeObject(excludeObject);
-            }
-            if (StringUtils.isNotBlank(includeObject)) {
-                runner.includeObject(includeObject);
-            }
+            Connection connection = null;
+            try {
+                FileMapperOptions sourceMappingOptions = buildSourcesOptions();
+                FileMapperOptions testMappingOptions = buildTestsOptions();
+                OracleDataSource ds = new OracleDataSource();
+                ds.setURL(url);
+                ds.setUser(user);
+                ds.setPassword(password);
+                connection = ds.getConnection();
+
+                Version utlVersion = this.databaseInformation.getUtPlsqlFrameworkVersion(connection);
+                getLog().info("utPLSQL Version = " + utlVersion);
+
+                List<Reporter> reporterList = initReporters(connection, utlVersion, ReporterFactory.createEmpty());
+
+                logParameters(sourceMappingOptions, testMappingOptions, reporterList);
+
+                TestRunner runner = new TestRunner()
+                        .addPathList(paths)
+                        .addReporterList(reporterList)
+                        .sourceMappingOptions(sourceMappingOptions)
+                        .testMappingOptions(testMappingOptions)
+                        .skipCompatibilityCheck(skipCompatibilityCheck)
+                        .colorConsole(colorConsole)
+                        .addTags(tags)
+                        .randomTestOrder(randomTestOrder)
+                        .randomTestOrderSeed(randomTestOrderSeed)
+                        .failOnErrors(!ignoreFailure);
+
+                if (StringUtils.isNotBlank(excludeObject)) {
+                    runner.excludeObject(excludeObject);
+                }
+                if (StringUtils.isNotBlank(includeObject)) {
+                    runner.includeObject(includeObject);
+                }
 
-            runner.run(connection);
+                runner.run(connection);
 
-        } catch (SomeTestsFailedException e) {
-            if (!this.ignoreFailure) {
+            } catch (SomeTestsFailedException e) {
+                if (!this.ignoreFailure) {
+                    throw new MojoExecutionException(e.getMessage(), e);
+                }
+            } catch (SQLException e) {
                 throw new MojoExecutionException(e.getMessage(), e);
-            }
-        } catch (SQLException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        } finally {
-            try {
-                if (null != connection) {
-                    reporterWriter.writeReporters(connection);
-                    connection.close();
+            } finally {
+                try {
+                    if (null != connection) {
+                        reporterWriter.writeReporters(connection);
+                        connection.close();
+                    }
+                } catch (Exception e) {
+                    getLog().error(e.getMessage(), e);
                 }
-            } catch (Exception e) {
-                getLog().error(e.getMessage(), e);
             }
         }
     }
@@ -206,11 +212,9 @@ private void loadConfFromEnvironment() {
         if (StringUtils.isEmpty(url)) {
             url = System.getProperty("dbUrl");
         }
-
         if (StringUtils.isEmpty(user)) {
             user = System.getProperty("dbUser");
         }
-
         if (StringUtils.isEmpty(password)) {
             password = System.getProperty("dbPass");
         }
@@ -223,7 +227,7 @@ private FileMapperOptions buildSourcesOptions() throws MojoExecutionException {
                 if (defaultSourceDirectory.exists()) {
                     sources.add(PluginDefault.buildDefaultSource());
                 } else {
-                    return new FileMapperOptions(new ArrayList<String>());
+                    return new FileMapperOptions(new ArrayList<>());
                 }
             }
 
@@ -252,7 +256,7 @@ private FileMapperOptions buildSourcesOptions() throws MojoExecutionException {
             }
 
             if (sourcesCustomTypeMapping != null && !sourcesCustomTypeMapping.isEmpty()) {
-                fileMapperOptions.setTypeMappings(new ArrayList<KeyValuePair>());
+                fileMapperOptions.setTypeMappings(new ArrayList<>());
                 for (CustomTypeMapping typeMapping : sourcesCustomTypeMapping) {
                     fileMapperOptions.getTypeMappings()
                             .add(new KeyValuePair(typeMapping.getCustomMapping(), typeMapping.getType()));
@@ -274,7 +278,7 @@ private FileMapperOptions buildTestsOptions() throws MojoExecutionException {
                 if (defaultTestDirectory.exists()) {
                     tests.add(PluginDefault.buildDefaultTest());
                 } else {
-                    return new FileMapperOptions(new ArrayList<String>());
+                    return new FileMapperOptions(new ArrayList<>());
                 }
             }
 
@@ -303,7 +307,7 @@ private FileMapperOptions buildTestsOptions() throws MojoExecutionException {
             }
 
             if (testsCustomTypeMapping != null && !testsCustomTypeMapping.isEmpty()) {
-                fileMapperOptions.setTypeMappings(new ArrayList<KeyValuePair>());
+                fileMapperOptions.setTypeMappings(new ArrayList<>());
                 for (CustomTypeMapping typeMapping : testsCustomTypeMapping) {
                     fileMapperOptions.getTypeMappings()
                             .add(new KeyValuePair(typeMapping.getCustomMapping(), typeMapping.getType()));
@@ -336,8 +340,7 @@ private List<Reporter> initReporters(Connection connection, Version utlVersion,
             reporter.init(connection);
             reporterList.add(reporter);
 
-            // Turns the console output on by default if both file and console output are
-            // empty.
+            // Turns the console output on by default if both file and console output are empty.
             if (!reporterParameter.isFileOutput() && null == reporterParameter.getConsoleOutput()) {
                 reporterParameter.setConsoleOutput(true);
             }
@@ -352,7 +355,7 @@ private List<Reporter> initReporters(Connection connection, Version utlVersion,
     }
 
     private void logParameters(FileMapperOptions sourceMappingOptions, FileMapperOptions testMappingOptions,
-            List<Reporter> reporterList) {
+                               List<Reporter> reporterList) {
         Log log = getLog();
         log.info("Invoking TestRunner with: " + targetDir);
 
@@ -361,11 +364,14 @@ private void logParameters(FileMapperOptions sourceMappingOptions, FileMapperOpt
         }
 
         log.debug("Invoking TestRunner with: ");
+
         log.debug("reporters=");
         reporterList.forEach((Reporter r) -> log.debug(r.getTypeName()));
+
         log.debug("sources=");
         sourceMappingOptions.getFilePaths().forEach(log::debug);
+
         log.debug("tests=");
         testMappingOptions.getFilePaths().forEach(log::debug);
     }
-}
+}