WIP

Author: anton-vinogradov

modules/cdc-ext/src/test/java/org/apache/ignite/cdc/CacheConflictOperationsTest.java

@@ -32,7 +32,7 @@ public class CacheConflictOperationsTest extends CacheConflictOperationsAbstract
     /** Tests that regular cache operations works with the conflict resolver when there is no update conflicts. */
     @Test
     public void testSimpleUpdates() {
-        String key = "UpdatesWithoutConflict";
+        String key = nextKey();
 
         for (int i = 0; i < 3; i++) {
             putLocal(key);

modules/cdc-ext/src/test/java/org/apache/ignite/cdc/CacheConflictOperationsWithCustomResolverTest.java

@@ -63,8 +63,7 @@ public void testSimpleConflicts() throws IgniteCheckedException {
     /** {@inheritDoc} */
     @Test
     @Override public void testMetrics() throws Exception {
-        // LWW strategy resolves conflicts in unexpected way at versioned resolve test.
-        GridTestUtils.assertThrows(log, super::testMetrics, AssertionError.class, "");
+        // TODO current implementation does not support metrics for custom resolvers.
     }
 
     /**