From dc6941a8f34aeea165a6400d825e6fcfee9801b5 Mon Sep 17 00:00:00 2001 From: pesse Date: Wed, 8 Jun 2022 23:02:38 +0200 Subject: [PATCH 1/4] Change new option to an actual timeout value Default is 0. In that case, there is no timeout at all. Timeout is in seconds. --- src/main/java/org/utplsql/api/TestRunner.java | 10 +++++----- src/main/java/org/utplsql/api/TestRunnerOptions.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/utplsql/api/TestRunner.java b/src/main/java/org/utplsql/api/TestRunner.java index fe0c485..92afc90 100644 --- 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 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,7 +236,7 @@ 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 callable = () -> compatibilityProxy.getTestRunnerStatement(options, conn); Future future = executor.submit(callable); @@ -244,7 +244,7 @@ private TestRunnerStatement initStatementWithTimeout( Connection conn ) throws O // 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 index de8ee12..c17f3ce 100644 --- 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 tags = new LinkedHashSet<>(); - public boolean catchOraStuck = false; + public Integer oraStuckTimeout = 0; public String getTagsAsString() { return String.join(",", tags); From 1e8ca197f9e4b286f57762ba75f7f886c07c53e8 Mon Sep 17 00:00:00 2001 From: pesse Date: Wed, 8 Jun 2022 23:22:00 +0200 Subject: [PATCH 2/4] Add latest utPLSQL versions --- src/main/java/org/utplsql/api/Version.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/utplsql/api/Version.java b/src/main/java/org/utplsql/api/Version.java index bb336b6..18b5de4 100644 --- a/src/main/java/org/utplsql/api/Version.java +++ b/src/main/java/org/utplsql/api/Version.java @@ -33,10 +33,14 @@ public class Version implements Comparable { public final static Version V3_1_6 = new Version("3.1.6", 3, 1, 6, 2729, true); public final static Version V3_1_7 = new Version("3.1.7", 3, 1, 7, 3085, true); public final static Version V3_1_8 = new Version("3.1.8", 3, 1, 8, 3188, true); + public final static Version V3_1_9 = new Version("3.1.9", 3, 1, 9, 3268, true); + public final static Version V3_1_10 = new Version("3.1.10", 3, 1, 10, 3347, true); + public final static Version V3_1_11 = new Version("3.1.11", 3, 1, 11, 3557, true); + public final static Version V3_1_12 = new Version("3.1.12", 3, 1, 12, 3876, true); private final static Map knownVersions = - Stream.of(V3_0_0, V3_0_1, V3_0_2, V3_0_3, V3_0_4, V3_1_0, V3_1_1, V3_1_2, V3_1_3, V3_1_4, V3_1_5, V3_1_6, V3_1_7, V3_1_8) + Stream.of(V3_0_0, V3_0_1, V3_0_2, V3_0_3, V3_0_4, V3_1_0, V3_1_1, V3_1_2, V3_1_3, V3_1_4, V3_1_5, V3_1_6, V3_1_7, V3_1_8, V3_1_9, V3_1_10, V3_1_11, V3_1_12) .collect(toMap(Version::toString, Function.identity())); - public final static Version LATEST = V3_1_8; + public final static Version LATEST = V3_1_12; private final String origString; private final Integer major; From 9d5384035d1cf148a30fc09ee67323b31c301b62 Mon Sep 17 00:00:00 2001 From: pesse Date: Wed, 8 Jun 2022 23:34:38 +0200 Subject: [PATCH 3/4] Update dependencies Fixes #98 --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f9a9b7a..93d7b06 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,10 +39,10 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation("org.slf4j:slf4j-api:1.7.26") - implementation("com.oracle.ojdbc:ojdbc8:$ojdbcVersion") { - exclude(group = "com.oracle.ojdbc") + implementation("com.oracle.database.jdbc:ojdbc8:$ojdbcVersion") { + exclude(group = "com.oracle.database.jdbc", module = "ucp") } - implementation("com.oracle.ojdbc:orai18n:$ojdbcVersion") + implementation("com.oracle.database.nls:orai18n:$ojdbcVersion") // Use Jupiter test framework testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion") From 13655836017ba6cfb1db142421a7bdf96bf7fa83 Mon Sep 17 00:00:00 2001 From: pesse Date: Wed, 8 Jun 2022 23:38:30 +0200 Subject: [PATCH 4/4] Update slf4j dependencies --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 93d7b06..eb9a908 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { api("com.google.code.findbugs:jsr305:3.0.2") // This dependency is used internally, and not exposed to consumers on their own compile classpath. - implementation("org.slf4j:slf4j-api:1.7.26") + implementation("org.slf4j:slf4j-api:1.7.36") implementation("com.oracle.database.jdbc:ojdbc8:$ojdbcVersion") { exclude(group = "com.oracle.database.jdbc", module = "ucp") }