You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pp...@apache.org on 2025/06/06 13:59:06 UTC
(ignite-3) 02/03: IGNITE-25297 Fixtest.
This is an automated email from the ASF dual-hosted git repository.
ppa pushed a commit to branch ignite-25297
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 5830d748ed583999ba76b7ba6a7576c8fbe37c1b
Author: Pavel Pereslegin <xx...@gmail.com>
AuthorDate: Tue Jun 3 15:21:32 2025 +0300
IGNITE-25297 Fixtest.
---
.../apache/ignite/jdbc/ItJdbcMultiStatementSelfTest.java | 13 ++++++-------
.../internal/sql/engine/ItSqlMultiStatementTxTest.java | 9 +++------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMultiStatementSelfTest.java b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMultiStatementSelfTest.java
index dafcd8af770..e3f36ca6af2 100644
--- a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMultiStatementSelfTest.java
+++ b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMultiStatementSelfTest.java
@@ -309,14 +309,13 @@ public class ItJdbcMultiStatementSelfTest extends AbstractJdbcSelfTest {
@Test
public void testBrokenTransaction() throws Exception {
- boolean res = stmt.execute("START TRANSACTION;");
- assertFalse(res);
- assertNull(stmt.getResultSet());
- assertEquals(0, stmt.getUpdateCount());
- assertFalse(stmt.getMoreResults());
- assertEquals(-1, stmt.getUpdateCount());
+ //noinspection ThrowableNotThrown
+ assertThrowsSqlException(
+ "Transaction managed by the script was not completed by the script.",
+ () -> stmt.execute("START TRANSACTION;")
+ );
- res = stmt.execute("COMMIT;");
+ boolean res = stmt.execute("COMMIT;");
assertFalse(res);
assertNull(stmt.getResultSet());
assertEquals(0, stmt.getUpdateCount());
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlMultiStatementTxTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlMultiStatementTxTest.java
index 35b02b05c29..c3974fc6e9c 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlMultiStatementTxTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSqlMultiStatementTxTest.java
@@ -158,14 +158,11 @@ public class ItSqlMultiStatementTxTest extends BaseSqlMultiStatementTest {
@ParameterizedTest
@ValueSource(strings = {"READ ONLY", "READ WRITE"})
void openedScriptTransactionRollsBackImplicitly(String txOptions) {
+ String expectedError = "Transaction managed by the script was not completed by the script.";
String startTxStatement = format("START TRANSACTION {};", txOptions);
{
- assertThrowsSqlException(
- RUNTIME_ERR,
- "Transaction managed by the script was not completed by the script",
- () -> runScript(startTxStatement)
- );
+ assertThrowsSqlException(RUNTIME_ERR, expectedError, () -> runScript(startTxStatement));
verifyFinishedTxCount(1);
}
@@ -173,7 +170,7 @@ public class ItSqlMultiStatementTxTest extends BaseSqlMultiStatementTest {
{
assertThrowsSqlException(
RUNTIME_ERR,
- "Transaction managed by the script was not completed by the script",
+ expectedError,
() -> fetchAllCursors(
runScript(startTxStatement
+ "SELECT * FROM TEST;"