IGNITE-28000 Update error handling checks in tests

Author: tmgodinho

modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItDataConsistencyTest.java

@@ -33,6 +33,7 @@
 import java.util.concurrent.atomic.LongAdder;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.internal.ClusterPerClassIntegrationTest;
+import org.apache.ignite.internal.client.ClientRetriableTransactionException;
 import org.apache.ignite.lang.IgniteException;
 import org.apache.ignite.table.Table;
 import org.apache.ignite.table.Tuple;
@@ -217,6 +218,12 @@ private Runnable createWriter(int workerId) {
                 } catch (TransactionException e) {
                     // Don't need to rollback manually if got IgniteException.
                     fails.increment();
+                } catch (ClientRetriableTransactionException e) {
+                    if (e.getCause() instanceof TransactionException) {
+                        fails.increment();
+                    } else {
+                        throw e;
+                    }
                 }
             }
         };
@@ -261,6 +268,12 @@ private Runnable createReader(int workerId) {
                     readOps.increment();
                 } catch (TransactionException e) {
                     readFails.increment();
+                } catch (ClientRetriableTransactionException e) {
+                    if (e.getCause() instanceof TransactionException) {
+                        readFails.increment();
+                    } else {
+                        throw e;
+                    }
                 }
             }
         };

modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java

@@ -17,12 +17,14 @@
 
 package org.apache.ignite.internal.ssl;
 
+import static java.util.Collections.emptyList;
 import static org.apache.ignite.internal.testframework.IgniteTestUtils.escapeWindowsPath;
 import static org.apache.ignite.internal.testframework.IgniteTestUtils.getResourcePath;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willTimeoutIn;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
 import static org.apache.ignite.jdbc.util.JdbcTestUtils.assertThrowsSqlException;
+import static org.apache.ignite.lang.ErrorGroups.Client.CLIENT_SSL_CONFIGURATION_ERR;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
@@ -46,6 +48,7 @@
 import org.apache.ignite.internal.Cluster.ServerRegistration;
 import org.apache.ignite.internal.ClusterConfiguration;
 import org.apache.ignite.internal.ClusterPerClassIntegrationTest;
+import org.apache.ignite.internal.IgniteExceptionTestUtils;
 import org.apache.ignite.internal.testframework.TestIgnitionManager;
 import org.apache.ignite.internal.testframework.WorkDirectory;
 import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
@@ -239,11 +242,13 @@ void clientCanNotConnectWithSslAndInvalidTrustStorePassword() {
                 }
             });
 
-            assertThat(ex.getMessage(), is("Client SSL configuration error: keystore password was incorrect"));
-            // Exceptions thrown from the synchronous build method are copied to include the sync method
-            assertThat(ex.getCause(), isA(IgniteClientConnectionException.class));
-            assertThat(ex.getCause().getCause(), isA(IOException.class));
-            assertThat(ex.getCause().getCause().getMessage(), is("keystore password was incorrect"));
+            IgniteExceptionTestUtils.publicException(
+                    IgniteClientConnectionException.class,
+                    CLIENT_SSL_CONFIGURATION_ERR,
+                    "Client SSL configuration error: keystore password was incorrect",
+                    emptyList()
+            ).withCause(isA(IOException.class));
+            assertThat(ex.getCause().getMessage(), is("keystore password was incorrect"));
         }
 
         @Test

modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java

@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.sql.engine;
 
+import static java.util.Collections.emptyList;
+import static org.apache.ignite.internal.IgniteExceptionTestUtils.publicException;
 import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
 import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.assertThrowsSqlException;
+import static org.apache.ignite.lang.ErrorGroups.Marshalling.COMMON_ERR;
 import static org.apache.ignite.lang.ErrorGroups.Sql.CONSTRAINT_VIOLATION_ERR;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.any;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -157,7 +158,13 @@ public void testKeyValueView(TestEnvironment env) {
                 rwTx -> {
                     IgniteException ex = assertThrows(IgniteException.class,
                             () -> tab.keyValueView(KeyObject.class, Integer.class).put(rwTx, key, 1));
-                    assertThat(ex.getCause().getCause(), is(instanceOf(MarshallerException.class)));
+
+                    publicException(
+                            MarshallerException.class,
+                            COMMON_ERR,
+                            "",
+                            emptyList()
+                    ).withMessage(any(String.class));
 
                     kvView.put(rwTx, key, null);