Disable tests on NATIVE as that protocol doesn't have the behaviour

(PURE_JAVA and EMBEDDED do, so considered sufficiently covered)
FirebirdSQL · Oct 16, 2024 · 10f6a5c · 10f6a5c
1 parent da49fa4
commit 10f6a5c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/src/test/org/firebirdsql/jdbc/FBCallableStatementTest.java b/src/test/org/firebirdsql/jdbc/FBCallableStatementTest.java
@@ -37,7 +37,10 @@
 import static org.firebirdsql.common.FBTestProperties.*;
 import static org.firebirdsql.common.assertions.SQLExceptionAssertions.assertThrowsFbStatementClosed;
 import static org.firebirdsql.common.assertions.SQLExceptionAssertions.assertThrowsFbStatementOnlyMethod;
+import static org.firebirdsql.common.matchers.GdsTypeMatchers.isOtherNativeType;
+import static org.firebirdsql.common.matchers.MatcherAssume.assumeThat;
 import static org.firebirdsql.common.matchers.SQLExceptionMatchers.*;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.*;
@@ -1115,6 +1118,8 @@ void executeUpdateWithExceptionShouldEndTransactionInAutocommit() throws Excepti
 
  @Test
  void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws Exception {
+ assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
+ GDS_TYPE, not(isOtherNativeType()));
  //@formatter:off
  executeDDL(con,
  "recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +
@@ -1133,6 +1138,8 @@ void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws
 
  @Test
  void executeQueryWithExceptionShouldEndTransactionInAutocommit() throws Exception {
+ assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
+ GDS_TYPE, not(isOtherNativeType()));
  //@formatter:off
  executeDDL(con,
  "recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +

diff --git a/src/test/org/firebirdsql/jdbc/FBPreparedStatementTest.java b/src/test/org/firebirdsql/jdbc/FBPreparedStatementTest.java
@@ -50,6 +50,8 @@
 import static org.firebirdsql.common.DdlHelper.executeDDL;
 import static org.firebirdsql.common.FBTestProperties.*;
 import static org.firebirdsql.common.FbAssumptions.assumeServerBatchSupport;
+import static org.firebirdsql.common.matchers.GdsTypeMatchers.isOtherNativeType;
+import static org.firebirdsql.common.matchers.MatcherAssume.assumeThat;
 import static org.firebirdsql.common.matchers.SQLExceptionMatchers.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -1496,6 +1498,8 @@ void executeWithExceptionShouldEndTransactionInAutocommit() throws Exception {
 
  @Test
  void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws Exception {
+ assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
+ GDS_TYPE, not(isOtherNativeType()));
  //@formatter:off
  executeDDL(con,
  "recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +
@@ -1528,6 +1532,8 @@ void executeUpdateWithExceptionShouldEndTransactionInAutocommit() throws Excepti
 
  @Test
  void executeQueryWithExceptionShouldEndTransactionInAutocommit() throws Exception {
+ assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
+ GDS_TYPE, not(isOtherNativeType()));
  //@formatter:off
  executeDDL(con,
  "recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +

diff --git a/src/test/org/firebirdsql/jdbc/FBStatementTest.java b/src/test/org/firebirdsql/jdbc/FBStatementTest.java
@@ -37,11 +37,14 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.firebirdsql.common.DdlHelper.*;
+import static org.firebirdsql.common.FBTestProperties.GDS_TYPE;
 import static org.firebirdsql.common.FBTestProperties.getConnectionViaDriverManager;
 import static org.firebirdsql.common.FBTestProperties.getDefaultPropertiesForConnection;
 import static org.firebirdsql.common.FBTestProperties.getDefaultSupportInfo;
 import static org.firebirdsql.common.FBTestProperties.getUrl;
 import static org.firebirdsql.common.assertions.SQLExceptionAssertions.assertThrowsFbStatementClosed;
+import static org.firebirdsql.common.matchers.GdsTypeMatchers.isOtherNativeType;
+import static org.firebirdsql.common.matchers.MatcherAssume.assumeThat;
 import static org.firebirdsql.common.matchers.SQLExceptionMatchers.*;
 import static org.firebirdsql.util.FirebirdSupportInfo.supportInfoFor;
 import static org.hamcrest.CoreMatchers.*;
@@ -1133,6 +1136,8 @@ void executeWithExceptionShouldEndTransactionInAutocommit() throws Exception {
 
  @Test
  void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws Exception {
+ assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
+ GDS_TYPE, not(isOtherNativeType()));
  //@formatter:off
  executeDDL(con,
  "recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +
@@ -1163,6 +1168,8 @@ void executeUpdateWithExceptionShouldEndTransactionInAutocommit() throws Excepti
 
  @Test
  void executeQueryWithExceptionShouldEndTransactionInAutocommit() throws Exception {
+ assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
+ GDS_TYPE, not(isOtherNativeType()));
  //@formatter:off
  executeDDL(con,
  "recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +