IGNITE-26807 Fix CacheConflictOperationsWithCustomResolverTest

shishkovilja · shishkovilja · commit 198660252e56 · 2025-10-23T11:39:14.000+03:00
diff --git a/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/CacheConflictOperationsWithCustomResolverTest.java b/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/CacheConflictOperationsWithCustomResolverTest.java
@@ -58,6 +58,13 @@ public class CacheConflictOperationsWithCustomResolverTest extends CacheConflict
         GridTestUtils.assertThrows(log, super::testResolveDebug, AssertionError.class, "");
     }
 
+    /** {@inheritDoc} */
+    @Test
+    @Override public void testConflictWithExpiryPolicy() throws Exception {
+        // LWW strategy resolves conflicts in unexpected way at versioned resolve test.
+        GridTestUtils.assertThrows(log, super::testConflictWithExpiryPolicy, AssertionError.class, null);
+    }
+
     /**
      *
      */

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,13 @@ public class CacheConflictOperationsWithCustomResolverTest extends CacheConflict`
`58`	`58`	`GridTestUtils.assertThrows(log, super::testResolveDebug, AssertionError.class, "");`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ /** {@inheritDoc} */`
	`62`	`+ @Test`
	`63`	`+ @Override public void testConflictWithExpiryPolicy() throws Exception {`
	`64`	`+ // LWW strategy resolves conflicts in unexpected way at versioned resolve test.`
	`65`	`+ GridTestUtils.assertThrows(log, super::testConflictWithExpiryPolicy, AssertionError.class, null);`
	`66`	`+ }`
	`67`	`+`
`61`	`68`	`/**`
`62`	`69`	`*`
`63`	`70`	`*/`