IGNITE-11309

modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverBestEffordAffinityTestSuite.java

@@ -17,8 +17,8 @@
 
 package org.apache.ignite.jdbc.suite;
 
-import org.apache.ignite.internal.jdbc.thin.JdbcThinConnection;
 import org.apache.ignite.jdbc.thin.JdbcThinAbstractSelfTest;
+import org.apache.ignite.jdbc.thin.JdbcThinBestEffortAffinitySelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinBestEffortAffinityTransactionsSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinConnectionSelfTest;
 import org.apache.ignite.jdbc.thin.JdbcThinStatementSelfTest;
@@ -36,6 +36,7 @@
     JdbcThinConnectionSelfTest.class,
     JdbcThinTcpIoTest.class,
     JdbcThinStatementSelfTest.class,
+    JdbcThinBestEffortAffinitySelfTest.class,
     JdbcThinBestEffortAffinityTransactionsSelfTest.class,
 })
 public class IgniteJdbcThinDriverBestEffordAffinityTestSuite {
@@ -45,7 +46,6 @@ public class IgniteJdbcThinDriverBestEffordAffinityTestSuite {
      */
     @BeforeClass
     public static void setupBestEffortAffinity() {
-        GridTestUtils.setFieldValue(JdbcThinConnection.class, "bestEffortAffinity", true);
-        GridTestUtils.setFieldValue(JdbcThinAbstractSelfTest.class, "bestEffortAffinity", true);
+        GridTestUtils.setFieldValue(JdbcThinAbstractSelfTest.class, "affinityAwareness", true);
     }
 }

modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java

@@ -43,7 +43,7 @@
 public class JdbcThinAbstractSelfTest extends GridCommonAbstractTest {
 
     /** Signals that tests should start in best effort affinity mode. */
-    public static boolean bestEffortAffinity;
+    public static boolean affinityAwareness;
 
     /**
      * @param r Runnable to check support.