From 6d21ae803dff3d974eb4696c80c2cf8c66e25896 Mon Sep 17 00:00:00 2001 From: zstan Date: Thu, 1 Oct 2026 12:24:57 +0300 Subject: [PATCH 1/5] IGNITE-29096 Calcite. Minor improvements after IGNITE-29064 --- .../query/calcite/sql/ParserCodegenResourcesTest.java | 6 +++--- .../processors/query/calcite/type/OtherTypeTest.java | 6 +++--- .../processors/query/calcite/util/TypeUtilsTest.java | 4 ++-- .../calcite/src/test/resources/junit-platform.properties | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/ParserCodegenResourcesTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/ParserCodegenResourcesTest.java index 80f22d66064a9..37e2369d6386b 100644 --- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/ParserCodegenResourcesTest.java +++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/ParserCodegenResourcesTest.java @@ -20,7 +20,7 @@ import org.apache.ignite.internal.processors.query.calcite.sql.generated.IgniteSqlParserImpl; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** Verifies that parser code generation inputs are published as module resources. */ public class ParserCodegenResourcesTest { @@ -33,7 +33,7 @@ public void testParserCodegenResourcesAvailable() { /** Verifies that the given resource is available from the module class path. */ private static void assertResourceAvailable(String path) { - assertNotNull("Missing parser code generation resource: " + path, - IgniteSqlParserImpl.class.getResource(path)); + assertNotNull(IgniteSqlParserImpl.class.getResource(path), + "Missing parser code generation resource: " + path); } } diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/type/OtherTypeTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/type/OtherTypeTest.java index 2455e160f44d8..91107a2c34066 100644 --- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/type/OtherTypeTest.java +++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/type/OtherTypeTest.java @@ -23,9 +23,9 @@ import org.apache.calcite.sql.type.SqlTypeName; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertSame; /** */ public class OtherTypeTest { diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/util/TypeUtilsTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/util/TypeUtilsTest.java index 79507823be021..2b677ab2869af 100644 --- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/util/TypeUtilsTest.java +++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/util/TypeUtilsTest.java @@ -36,8 +36,8 @@ import org.apache.calcite.util.TimestampString; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; /** */ public class TypeUtilsTest { diff --git a/modules/calcite/src/test/resources/junit-platform.properties b/modules/calcite/src/test/resources/junit-platform.properties index 84e51f4627393..1cef21872fa1a 100644 --- a/modules/calcite/src/test/resources/junit-platform.properties +++ b/modules/calcite/src/test/resources/junit-platform.properties @@ -5,7 +5,7 @@ junit.jupiter.execution.timeout.default = 5m junit.jupiter.execution.timeout.test.method.default = 5m # Specific default timeout for lifecycle methods (e.g., @BeforeEach, @AfterAll). -junit.jupiter.execution.timeout.lifecycle.method.default = 60s +junit.jupiter.execution.timeout.lifecycle.method.default = 120s # Dump threads if test runs more than expected. junit.jupiter.execution.timeout.threaddump.enabled = true From ce080969dba8435d57ee996eb8e3e136fbe7de9d Mon Sep 17 00:00:00 2001 From: zstan Date: Thu, 1 Oct 2026 16:03:02 +0300 Subject: [PATCH 2/5] tc log --- .../java/org/apache/ignite/testsuites/ScriptTestSuite.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java b/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java index 490eec90ed729..fe583311db10d 100644 --- a/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java +++ b/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java @@ -222,6 +222,8 @@ private void runSingleTest(Path test, String dirName, String fileName) { log.info(">>> Start: " + dirName + "/" + fileName); + System.out.println( "##teamcity[testStarted name='" + test + "']" ); + try { Ignite ign = F.first(Ignition.allGrids()); @@ -244,6 +246,8 @@ private void runSingleTest(Path test, String dirName, String fileName) { } finally { log.info(">>> Finish: " + dirName + "/" + fileName); + + System.out.println( "##teamcity[testFinished name='" + test + "']" ); } } From fa670070749d4a642faf84d8737ce35750815bda Mon Sep 17 00:00:00 2001 From: zstan Date: Thu, 1 Oct 2026 16:29:30 +0300 Subject: [PATCH 3/5] add exception check --- .../java/org/apache/ignite/testsuites/ScriptTestSuite.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java b/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java index fe583311db10d..4591111f50d19 100644 --- a/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java +++ b/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java @@ -244,6 +244,10 @@ private void runSingleTest(Path test, String dirName, String fileName) { throw new RuntimeException(e); } } + catch (Throwable th) { + System.out.println( + "##teamcity[testFailed name='" + test + "' message='" + th.getMessage() + "']" ); + } finally { log.info(">>> Finish: " + dirName + "/" + fileName); From ca8039b7dc0fd68f7ce38b048e546323c22bbb14 Mon Sep 17 00:00:00 2001 From: zstan Date: Thu, 1 Oct 2026 16:55:09 +0300 Subject: [PATCH 4/5] revert stdout --- .../org/apache/ignite/testsuites/ScriptTestSuite.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java b/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java index 4591111f50d19..490eec90ed729 100644 --- a/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java +++ b/modules/calcite/src/test/java/org/apache/ignite/testsuites/ScriptTestSuite.java @@ -222,8 +222,6 @@ private void runSingleTest(Path test, String dirName, String fileName) { log.info(">>> Start: " + dirName + "/" + fileName); - System.out.println( "##teamcity[testStarted name='" + test + "']" ); - try { Ignite ign = F.first(Ignition.allGrids()); @@ -244,14 +242,8 @@ private void runSingleTest(Path test, String dirName, String fileName) { throw new RuntimeException(e); } } - catch (Throwable th) { - System.out.println( - "##teamcity[testFailed name='" + test + "' message='" + th.getMessage() + "']" ); - } finally { log.info(">>> Finish: " + dirName + "/" + fileName); - - System.out.println( "##teamcity[testFinished name='" + test + "']" ); } } From 27054635b31ae869bbf02ac816bfc5a39304f0fb Mon Sep 17 00:00:00 2001 From: zstan Date: Thu, 1 Oct 2026 17:45:49 +0300 Subject: [PATCH 5/5] revert timeout --- modules/calcite/src/test/resources/junit-platform.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/calcite/src/test/resources/junit-platform.properties b/modules/calcite/src/test/resources/junit-platform.properties index 1cef21872fa1a..84e51f4627393 100644 --- a/modules/calcite/src/test/resources/junit-platform.properties +++ b/modules/calcite/src/test/resources/junit-platform.properties @@ -5,7 +5,7 @@ junit.jupiter.execution.timeout.default = 5m junit.jupiter.execution.timeout.test.method.default = 5m # Specific default timeout for lifecycle methods (e.g., @BeforeEach, @AfterAll). -junit.jupiter.execution.timeout.lifecycle.method.default = 120s +junit.jupiter.execution.timeout.lifecycle.method.default = 60s # Dump threads if test runs more than expected. junit.jupiter.execution.timeout.threaddump.enabled = true