Add option to fail on errors

viniciusam · viniciusam · commit d59b88d6ec77 · 2017-07-19T23:32:34.000-03:00
diff --git a/src/main/java/io/github/utplsql/api/TestRunner.java b/src/main/java/io/github/utplsql/api/TestRunner.java
@@ -1,5 +1,6 @@
 package io.github.utplsql.api;
 
+import io.github.utplsql.api.exception.SomeTestsFailedException;
 import io.github.utplsql.api.reporter.DocumentationReporter;
 import io.github.utplsql.api.reporter.Reporter;
 import oracle.jdbc.OracleConnection;
@@ -21,6 +22,7 @@ public class TestRunner {
     private List<String> testFiles = new ArrayList<>();
     private List<String> includeObjects = new ArrayList<>();
     private List<String> excludeObjects = new ArrayList<>();
+    private boolean failOnErrors = false;
 
     public TestRunner addPath(String path) {
         this.pathList.add(path);
@@ -72,7 +74,12 @@ public TestRunner excludeObject(String obj) {
         return this;
     }
 
-    public void run(Connection conn) throws SQLException {
+    public TestRunner failOnErrors(boolean failOnErrors) {
+        this.failOnErrors = failOnErrors;
+        return this;
+    }
+
+    public void run(Connection conn) throws SomeTestsFailedException, SQLException {
         for (Reporter r : this.reporterList)
             validateReporter(conn, r);
 
@@ -86,16 +93,23 @@ public void run(Connection conn) throws SQLException {
 
         // Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.
         String colorConsoleStr = Boolean.toString(this.colorConsole);
+        String failOnErrors = Boolean.toString(this.failOnErrors);
 
         OracleConnection oraConn = conn.unwrap(OracleConnection.class);
         CallableStatement callableStatement = null;
         try {
             callableStatement = conn.prepareCall(
                     "BEGIN " +
                             "ut_runner.run(" +
-                            "a_paths => ?, a_reporters => ?, a_color_console => " + colorConsoleStr + ", " +
-                            "a_coverage_schemes => ?, a_source_files => ?, a_test_files => ?, " +
-                            "a_include_objects => ?, a_exclude_objects => ?); " +
+                            "a_paths            => ?, " +
+                            "a_reporters        => ?, " +
+                            "a_color_console    => " + colorConsoleStr + ", " +
+                            "a_coverage_schemes => ?, " +
+                            "a_source_files     => ?, " +
+                            "a_test_files       => ?, " +
+                            "a_include_objects  => ?, " +
+                            "a_exclude_objects  => ?, " +
+                            "a_fail_on_errors   => " + failOnErrors + "); " +
                             "END;");
 
             int paramIdx = 0;
@@ -142,6 +156,12 @@ public void run(Connection conn) throws SQLException {
             }
 
             callableStatement.execute();
+        } catch (SQLException e) {
+            if (e.getErrorCode() == SomeTestsFailedException.ERROR_CODE) {
+                throw new SomeTestsFailedException(e.getMessage(), e);
+            } else {
+                throw e;
+            }
         } finally {
             if (callableStatement != null)
                 callableStatement.close();
diff --git a/src/main/java/io/github/utplsql/api/exception/SomeTestsFailedException.java b/src/main/java/io/github/utplsql/api/exception/SomeTestsFailedException.java
@@ -0,0 +1,16 @@
+package io.github.utplsql.api.exception;
+
+import java.sql.SQLException;
+
+/**
+ * Custom exception class to indicate if some tests failed.
+ */
+public class SomeTestsFailedException extends SQLException {
+
+    public static final int ERROR_CODE = 20213;
+
+    public SomeTestsFailedException(String reason, Throwable cause) {
+        super(reason, cause);
+    }
+
+}
diff --git a/src/test/java/io/github/utplsql/api/TestRunnerTest.java b/src/test/java/io/github/utplsql/api/TestRunnerTest.java
@@ -1,5 +1,6 @@
 package io.github.utplsql.api;
 
+import io.github.utplsql.api.exception.SomeTestsFailedException;
 import io.github.utplsql.api.reporter.*;
 import io.github.utplsql.api.rules.DatabaseRule;
 import org.junit.Assert;
@@ -32,7 +33,6 @@ public void runWithManyReporters() {
         try {
             Connection conn = db.newConnection();
             new TestRunner()
-                    .addPath("ut3")
                     .addPath(db.getUser())
                     .addReporter(new DocumentationReporter().init(conn))
                     .addReporter(new CoverageHTMLReporter().init(conn))
@@ -47,4 +47,19 @@ public void runWithManyReporters() {
         }
     }
 
+    @Test
+    public void failOnErrors() {
+        try {
+            Connection conn = db.newConnection();
+            new TestRunner()
+                    .failOnErrors(true)
+                    .run(conn);
+            Assert.fail();
+        } catch (SomeTestsFailedException ignored) {
+            System.out.println("Expected exception object thrown.");
+        } catch (SQLException e) {
+            Assert.fail("Wrong exception object thrown.");
+        }
+    }
+
 }
