Skip to content

Commit 10f6a5c

Browse files
committed
Disable tests on NATIVE as that protocol doesn't have the behaviour
(PURE_JAVA and EMBEDDED do, so considered sufficiently covered)
1 parent da49fa4 commit 10f6a5c

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

src/test/org/firebirdsql/jdbc/FBCallableStatementTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
import static org.firebirdsql.common.FBTestProperties.*;
3838
import static org.firebirdsql.common.assertions.SQLExceptionAssertions.assertThrowsFbStatementClosed;
3939
import static org.firebirdsql.common.assertions.SQLExceptionAssertions.assertThrowsFbStatementOnlyMethod;
40+
import static org.firebirdsql.common.matchers.GdsTypeMatchers.isOtherNativeType;
41+
import static org.firebirdsql.common.matchers.MatcherAssume.assumeThat;
4042
import static org.firebirdsql.common.matchers.SQLExceptionMatchers.*;
43+
import static org.hamcrest.CoreMatchers.not;
4144
import static org.hamcrest.MatcherAssert.assertThat;
4245
import static org.hamcrest.Matchers.containsString;
4346
import static org.junit.jupiter.api.Assertions.*;
@@ -1115,6 +1118,8 @@ void executeUpdateWithExceptionShouldEndTransactionInAutocommit() throws Excepti
11151118

11161119
@Test
11171120
void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws Exception {
1121+
assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
1122+
GDS_TYPE, not(isOtherNativeType()));
11181123
//@formatter:off
11191124
executeDDL(con,
11201125
"recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +
@@ -1133,6 +1138,8 @@ void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws
11331138

11341139
@Test
11351140
void executeQueryWithExceptionShouldEndTransactionInAutocommit() throws Exception {
1141+
assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
1142+
GDS_TYPE, not(isOtherNativeType()));
11361143
//@formatter:off
11371144
executeDDL(con,
11381145
"recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +

src/test/org/firebirdsql/jdbc/FBPreparedStatementTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
import static org.firebirdsql.common.DdlHelper.executeDDL;
5151
import static org.firebirdsql.common.FBTestProperties.*;
5252
import static org.firebirdsql.common.FbAssumptions.assumeServerBatchSupport;
53+
import static org.firebirdsql.common.matchers.GdsTypeMatchers.isOtherNativeType;
54+
import static org.firebirdsql.common.matchers.MatcherAssume.assumeThat;
5355
import static org.firebirdsql.common.matchers.SQLExceptionMatchers.*;
5456
import static org.hamcrest.CoreMatchers.*;
5557
import static org.hamcrest.MatcherAssert.assertThat;
@@ -1496,6 +1498,8 @@ void executeWithExceptionShouldEndTransactionInAutocommit() throws Exception {
14961498

14971499
@Test
14981500
void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws Exception {
1501+
assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
1502+
GDS_TYPE, not(isOtherNativeType()));
14991503
//@formatter:off
15001504
executeDDL(con,
15011505
"recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +
@@ -1528,6 +1532,8 @@ void executeUpdateWithExceptionShouldEndTransactionInAutocommit() throws Excepti
15281532

15291533
@Test
15301534
void executeQueryWithExceptionShouldEndTransactionInAutocommit() throws Exception {
1535+
assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
1536+
GDS_TYPE, not(isOtherNativeType()));
15311537
//@formatter:off
15321538
executeDDL(con,
15331539
"recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +

src/test/org/firebirdsql/jdbc/FBStatementTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@
3737
import org.junit.jupiter.params.provider.ValueSource;
3838

3939
import static org.firebirdsql.common.DdlHelper.*;
40+
import static org.firebirdsql.common.FBTestProperties.GDS_TYPE;
4041
import static org.firebirdsql.common.FBTestProperties.getConnectionViaDriverManager;
4142
import static org.firebirdsql.common.FBTestProperties.getDefaultPropertiesForConnection;
4243
import static org.firebirdsql.common.FBTestProperties.getDefaultSupportInfo;
4344
import static org.firebirdsql.common.FBTestProperties.getUrl;
4445
import static org.firebirdsql.common.assertions.SQLExceptionAssertions.assertThrowsFbStatementClosed;
46+
import static org.firebirdsql.common.matchers.GdsTypeMatchers.isOtherNativeType;
47+
import static org.firebirdsql.common.matchers.MatcherAssume.assumeThat;
4548
import static org.firebirdsql.common.matchers.SQLExceptionMatchers.*;
4649
import static org.firebirdsql.util.FirebirdSupportInfo.supportInfoFor;
4750
import static org.hamcrest.CoreMatchers.*;
@@ -1133,6 +1136,8 @@ void executeWithExceptionShouldEndTransactionInAutocommit() throws Exception {
11331136

11341137
@Test
11351138
void executeWithResultSetWithExceptionShouldEndTransactionInAutocommit() throws Exception {
1139+
assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
1140+
GDS_TYPE, not(isOtherNativeType()));
11361141
//@formatter:off
11371142
executeDDL(con,
11381143
"recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +
@@ -1163,6 +1168,8 @@ void executeUpdateWithExceptionShouldEndTransactionInAutocommit() throws Excepti
11631168

11641169
@Test
11651170
void executeQueryWithExceptionShouldEndTransactionInAutocommit() throws Exception {
1171+
assumeThat("Test doesn't work on NATIVE, there the exception is raised on fetch",
1172+
GDS_TYPE, not(isOtherNativeType()));
11661173
//@formatter:off
11671174
executeDDL(con,
11681175
"recreate procedure RAISE_EXCEPTION_RS (PARAM1 varchar(50) not null) returns (COLUMN1 varchar(50)) as\n" +

0 commit comments

Comments
 (0)