This is an automated email from the ASF dual-hosted git repository.

timoninmaxim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 338e3f55125 IGNITE-26003 Fix flaky JavaThinCompatibilityTest (#12216)
338e3f55125 is described below

commit 338e3f55125364c028ebc704d4e4a59ebdc7b8e0
Author: Aleksandr Chesnokov <chesnokoff...@gmail.com>
AuthorDate: Mon Aug 25 14:41:02 2025 +0300

    IGNITE-26003 Fix flaky JavaThinCompatibilityTest (#12216)
---
 .../compatibility/clients/AbstractClientCompatibilityTest.java |  2 +-
 .../compatibility/clients/JavaThinCompatibilityTest.java       | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git 
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/AbstractClientCompatibilityTest.java
 
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/AbstractClientCompatibilityTest.java
index 1a223526e42..afdcab70bb4 100644
--- 
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/AbstractClientCompatibilityTest.java
+++ 
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/AbstractClientCompatibilityTest.java
@@ -139,7 +139,7 @@ public abstract class AbstractClientCompatibilityTest 
extends IgniteCompatibilit
                 );
 
                 try {
-                    GridTestUtils.waitForCondition(() -> 
!proc.getProcess().isAlive(), 5_000L);
+                    GridTestUtils.waitForCondition(() -> 
!proc.getProcess().isAlive(), GridTestUtils.DFLT_TEST_TIMEOUT);
 
                     assertEquals(0, proc.getProcess().exitValue());
                 }
diff --git 
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
 
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
index 51fb0519586..271a45a8660 100644
--- 
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
+++ 
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
@@ -17,14 +17,13 @@
 
 package org.apache.ignite.compatibility.clients;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import javax.cache.Cache;
-import javax.cache.event.CacheEntryEvent;
 import javax.cache.expiry.CreatedExpiryPolicy;
 import javax.cache.expiry.Duration;
 import org.apache.ignite.Ignite;
@@ -72,7 +71,6 @@ import org.apache.ignite.resources.ServiceContextResource;
 import org.apache.ignite.services.Service;
 import org.apache.ignite.services.ServiceCallContext;
 import org.apache.ignite.services.ServiceContext;
-import org.apache.ignite.testframework.GridTestUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assume;
@@ -402,15 +400,15 @@ public class JavaThinCompatibilityTest extends 
AbstractClientCompatibilityTest {
         try (IgniteClient client = Ignition.startClient(new 
ClientConfiguration().setAddresses(ADDR))) {
             ClientCache<Object, Object> cache = 
client.getOrCreateCache("testContinuousQueries");
 
-            List<CacheEntryEvent<?, ?>> allEvts = new ArrayList<>();
+            CountDownLatch latch = new CountDownLatch(3);
 
-            cache.query(new ContinuousQuery<>().setLocalListener(evts -> 
evts.forEach(allEvts::add)));
+            cache.query(new ContinuousQuery<>().setLocalListener(evnts -> 
evnts.forEach(event -> latch.countDown())));
 
             cache.put(0, 0);
             cache.put(0, 1);
             cache.remove(0);
 
-            assertTrue(GridTestUtils.waitForCondition(() -> allEvts.size() == 
3, 10_000L));
+            assertTrue(latch.await(10_000L, TimeUnit.MILLISECONDS));
         }
     }
 

Reply via email to