Ignite 27370

examples/src/test/java-lgpl/org/apache/ignite/testsuites/IgniteLgplExamplesSelfTestSuite.java

@@ -20,25 +20,25 @@
 import org.apache.ignite.examples.ComputeScheduleExampleMultiNodeSelfTest;
 import org.apache.ignite.examples.ComputeScheduleExampleSelfTest;
 import org.apache.ignite.testframework.GridTestUtils;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
 
 /**
  * Examples test suite. <p> Contains only Spring ignite examples tests.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     ComputeScheduleExampleSelfTest.class,
 
     // Multi-node.
     ComputeScheduleExampleMultiNodeSelfTest.class
 })
 public class IgniteLgplExamplesSelfTestSuite {
     /** */
-    @BeforeClass
+    @BeforeAll
     public static void init() {
         System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
             GridTestUtils.getNextMulticastGroup(IgniteLgplExamplesSelfTestSuite.class));

examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java

@@ -55,8 +55,8 @@
  * <p>
  * Contains all Ignite examples tests.</p>
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     CacheExamplesSelfTest.class,
     SqlExamplesSelfTest.class,
     BasicExamplesSelfTest.class,

modules/calcite/src/test/java/org/apache/ignite/internal/processors/cache/QueryEntityValueColumnAliasTest.java

