This is an automated email from the ASF dual-hosted git repository.
apolovtsev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 230fe64b39 IGNITE-20328 Cleanup in BaseIgniteAbstractTest (#2531)
230fe64b39 is described below
commit 230fe64b39df6a6c90c0557e6d1f01d3a4738e89
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Mon Sep 4 16:30:45 2023 +0300
IGNITE-20328 Cleanup in BaseIgniteAbstractTest (#2531)
---
...liCommandTestNotInitializedIntegrationBase.java | 10 +---
.../cli/commands/ItConnectToClusterTestBase.java | 6 +-
.../cli/commands/ItConnectionHeartbeatTest.java | 2 +-
.../internal/cli/commands/ItNodeNameTest.java | 2 +-
.../cli/commands/sql/CliSqlCommandTestBase.java | 9 +--
.../commands/sql/CliSqlConnectCommandTestBase.java | 5 +-
.../repl/executor/ItIgnitePicocliCommandsTest.java | 9 +--
.../ignite/internal/cli/ssl/ItJdbcSslTest.java | 9 +--
.../apache/ignite/lang/IgniteSystemProperties.java | 3 +-
.../tostring/IgniteToStringBuilderSelfTest.java | 2 +-
.../testframework/BaseIgniteAbstractTest.java | 69 +++++++++-------------
.../internal/testframework/IgniteAbstractTest.java | 27 +--------
.../testframework/IntegrationTestBase.java | 21 -------
.../apache/ignite/jdbc/AbstractJdbcSelfTest.java | 8 +--
.../apache/ignite/jdbc/ItJdbcBatchSelfTest.java | 11 +---
.../ignite/jdbc/ItJdbcInsertStatementSelfTest.java | 5 +-
.../jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java | 5 +-
.../ignite/jdbc/ItJdbcSelectAfterAlterTable.java | 9 +--
.../tree/AbstractBplusTreePageMemoryTest.java | 9 +--
.../tree/AbstractBplusTreeReusePageMemoryTest.java | 10 ++--
.../internal/placementdriver/ActiveActorTest.java | 5 +-
.../placementdriver/BasePlacementDriverTest.java | 2 +-
.../MultiActorPlacementDriverTest.java | 3 +-
.../apache/ignite/raft/jraft/core/ItNodeTest.java | 2 +
.../raft/server/ItJraftCounterServerTest.java | 2 +-
.../ignite/internal/BaseIgniteRestartTest.java | 15 ++++-
.../internal/ClusterPerTestIntegrationTest.java | 12 +---
.../raftsnapshot/ItTableRaftSnapshotsTest.java | 10 ----
.../ItRaftCommandLeftInLogUntilRestartTest.java | 4 +-
.../app/client/ItAbstractThinClientTest.java | 6 +-
.../internal/sql/api/ItSqlAsynchronousApiTest.java | 12 +---
.../internal/sql/api/ItSqlSynchronousApiTest.java | 12 +---
.../sql/engine/ClusterPerClassIntegrationTest.java | 24 --------
.../internal/sql/engine/ItCorrelatesTest.java | 12 +---
.../internal/sql/engine/ItCreateTableDdlTest.java | 12 +---
.../ignite/internal/sql/engine/ItDmlTest.java | 12 +---
.../sql/engine/ItPkOnlyTableCrossApiTest.java | 6 +-
.../internal/table/ItPublicApiColocationTest.java | 12 +---
.../internal/sql/engine/planner/PlannerTest.java | 2 +-
39 files changed, 91 insertions(+), 305 deletions(-)
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
index ccd0fa3930..b0468651d8 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/CliCommandTestNotInitializedIntegrationBase.java
@@ -80,16 +80,8 @@ public class CliCommandTestNotInitializedIntegrationBase
extends CliIntegrationT
@Inject
private EventListeningActivationPoint eventListeningActivationPoint;
- /**
- * Invokes before the test will start.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
- @Override
@BeforeEach
- public void setUp(TestInfo testInfo) throws Exception {
- super.setUp(testInfo);
+ public void setUp() {
configManagerProvider.setConfigFile(TestConfigManagerHelper.createIntegrationTestsConfig());
cmd = new CommandLine(getCommandClass(), new MicronautFactory(context))
.registerConverter(NodeNameOrUrl.class, new
NodeNameOrUrlConverter(nodeNameRegistry));
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectToClusterTestBase.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectToClusterTestBase.java
index aba4ce945a..34e36efa80 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectToClusterTestBase.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectToClusterTestBase.java
@@ -32,7 +32,6 @@ import org.jline.terminal.Terminal;
import org.jline.terminal.impl.DumbTerminal;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.TestInfo;
import picocli.CommandLine.Help.Ansi;
/**
@@ -56,11 +55,8 @@ public class ItConnectToClusterTestBase extends
CliCommandTestInitializedIntegra
return TopLevelCliReplCommand.class;
}
- @Override
@BeforeEach
- public void setUp(TestInfo testInfo) throws Exception {
- super.setUp(testInfo);
-
+ public void setUpTerminal() throws Exception {
input = Files.createTempFile(WORK_DIR, "input", "");
terminal = new DumbTerminal(Files.newInputStream(input), new
FileOutputStream(FileDescriptor.out));
QuestionAskerFactory.setWriterReaderFactory(new
JlineQuestionWriterReaderFactory(terminal));
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectionHeartbeatTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectionHeartbeatTest.java
index 487835029c..baac09244a 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectionHeartbeatTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectionHeartbeatTest.java
@@ -51,7 +51,7 @@ class ItConnectionHeartbeatTest extends
CliCommandTestInitializedIntegrationBase
private final AtomicInteger connectionRestoredCount = new AtomicInteger(0);
@BeforeEach
- void setUp() {
+ void resetConnectionCounts() {
connectionLostCount.set(0);
connectionRestoredCount.set(0);
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
index ec386d9376..30c205c500 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
@@ -38,7 +38,7 @@ public class ItNodeNameTest extends
CliCommandTestInitializedIntegrationBase {
}
@BeforeEach
- void setUp() throws InterruptedException {
+ void connect() {
execute("connect");
resetOutput();
// wait to pulling node names
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlCommandTestBase.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlCommandTestBase.java
index 7101b8dd7e..dffecac7c5 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlCommandTestBase.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlCommandTestBase.java
@@ -20,21 +20,16 @@ package org.apache.ignite.internal.cli.commands.sql;
import
org.apache.ignite.internal.cli.commands.CliCommandTestInitializedIntegrationBase;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.TestInfo;
/** Base class for testing CLI sql command which creates a table before each
test. */
public class CliSqlCommandTestBase extends
CliCommandTestInitializedIntegrationBase {
@BeforeEach
- @Override
- public void setUp(TestInfo testInfo) throws Exception {
- super.setUp(testInfo);
+ public void createTable() {
createAndPopulateTable();
}
- @Override
@AfterEach
- public void tearDown() {
- super.tearDown();
+ public void dropTables() {
dropAllTables();
}
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlConnectCommandTestBase.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlConnectCommandTestBase.java
index 706fbe3d4c..2c1a2b3e85 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlConnectCommandTestBase.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/sql/CliSqlConnectCommandTestBase.java
@@ -21,7 +21,6 @@ import jakarta.inject.Inject;
import org.apache.ignite.internal.cli.commands.TopLevelCliReplCommand;
import org.apache.ignite.internal.cli.core.repl.SessionDefaultValueProvider;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.TestInfo;
/** Base class for testing CLI REPL sql command in the connected state. */
public class CliSqlConnectCommandTestBase extends CliSqlCommandTestBase {
@@ -29,9 +28,7 @@ public class CliSqlConnectCommandTestBase extends
CliSqlCommandTestBase {
private SessionDefaultValueProvider defaultValueProvider;
@BeforeEach
- @Override
- public void setUp(TestInfo testInfo) throws Exception {
- super.setUp(testInfo);
+ public void setDefaultValueProvider() {
commandLine().setDefaultValueProvider(defaultValueProvider);
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
index 8c3141924e..cbbeb5f7cd 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
@@ -64,7 +64,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Named;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -122,13 +121,7 @@ public class ItIgnitePicocliCommandsTest extends
CliCommandTestInitializedIntegr
}
@BeforeEach
- @Override
- public void setUp(TestInfo testInfo) throws Exception {
- super.setUp(testInfo);
- setupSystemCompleter();
- }
-
- private void setupSystemCompleter() {
+ void setupSystemCompleter() {
dynamicCompleterActivationPoint.activateDynamicCompleter(dynamicCompleterRegistry);
List<CompleterFilter> filters = List.of(
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/ssl/ItJdbcSslTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/ssl/ItJdbcSslTest.java
index ca8377b9e8..e13545c43b 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/ssl/ItJdbcSslTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/ssl/ItJdbcSslTest.java
@@ -24,22 +24,17 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/** Tests for SSL connection with JDBC URL. */
public class ItJdbcSslTest extends CliSslClientConnectorIntegrationTestBase {
@BeforeEach
- @Override
- public void setUp(TestInfo testInfo) throws Exception {
- super.setUp(testInfo);
+ public void createTable() {
createAndPopulateTable();
}
- @Override
@AfterEach
- public void tearDown() {
- super.tearDown();
+ public void dropTables() {
dropAllTables();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteSystemProperties.java
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteSystemProperties.java
index c48a4cdc8e..e53ab34a59 100644
---
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteSystemProperties.java
+++
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteSystemProperties.java
@@ -147,9 +147,8 @@ public final class IgniteSystemProperties {
*
* @param name Name of the system property or environment variable.
* @param dflt Default value.
- * @return Value of the system property or environment variable. Returns
{@code null} if neither can be found for given name.
+ * @return Value of the system property or environment variable. Returns
{@code dflt} if neither can be found for given name.
*/
- @Nullable
public static String getString(String name, String dflt) {
String val = getString(name);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/tostring/IgniteToStringBuilderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/tostring/IgniteToStringBuilderSelfTest.java
index 9a4740c3f9..0d42de8a70 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/tostring/IgniteToStringBuilderSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/tostring/IgniteToStringBuilderSelfTest.java
@@ -807,7 +807,7 @@ public class IgniteToStringBuilderSelfTest extends
IgniteAbstractTest {
* Class sleeps a short quanta of time to increase chances of data race
between {@link IgniteToStringBuilder} iterating over collection
* user thread concurrently modifying it.
*/
- private static class SlowToStringObject {
+ private class SlowToStringObject {
/** {@inheritDoc} */
@Override
public String toString() {
diff --git
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/BaseIgniteAbstractTest.java
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/BaseIgniteAbstractTest.java
index b650ee641f..64e21fbab5 100644
---
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/BaseIgniteAbstractTest.java
+++
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/BaseIgniteAbstractTest.java
@@ -20,18 +20,19 @@ package org.apache.ignite.internal.testframework;
import static org.apache.ignite.internal.util.IgniteUtils.monotonicMs;
import static
org.apache.ignite.lang.IgniteSystemProperties.IGNITE_SENSITIVE_DATA_LOGGING;
import static org.apache.ignite.lang.IgniteSystemProperties.getString;
-import static org.mockito.Mockito.framework;
import java.lang.reflect.Method;
-import java.nio.file.Path;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.tostring.S;
import org.apache.ignite.internal.tostring.SensitiveDataLoggingPolicy;
-import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
/**
* Ignite base test class.
@@ -39,59 +40,47 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(SystemPropertiesExtension.class)
public abstract class BaseIgniteAbstractTest {
/** Logger. */
- protected static IgniteLogger log;
+ protected final IgniteLogger log = Loggers.forClass(getClass());
/** Test start time in milliseconds. */
private long testStartMs;
- static {
- /* Init test env. */
- S.setSensitiveDataLoggingPolicySupplier(() ->
-
SensitiveDataLoggingPolicy.valueOf(getString(IGNITE_SENSITIVE_DATA_LOGGING,
"hash").toUpperCase()));
+ @BeforeAll
+ static void setLoggingPolicy() {
+ S.setSensitiveDataLoggingPolicySupplier(() -> {
+ String loggingPolicy = getString(IGNITE_SENSITIVE_DATA_LOGGING,
"hash");
+
+ return
SensitiveDataLoggingPolicy.valueOf(loggingPolicy.toUpperCase());
+ });
}
/**
- * Should be invoked before a test will start.
- *
- * @param testInfo Test information object.
- * @param workDir Work directory.
+ * Prevents accidental leaks from Mockito.
*/
- protected void setupBase(TestInfo testInfo, @Nullable Path workDir) {
- log.info(">>> Starting test: {}#{}, displayName: {}, workDir: {}",
+ @AfterAll
+ static void clearInlineMocks() {
+ Mockito.framework().clearInlineMocks();
+ }
+
+ @BeforeEach
+ void printStartMessage(TestInfo testInfo) {
+ log.info(">>> Starting test: {}#{}, displayName: {}",
testInfo.getTestClass().map(Class::getSimpleName).orElse("<null>"),
testInfo.getTestMethod().map(Method::getName).orElse("<null>"),
- testInfo.getDisplayName(),
- workDir == null ? "<null>" : workDir.toAbsolutePath());
+ testInfo.getDisplayName()
+ );
this.testStartMs = monotonicMs();
}
- /**
- * Should be invoked after the test has finished.
- *
- * @param testInfo Test information object.
- */
- protected void tearDownBase(TestInfo testInfo) {
+ @AfterEach
+ void printStopMessage(TestInfo testInfo) {
log.info(">>> Stopping test: {}#{}, displayName: {}, cost: {}ms.",
testInfo.getTestClass().map(Class::getSimpleName).orElse("<null>"),
testInfo.getTestMethod().map(Method::getName).orElse("<null>"),
- testInfo.getDisplayName(), monotonicMs() - testStartMs);
- }
-
- /**
- * Prevents accidental leaks from Mockito.
- */
- @AfterAll
- static void clearInlineMocks() {
- framework().clearInlineMocks();
- }
-
- /**
- * Constructor.
- */
- @SuppressWarnings("AssignmentToStaticFieldFromInstanceMethod")
- protected BaseIgniteAbstractTest() {
- log = Loggers.forClass(getClass());
+ testInfo.getDisplayName(),
+ monotonicMs() - testStartMs
+ );
}
/**
@@ -99,7 +88,7 @@ public abstract class BaseIgniteAbstractTest {
*
* @return Logger.
*/
- protected static IgniteLogger logger() {
+ protected IgniteLogger logger() {
return log;
}
}
diff --git
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IgniteAbstractTest.java
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IgniteAbstractTest.java
index f0c204d071..d741eedc31 100644
---
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IgniteAbstractTest.java
+++
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IgniteAbstractTest.java
@@ -18,9 +18,7 @@
package org.apache.ignite.internal.testframework;
import java.nio.file.Path;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.ExtendWith;
/**
@@ -29,30 +27,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(WorkDirectoryExtension.class)
public abstract class IgniteAbstractTest extends BaseIgniteAbstractTest {
/** Work directory. */
+ @WorkDirectory
protected Path workDir;
- /**
- * Invokes before the test will start.
- *
- * @param testInfo Test information oject.
- * @param workDir Work directory.
- * @throws Exception If failed.
- */
@BeforeEach
- public void setup(TestInfo testInfo, @WorkDirectory Path workDir) throws
Exception {
- setupBase(testInfo, workDir);
-
- this.workDir = workDir;
- }
-
- /**
- * Invokes after the test has finished.
- *
- * @param testInfo Test information oject.
- * @throws Exception If failed.
- */
- @AfterEach
- public void tearDown(TestInfo testInfo) throws Exception {
- tearDownBase(testInfo);
+ public void printWorkDir() {
+ logger().info("workDir: " + workDir);
}
}
diff --git
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
index 0aa46d654e..dfd47cdf99 100644
---
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
+++
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
@@ -38,7 +38,6 @@ import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.lang.IgniteStringFormatter;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -182,24 +181,4 @@ public class IntegrationTestBase extends
BaseIgniteAbstractTest {
TestIgnitionManager.start(nodeName, NODE_CONFIGS.get(nodeName),
WORK_DIR.resolve(nodeName));
CLUSTER_NODE_NAMES.add(nodeName);
}
-
- /**
- * Invokes before the test will start.
- *
- * @param testInfo Test information object.
- */
- public void setUp(TestInfo testInfo) throws Exception {
- setupBase(testInfo, WORK_DIR);
- }
-
- /**
- * Invokes after the test has finished.
- *
- * @param testInfo Test information object.
- */
- @AfterEach
- public void tearDown(TestInfo testInfo) {
- tearDownBase(testInfo);
- }
}
-
diff --git
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/AbstractJdbcSelfTest.java
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/AbstractJdbcSelfTest.java
index 63190feeba..8be4cbe169 100644
---
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/AbstractJdbcSelfTest.java
+++
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/AbstractJdbcSelfTest.java
@@ -115,9 +115,7 @@ public class AbstractJdbcSelfTest extends
BaseIgniteAbstractTest {
}
@BeforeEach
- protected void beforeTest(TestInfo testInfo) throws Exception {
- setupBase(testInfo, WORK_DIR);
-
+ protected void setUpBase() throws Exception {
conn.setAutoCommit(true);
stmt = conn.createStatement();
@@ -127,14 +125,12 @@ public class AbstractJdbcSelfTest extends
BaseIgniteAbstractTest {
}
@AfterEach
- protected void afterTest(TestInfo testInfo) throws Exception {
+ protected void tearDownBase() throws Exception {
if (stmt != null) {
stmt.close();
assert stmt.isClosed();
}
-
- tearDownBase(testInfo);
}
/**
diff --git
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcBatchSelfTest.java
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcBatchSelfTest.java
index 6eaeadfdd3..9fa6cc9ba6 100644
---
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcBatchSelfTest.java
+++
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcBatchSelfTest.java
@@ -45,7 +45,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Statement test.
@@ -83,10 +82,7 @@ public class ItJdbcBatchSelfTest extends
AbstractJdbcSelfTest {
/** {@inheritDoc} */
@BeforeEach
- @Override
- protected void beforeTest(TestInfo testInfo) throws Exception {
- super.beforeTest(testInfo);
-
+ protected void beforeTest() throws Exception {
pstmt = conn.prepareStatement(SQL_PREPARED);
assertNotNull(pstmt);
@@ -99,15 +95,12 @@ public class ItJdbcBatchSelfTest extends
AbstractJdbcSelfTest {
/** {@inheritDoc} */
@AfterEach
- @Override
- protected void afterTest(TestInfo testInfo) throws Exception {
+ protected void afterTest() throws Exception {
if (pstmt != null && !pstmt.isClosed()) {
pstmt.close();
}
assertTrue(pstmt.isClosed());
-
- super.afterTest(testInfo);
}
@Test
diff --git
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcInsertStatementSelfTest.java
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcInsertStatementSelfTest.java
index 035a52de00..188815af60 100644
---
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcInsertStatementSelfTest.java
+++
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcInsertStatementSelfTest.java
@@ -29,7 +29,6 @@ import org.apache.ignite.jdbc.util.JdbcTestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Statement test.
@@ -83,9 +82,7 @@ public class ItJdbcInsertStatementSelfTest extends
ItJdbcAbstractStatementSelfTe
}
@AfterEach
- @Override public void afterTest(TestInfo testInfo) throws Exception {
- super.afterTest(testInfo);
-
+ public void afterTest() throws Exception {
if (prepStmt != null && !prepStmt.isClosed()) {
prepStmt.close();
diff --git
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java
index 82ae075e0f..ce981b994e 100644
---
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java
+++
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcMetadataPrimaryKeysSelfTest.java
@@ -28,7 +28,6 @@ import java.util.Arrays;
import java.util.List;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Verifies that primary keys in the metadata are valid.
@@ -39,9 +38,7 @@ public class ItJdbcMetadataPrimaryKeysSelfTest extends
AbstractJdbcSelfTest {
/** {@inheritDoc} */
@AfterEach
- @Override protected void afterTest(TestInfo testInfo) throws Exception {
- super.afterTest(testInfo);
-
+ protected void afterTest() throws Exception {
executeUpdate("DROP TABLE IF EXISTS PUBLIC.TEST;");
}
diff --git
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcSelectAfterAlterTable.java
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcSelectAfterAlterTable.java
index e22b9f49d2..355980790b 100644
---
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcSelectAfterAlterTable.java
+++
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcSelectAfterAlterTable.java
@@ -27,7 +27,6 @@ import java.sql.Statement;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Base class for complex SQL tests based on JDBC driver.
@@ -35,18 +34,14 @@ import org.junit.jupiter.api.TestInfo;
public class ItJdbcSelectAfterAlterTable extends AbstractJdbcSelfTest {
/** {@inheritDoc} */
@BeforeEach
- @Override protected void beforeTest(TestInfo testInfo) throws Exception {
- super.beforeTest(testInfo);
-
+ protected void beforeTest() throws Exception {
stmt.executeUpdate("CREATE TABLE PUBLIC.PERSON (ID BIGINT, NAME
VARCHAR, CITY_ID BIGINT, PRIMARY KEY (ID, CITY_ID))");
stmt.executeUpdate("INSERT INTO PUBLIC.PERSON (ID, NAME, CITY_ID)
values (1, 'name_1', 11)");
}
/** {@inheritDoc} */
@AfterEach
- @Override protected void afterTest(TestInfo testInfo) throws Exception {
- super.afterTest(testInfo);
-
+ protected void afterTest() throws Exception {
try (Statement stmt = conn.createStatement()) {
stmt.executeUpdate("DROP TABLE public.person");
}
diff --git
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
index f37573896d..e38f578c2a 100644
---
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
+++
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
@@ -103,7 +103,6 @@ import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* An abstract class for testing {@link BplusTree} using different
implementations of {@link PageMemory}.
@@ -152,9 +151,7 @@ public abstract class AbstractBplusTreePageMemoryTest
extends BaseIgniteAbstract
private boolean debugPrint = false;
@BeforeEach
- protected void beforeEach(TestInfo testInfo) throws Exception {
- setupBase(testInfo, null);
-
+ protected void beforeEach() throws Exception {
stop.set(false);
long seed = System.nanoTime();
@@ -171,7 +168,7 @@ public abstract class AbstractBplusTreePageMemoryTest
extends BaseIgniteAbstract
}
@AfterEach
- protected void afterTest(TestInfo testInfo) throws Exception {
+ protected void afterTest() throws Exception {
rnd = null;
try {
@@ -210,8 +207,6 @@ public abstract class AbstractBplusTreePageMemoryTest
extends BaseIgniteAbstract
RMV_INC = -1;
CNT = 10;
}
-
- tearDownBase(testInfo);
}
/**
diff --git
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
index 42b71a9e80..74d770e308 100644
---
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
+++
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreeReusePageMemoryTest.java
@@ -24,11 +24,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashSet;
import java.util.Set;
+import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.pagememory.PageMemory;
import org.apache.ignite.internal.pagememory.reuse.ReuseList;
import org.apache.ignite.internal.pagememory.reuse.ReuseListImpl;
import org.apache.ignite.internal.pagememory.util.PageLockListener;
-import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.IgniteInternalCheckedException;
/**
@@ -51,7 +51,8 @@ public abstract class AbstractBplusTreeReusePageMemoryTest
extends AbstractBplus
pageMem,
new TestPageLockListener(),
rootId,
- initNew
+ initNew,
+ log
);
}
@@ -86,9 +87,10 @@ public abstract class AbstractBplusTreeReusePageMemoryTest
extends AbstractBplus
PageMemory pageMem,
PageLockListener lockLsnr,
long metaPageId,
- boolean initNew
+ boolean initNew,
+ IgniteLogger log
) throws IgniteInternalCheckedException {
- super(name, grpId, partId, pageMem, lockLsnr,
BaseIgniteAbstractTest.log, metaPageId, initNew, null);
+ super(name, grpId, partId, pageMem, lockLsnr, log, metaPageId,
initNew, null);
}
static boolean checkNoLocks() {
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ActiveActorTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ActiveActorTest.java
index 803928c120..7d32e08d03 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ActiveActorTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ActiveActorTest.java
@@ -116,8 +116,7 @@ public class ActiveActorTest extends IgniteAbstractTest {
MetaStorageManager msm;
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void tearDown() throws Exception {
List<AutoCloseable> closeables =
placementDriverManagers.values().stream().map(p -> (AutoCloseable)
p::stop).collect(toList());
closeAll(closeables);
@@ -125,8 +124,6 @@ public class ActiveActorTest extends IgniteAbstractTest {
placementDriverManagers.clear();
IgniteUtils.shutdownAndAwaitTermination(executor, 10,
TimeUnit.SECONDS);
-
- super.tearDown(testInfo);
}
/**
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/BasePlacementDriverTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/BasePlacementDriverTest.java
index 707e84f80e..a3f4beed9b 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/BasePlacementDriverTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/BasePlacementDriverTest.java
@@ -44,7 +44,7 @@ abstract class BasePlacementDriverTest extends
IgniteAbstractTest {
*
* @return Replication group id.
*/
- protected static TablePartitionId createTableAssignment(MetaStorageManager
metastore, int tableId, List<String> dataNodes) {
+ protected TablePartitionId createTableAssignment(MetaStorageManager
metastore, int tableId, List<String> dataNodes) {
List<Set<Assignment>> assignments =
AffinityUtils.calculateAssignments(dataNodes, 1, dataNodes.size());
Map<ByteArray, byte[]> partitionAssignments = new
HashMap<>(assignments.size());
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
index b1620f40bf..3f9f9e53fa 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
@@ -60,7 +60,6 @@ import org.apache.ignite.internal.raft.Loza;
import
org.apache.ignite.internal.raft.client.TopologyAwareRaftGroupServiceFactory;
import org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import org.apache.ignite.internal.replicator.TablePartitionId;
-import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.internal.vault.inmemory.InMemoryVaultService;
@@ -111,7 +110,7 @@ public class MultiActorPlacementDriverTest extends
BasePlacementDriverTest {
private final AtomicInteger nextTableId = new AtomicInteger(1);
@BeforeEach
- public void beforeTest(TestInfo testInfo, @WorkDirectory Path workDir) {
+ public void beforeTest(TestInfo testInfo) {
this.placementDriverNodeNames = IntStream.range(BASE_PORT, BASE_PORT +
3).mapToObj(port -> testNodeName(testInfo, port))
.collect(Collectors.toList());
this.nodeNames = IntStream.range(BASE_PORT, BASE_PORT +
5).mapToObj(port -> testNodeName(testInfo, port))
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItNodeTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItNodeTest.java
index 9c08b36811..e228be7472 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItNodeTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItNodeTest.java
@@ -142,6 +142,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
public class ItNodeTest extends BaseIgniteAbstractTest {
+ private static final IgniteLogger log = Loggers.forClass(ItNodeTest.class);
+
private static DumpThread dumpThread;
private static class DumpThread extends Thread {
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItJraftCounterServerTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItJraftCounterServerTest.java
index c4ca9bb968..ba06d82edd 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItJraftCounterServerTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItJraftCounterServerTest.java
@@ -825,7 +825,7 @@ class ItJraftCounterServerTest extends JraftAbstractTest {
* @return The counter value.
* @throws Exception If failed.
*/
- private static long applyIncrements(RaftGroupService client, int start,
int stop) throws Exception {
+ private long applyIncrements(RaftGroupService client, int start, int stop)
throws Exception {
long val = 0;
for (int i = start; i <= stop; i++) {
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
index b8631ba8c8..aea0513684 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
@@ -223,7 +223,7 @@ public abstract class BaseIgniteRestartTest extends
IgniteAbstractTest {
* @param distributedConfigurationGenerator Distributes configuration
generator..
* @return Partial node.
*/
- public static PartialNode partialNode(
+ public PartialNode partialNode(
ConfigurationManager nodeCfgMgr,
ConfigurationManager clusterCfgMgr,
MetaStorageManager metaStorageMgr,
@@ -255,7 +255,8 @@ public abstract class BaseIgniteRestartTest extends
IgniteAbstractTest {
return new PartialNode(
components,
List.of(localConfigurationGenerator,
distributedConfigurationGenerator),
- logicalTopology
+ logicalTopology,
+ log
);
}
@@ -270,10 +271,18 @@ public abstract class BaseIgniteRestartTest extends
IgniteAbstractTest {
private final LogicalTopology logicalTopology;
- PartialNode(List<IgniteComponent> startedComponents,
List<ManuallyCloseable> closeables, LogicalTopology logicalTopology) {
+ private final IgniteLogger log;
+
+ PartialNode(
+ List<IgniteComponent> startedComponents,
+ List<ManuallyCloseable> closeables,
+ LogicalTopology logicalTopology,
+ IgniteLogger log
+ ) {
this.startedComponents = startedComponents;
this.closeables = closeables;
this.logicalTopology = logicalTopology;
+ this.log = log;
}
/**
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
index 9d3c4a57fd..4e71cc6ed5 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ClusterPerTestIntegrationTest.java
@@ -106,8 +106,6 @@ public abstract class ClusterPerTestIntegrationTest extends
IgniteIntegrationTes
*/
@BeforeEach
public void setup(TestInfo testInfo) throws Exception {
- setupBase(testInfo, workDir);
-
cluster = new Cluster(testInfo, workDir,
getNodeBootstrapConfigTemplate());
if (initialNodes() > 0) {
@@ -115,17 +113,9 @@ public abstract class ClusterPerTestIntegrationTest
extends IgniteIntegrationTes
}
}
- /**
- * Invoked after each test has finished.
- *
- * @param testInfo Test information oject.
- * @throws Exception If failed.
- */
@AfterEach
@Timeout(60)
- public void tearDown(TestInfo testInfo) throws Exception {
- tearDownBase(testInfo);
-
+ public void tearDown() {
cluster.shutdown();
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
index 2f9bd639e5..88a2ec05e5 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
@@ -147,16 +147,6 @@ class ItTableRaftSnapshotsTest extends
IgniteIntegrationTest {
cluster.shutdown();
}
- @BeforeEach
- public void setup(TestInfo testInfo) throws Exception {
- setupBase(testInfo, workDir);
- }
-
- @AfterEach
- public void tearDown(TestInfo testInfo) throws Exception {
- tearDownBase(testInfo);
- }
-
/**
* Executes the given action, retrying it up to a few times if a transient
failure occurs (like node unavailability) or
* until {@code shouldStop} returns {@code true}, in that case this method
throws {@link UnableToRetry} exception.
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItRaftCommandLeftInLogUntilRestartTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItRaftCommandLeftInLogUntilRestartTest.java
index e222628537..ae2d5f9f7e 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItRaftCommandLeftInLogUntilRestartTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItRaftCommandLeftInLogUntilRestartTest.java
@@ -223,7 +223,7 @@ public class ItRaftCommandLeftInLogUntilRestartTest extends
ClusterPerClassInteg
* @param leaderAndGroupRef Pair contains of leader and RAFT group name.
* @return Atomic long that represents an applied index.
*/
- private static AtomicLong partitionUpdateInhibitor(
+ private AtomicLong partitionUpdateInhibitor(
IgniteImpl node,
AtomicReference<IgniteBiTuple<ClusterNode, String>>
leaderAndGroupRef
) {
@@ -327,7 +327,7 @@ public class ItRaftCommandLeftInLogUntilRestartTest extends
ClusterPerClassInteg
*
* @param ignite Ignite instance.
*/
- private static void transferLeadershipToLocalNode(IgniteImpl ignite) {
+ private void transferLeadershipToLocalNode(IgniteImpl ignite) {
TableImpl table = (TableImpl)
ignite.tables().table(DEFAULT_TABLE_NAME);
RaftGroupService raftGroupService =
table.internalTable().partitionRaftGroupService(0);
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
index 6cc30ae373..55948ecae2 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
@@ -34,7 +34,7 @@ import org.apache.ignite.IgnitionManager;
import org.apache.ignite.InitParameters;
import org.apache.ignite.client.IgniteClient;
import org.apache.ignite.internal.app.IgniteImpl;
-import org.apache.ignite.internal.testframework.IgniteAbstractTest;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.apache.ignite.internal.testframework.TestIgnitionManager;
import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -53,7 +53,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
@SuppressWarnings("ZeroLengthArrayAllocation")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@ExtendWith(WorkDirectoryExtension.class)
-public abstract class ItAbstractThinClientTest extends IgniteAbstractTest {
+public abstract class ItAbstractThinClientTest extends BaseIgniteAbstractTest {
protected static final String TABLE_NAME = "TBL1";
protected static final String COLUMN_KEY = "key";
@@ -71,8 +71,6 @@ public abstract class ItAbstractThinClientTest extends
IgniteAbstractTest {
*/
@BeforeAll
void beforeAll(TestInfo testInfo, @WorkDirectory Path workDir) throws
InterruptedException {
- this.workDir = workDir;
-
String node0Name = testNodeName(testInfo, 3344);
String node1Name = testNodeName(testInfo, 3345);
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
index 7d786e3b50..c3023f41b3 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
@@ -90,7 +90,6 @@ import org.hamcrest.Matcher;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Tests for asynchronous SQL API.
@@ -99,20 +98,11 @@ import org.junit.jupiter.api.TestInfo;
public class ItSqlAsynchronousApiTest extends ClusterPerClassIntegrationTest {
private static final int ROW_COUNT = 16;
- /**
- * Clear tables after each test.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void dropTables() {
for (Table t : CLUSTER_NODES.get(0).tables().tables()) {
sql("DROP TABLE " + t.name());
}
-
- tearDownBase(testInfo);
}
@Test
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
index 5088dd9c22..1a4bcf0263 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
@@ -58,7 +58,6 @@ import org.hamcrest.MatcherAssert;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Tests for synchronous SQL API.
@@ -67,20 +66,11 @@ import org.junit.jupiter.api.TestInfo;
public class ItSqlSynchronousApiTest extends ClusterPerClassIntegrationTest {
private static final int ROW_COUNT = 16;
- /**
- * Clear tables after each test.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void dropTables() {
for (Table t : CLUSTER_NODES.get(0).tables().tables()) {
sql("DROP TABLE " + t.name());
}
-
- tearDownBase(testInfo);
}
@Test
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java
index bf2fb5ac01..8234e04f6d 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java
@@ -82,9 +82,7 @@ import org.apache.ignite.tx.IgniteTransactions;
import org.apache.ignite.tx.Transaction;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestInstance;
@@ -231,28 +229,6 @@ public abstract class ClusterPerClassIntegrationTest
extends IgniteIntegrationTe
}
}
- /**
- * Invokes before the test will start.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
- @BeforeEach
- public void setup(TestInfo testInfo) throws Exception {
- setupBase(testInfo, WORK_DIR);
- }
-
- /**
- * Invokes after the test has finished.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
- @AfterEach
- public void tearDown(TestInfo testInfo) throws Exception {
- tearDownBase(testInfo);
- }
-
/**
* Returns table index configuration of the given index at the given node,
or {@code null} if no such index exists.
*
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCorrelatesTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCorrelatesTest.java
index 41f722abe1..cf87810c6c 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCorrelatesTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCorrelatesTest.java
@@ -21,24 +21,14 @@ import static
org.apache.ignite.internal.sql.engine.util.QueryChecker.containsSu
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/** Tests for correlated queries. */
public class ItCorrelatesTest extends ClusterPerClassIntegrationTest {
private static final String DISABLED_JOIN_RULES = " /*+
DISABLE_RULE('MergeJoinConverter', 'NestedLoopJoinConverter') */ ";
- /**
- * Clear tables after each test.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void dropTables() {
dropAllTables();
-
- super.tearDownBase(testInfo);
}
/** Checks correlates are assigned before access. */
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCreateTableDdlTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCreateTableDdlTest.java
index 6eff82fa2c..fbea36d88e 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCreateTableDdlTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItCreateTableDdlTest.java
@@ -36,24 +36,14 @@ import org.apache.ignite.lang.ErrorGroups.Table;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Integration test for CREATE TABLE DDL command.
*/
public class ItCreateTableDdlTest extends ClusterPerClassIntegrationTest {
- /**
- * Clear tables after each test.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void dropTables() {
dropAllTables();
-
- super.tearDownBase(testInfo);
}
@Test
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDmlTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDmlTest.java
index 5327aa487b..f207dcef06 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDmlTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDmlTest.java
@@ -41,7 +41,6 @@ import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
/**
* Various DML tests.
@@ -53,18 +52,9 @@ public class ItDmlTest extends
ClusterPerClassIntegrationTest {
return 3;
}
- /**
- * Clear tables after each test.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void dropTables() {
dropAllTables();
-
- super.tearDownBase(testInfo);
}
@Test
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java
index be94421220..5630d31c08 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItPkOnlyTableCrossApiTest.java
@@ -43,7 +43,6 @@ import org.apache.ignite.tx.Transaction;
import org.apache.ignite.tx.TransactionOptions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -61,13 +60,10 @@ public class ItPkOnlyTableCrossApiTest extends
ClusterPerClassIntegrationTest {
}
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void tearDown() {
for (String engine : ENGINES) {
sql("delete from " + tableName(engine));
}
-
- tearDownBase(testInfo);
}
@BeforeAll
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java
index ff771c5912..75397ced6c 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItPublicApiColocationTest.java
@@ -47,7 +47,6 @@ import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -71,20 +70,11 @@ public class ItPublicApiColocationTest extends
ClusterPerClassIntegrationTest {
NativeTypeSpec.TIMESTAMP)
.collect(Collectors.toSet());
- /**
- * Clear tables after each test.
- *
- * @param testInfo Test information object.
- * @throws Exception If failed.
- */
@AfterEach
- @Override
- public void tearDown(TestInfo testInfo) throws Exception {
+ public void dropTables() {
for (Table t : CLUSTER_NODES.get(0).tables().tables()) {
sql("DROP TABLE " + t.name());
}
-
- super.tearDownBase(testInfo);
}
/**
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java
index 2729786b9d..399d242f41 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java
@@ -598,7 +598,7 @@ public class PlannerTest extends AbstractPlannerTest {
return new MappingQueryContext(locNodeName, mappingService);
}
- private static PlanningContext plannerContext(SchemaPlus schema, String
sql, Object... params) {
+ private PlanningContext plannerContext(SchemaPlus schema, String sql,
Object... params) {
return PlanningContext.builder()
.parentContext(BaseQueryContext.builder()
.logger(log)
