Change new option to an actual timeout value

pesse · pesse · commit dc6941a8f34a · 2022-06-08T23:02:38.000+02:00
Default is 0. In that case, there is no timeout at all. Timeout is in seconds.
diff --git a/src/main/java/org/utplsql/api/TestRunner.java b/src/main/java/org/utplsql/api/TestRunner.java
@@ -145,8 +145,8 @@ public TestRunner addTags(Collection<String> tags) {
         return this;
     }
 
-    public TestRunner catchOraStuck( boolean catchOraStuck ) {
-        this.options.catchOraStuck = catchOraStuck;
+    public TestRunner oraStuckTimeout(Integer oraStuckTimeout ) {
+        this.options.oraStuckTimeout = oraStuckTimeout;
         return this;
     }
 
@@ -218,7 +218,7 @@ public void run(Connection conn) throws SQLException {
 
         TestRunnerStatement testRunnerStatement = null;
         try {
-            testRunnerStatement = ( options.catchOraStuck ) ? initStatementWithTimeout(conn) : initStatement(conn);
+            testRunnerStatement = ( options.oraStuckTimeout > 0 ) ? initStatementWithTimeout(conn, options.oraStuckTimeout) : initStatement(conn);
             logger.info("Running tests");
             testRunnerStatement.execute();
             logger.info("Running tests finished.");
@@ -236,15 +236,15 @@ private TestRunnerStatement initStatement( Connection conn ) throws SQLException
         return compatibilityProxy.getTestRunnerStatement(options, conn);
     }
 
-    private TestRunnerStatement initStatementWithTimeout( Connection conn ) throws OracleCreateStatmenetStuckException, SQLException {
+    private TestRunnerStatement initStatementWithTimeout( Connection conn, int timeout ) throws OracleCreateStatmenetStuckException, SQLException {
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Callable<TestRunnerStatement> callable = () -> compatibilityProxy.getTestRunnerStatement(options, conn);
         Future<TestRunnerStatement> future = executor.submit(callable);
 
         // We want to leave the statement open in case of stuck scenario
         TestRunnerStatement testRunnerStatement = null;
         try {
-            testRunnerStatement = future.get(2, TimeUnit.SECONDS);
+            testRunnerStatement = future.get(timeout, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
             logger.error("Detected Oracle driver stuck during Statement initialization");
             executor.shutdownNow();
diff --git a/src/main/java/org/utplsql/api/TestRunnerOptions.java b/src/main/java/org/utplsql/api/TestRunnerOptions.java
@@ -30,7 +30,7 @@ public class TestRunnerOptions {
     public boolean randomTestOrder = false;
     public Integer randomTestOrderSeed;
     public final Set<String> tags = new LinkedHashSet<>();
-    public boolean catchOraStuck = false;
+    public Integer oraStuckTimeout = 0;
 
     public String getTagsAsString() {
         return String.join(",", tags);