@@ -27,7 +27,7 @@
 import org.apache.ignite.configuration.SqlConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** */
 public class QueryEntityValueColumnAliasTest extends GridCommonAbstractTest {

modules/calcite/src/test/java/org/apache/ignite/internal/processors/cache/SessionContextSqlFunctionTest.java

@@ -17,10 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache;
 
-import java.util.ArrayList;
 import java.util.List;
 import org.apache.ignite.Ignite;
-import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
 import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
 import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
@@ -33,40 +31,17 @@
 import org.apache.ignite.session.SessionContext;
 import org.apache.ignite.session.SessionContextProvider;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 /** */
-@RunWith(Parameterized.class)
 public class SessionContextSqlFunctionTest extends GridCommonAbstractTest {
     /** */
     private static final String SESSION_ID = "sessionId";
 
     /** */
     private Ignite ign;
 
-    /** */
-    @Parameterized.Parameter
-    public CacheAtomicityMode mode;
-
-    /** */
-    @Parameterized.Parameter(1)
-    public boolean isClnNode;
-
-    /** */
-    @Parameterized.Parameters(name = "mode={0}, isClnNode={1}")
-    public static List<Object[]> parameters() {
-        List<Object[]> params = new ArrayList<>();
-
-        for (CacheAtomicityMode m: CacheAtomicityMode.values()) {
-            params.add(new Object[] {m, false});
-            params.add(new Object[] {m, true});
-        }
-
-        return params;
-    }
-
     /** */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -85,11 +60,6 @@ public static List<Object[]> parameters() {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         ign = startGrids(3);
-
-        if (isClnNode)
-            ign = startClientGrid(3);
-
-        query(ign, "create table PUBLIC.MYTABLE(id int primary key, sessionId varchar);");
     }
 
     /** {@inheritDoc} */
@@ -98,8 +68,14 @@ public static List<Object[]> parameters() {
     }
 
     /** */
-    @Test
-    public void testWhereClause() {
+    @ParameterizedTest(name = "client={0}")
+    @ValueSource(booleans = {true, false})
+    public void testWhereClause(boolean isClnNode) throws Exception {
+        if (isClnNode)
+            ign = startClientGrid(3);
+
+        query(ign, "create table PUBLIC.MYTABLE(id int primary key, sessionId varchar);");
+
         for (int i = 0; i < 100; i++) {
             String sesId = i % 2 == 0 ? "1" : "2";
 
@@ -122,8 +98,14 @@ public void testWhereClause() {
     }
 
     /** */
-    @Test
-    public void testInsertClause() {
+    @ParameterizedTest(name = "client={0}")
+    @ValueSource(booleans = {true, false})
+    public void testInsertClause(boolean isClnNode) throws Exception {
+        if (isClnNode)
+            ign = startClientGrid(3);
+
+        query(ign, "create table PUBLIC.MYTABLE(id int primary key, sessionId varchar);");
+
         for (int i = 0; i < 100; i++) {
             String sesId = i % 2 == 0 ? "1" : "2";
 
@@ -142,8 +124,14 @@ public void testInsertClause() {
     }
 
     /** */
-    @Test
-    public void testNestedQuery() {
+    @ParameterizedTest(name = "client={0}")
+    @ValueSource(booleans = {true, false})
+    public void testNestedQuery(boolean isClnNode) throws Exception {
+        if (isClnNode)
+            ign = startClientGrid(3);
+
+        query(ign, "create table PUBLIC.MYTABLE(id int primary key, sessionId varchar);");
+
         for (int i = 0; i < 100; i++) {
             String sesId = i % 2 == 0 ? "1" : "2";
 
@@ -170,8 +158,14 @@ public void testNestedQuery() {
     }
 
     /** */
-    @Test
-    public void testOverwriteApplicationAttributes() {
+    @ParameterizedTest(name = "client={0}")
+    @ValueSource(booleans = {true, false})
+    public void testOverwriteApplicationAttributes(boolean isClnNode) throws Exception {
+        if (isClnNode)
+            ign = startClientGrid(3);
+
+        query(ign, "create table PUBLIC.MYTABLE(id int primary key, sessionId varchar);");
+
         Ignite ignApp = ign;
 
         for (int i = 0; i < 100; i++) {
@@ -192,8 +186,14 @@ public void testOverwriteApplicationAttributes() {
     }
 
     /** */
-    @Test
-    public void testMultithreadApplication() throws Exception {
+    @ParameterizedTest(name = "client={0}")
+    @ValueSource(booleans = {true, false})
+    public void testMultithreadApplication(boolean isClnNode) throws Exception {
+        if (isClnNode)
+            ign = startClientGrid(3);
+
+        query(ign, "create table PUBLIC.MYTABLE(id int primary key, sessionId varchar);");
+
         String sesId = "1";
 
         Ignite ignApp = ign.withApplicationAttributes(F.asMap(SESSION_ID, sesId));

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java

@@ -60,7 +60,7 @@
 import org.apache.ignite.testframework.junits.WithSystemProperty;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.hamcrest.CoreMatchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.ignite.internal.processors.query.calcite.QueryChecker.awaitReservationsRelease;
 import static org.apache.ignite.internal.processors.query.calcite.QueryChecker.containsIndexScan;
@@ -69,7 +69,7 @@
 import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  *

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CancelTest.java

@@ -36,12 +36,13 @@
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Collections.singletonList;
 import static org.apache.ignite.cache.query.QueryCancelledException.ERR_MSG;
 import static org.apache.ignite.internal.processors.query.calcite.QueryChecker.awaitReservationsRelease;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Cancel query test.
@@ -148,7 +149,7 @@ public void testNotOriginatorNodeStop() throws Exception {
             fail("Unexpected exception: " + ex);
         }
 
-        Assert.assertTrue(GridTestUtils.waitForCondition(
+        assertTrue(GridTestUtils.waitForCondition(
             () -> engine.runningQueries().isEmpty(), 10_000));
 
         awaitReservationsRelease(grid(0), "TEST");
@@ -175,7 +176,7 @@ public void testOriginatorNodeStop() throws Exception {
         CalciteQueryProcessor engine1 = (CalciteQueryProcessor)Commons.lookupComponent(
             grid(1).context(), QueryEngine.class);
 
-        Assert.assertTrue(GridTestUtils.waitForCondition(
+        assertTrue(GridTestUtils.waitForCondition(
             () -> engine1.runningQueries().isEmpty(), 10_000));
 
         awaitReservationsRelease(grid(1), "TEST");

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/QueryChecker.java

@@ -48,15 +48,7 @@
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.CustomTypeSafeMatcher;
 import org.hamcrest.Matcher;
-import org.hamcrest.core.SubstringMatcher;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
 
 /**
  *  Query checker.

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/QueryCheckerTest.java

@@ -17,13 +17,13 @@
 
 package org.apache.ignite.internal.processors.query.calcite;
 
+import org.junit.jupiter.api.Test;
 import org.hamcrest.Matcher;
-import org.junit.Test;
 
 import static org.apache.ignite.internal.processors.query.calcite.QueryChecker.containsResultRowCount;
 import static org.apache.ignite.internal.processors.query.calcite.QueryChecker.matchesOnce;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /** Query checker tests. */
 public class QueryCheckerTest {

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/SqlFieldsQueryUsageTest.java

@@ -29,7 +29,7 @@
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Collections.singletonList;
 

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/ClosableIteratorsHolderTest.java

@@ -26,9 +26,9 @@
 
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -44,16 +44,16 @@ public class ClosableIteratorsHolderTest extends GridCommonAbstractTest {
     private ClosableIteratorsHolder holder;
 
     /** */
-    @Before
+    @BeforeEach
     public void setup() throws Exception {
         iterators = Collections.newSetFromMap(new ConcurrentHashMap<>());
         holder = new ClosableIteratorsHolder(log());
         holder.init();
     }
 
     /** */
-    @After
-    public void tearDown() throws Exception {
+    @AfterEach
+    public void tearDown() {
         holder.tearDown();
 
         holder = null;
@@ -101,7 +101,7 @@ private ClosableIterator() {
         }
 
         /** {@inheritDoc} */
-        @Override public void close() throws Exception {
+        @Override public void close() {
             Optional.ofNullable(iterators)
                 .ifPresent(set -> set.remove(this));
         }

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/KeyFilteringCursorTest.java

@@ -39,9 +39,9 @@
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.lang.GridCursor;
 import org.apache.ignite.internal.util.typedef.internal.CU;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /** */
 public class KeyFilteringCursorTest {

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/LogicalRelImplementorTest.java

@@ -59,7 +59,7 @@
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.calcite.tools.Frameworks.createRootSchema;
 

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/NumericTypesPrecisionsTest.java

@@ -24,9 +24,9 @@
 import org.apache.ignite.internal.processors.query.calcite.type.IgniteTypeFactory;
 import org.apache.ignite.internal.processors.query.calcite.type.IgniteTypeSystem;
 import org.apache.ignite.internal.processors.query.calcite.util.Commons;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /** Test for numeric types precisions. */
 public class NumericTypesPrecisionsTest {
@@ -196,7 +196,7 @@ private static void doTestExpectedLeastRestrictive(RelDataType testType, RelData
         for (int i = 0; i < TEST_SUITE.length; ++i) {
             RelDataType actualType = TYPE_FACTORY.leastRestrictive(Arrays.asList(testType, TEST_SUITE[i]));
 
-            assertEquals("leastRestrictive(" + testType + ", " + TEST_SUITE[i] + ")", expectedLeast[i], actualType);
+            assertEquals(expectedLeast[i], actualType, "leastRestrictive(" + testType + ", " + TEST_SUITE[i] + ")");
         }
     }
 }

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/RuntimeSortedIndexTest.java

@@ -37,7 +37,7 @@
 import org.apache.ignite.internal.processors.query.calcite.util.TypeUtils;
 import org.apache.ignite.internal.util.lang.GridCursor;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *