You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ap...@apache.org on 2023/08/24 13:39:29 UTC
[ignite-3] branch ignite-20086 updated (a93737b3ef -> 455976f38b)
This is an automated email from the ASF dual-hosted git repository.
apolovtsev pushed a change to branch ignite-20086
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
omit a93737b3ef Implement ArchUnit rule to detect wrong test classes hierarchy.
add 3e15298821 IGNITE-20148 Explicit writeIntent cleanup on primary replica (#2405)
add 86b9b2a1dd IGNITE-19835 Java client: Reject POJOs and Tuples with unmapped fields (#2401)
add c24e6e0497 IGNITE-20146 Add improvements to the catalog associated with the DistributionZone (#2403)
add cdddfae611 IGNITE-19937 Remove BinaryRow#byteBuffer method (#2408)
add d5c265d933 IGNITE-19770 Add a mechanism to wait till a schema is available via Schema Sync at a ts (#2402)
add 6546bc46f9 IGNITE-20128: Clean up ignored SQL tests (#2392)
add 5d9494fc7a IGNITE-19783 StripedScheduledExecutorService is created for DistributionZoneManager#executor (#2380)
add 23d886ad2a IGNITE-20058 Flaky distribution zone tests were fixed by fixing order of the meta storage watches deploying and a distribution zone manager start (#2400)
add fa8d626f57 IGNITE-19566 Remove ignite-core dependency from ignite-api module (#2349)
add 28111df1a2 IGNITE-19839 Java client: Reload schema when unmapped columns are detected (#2410)
add 0ab2627e50 IGNITE-20105 Set default precision and scale for new column descriptor when needed (#2391)
add fb3c5e2033 IGNITE-15927 One-phase commit - Fixes #2329.
add 606f17fc3c IGNITE-19960 Sync with JRaft repo - Fixes #2321.
add 194ad21949 IGNITE-15927 Fixed compilation
add ed6493a563 IGNITE-20167 Always use version to get SQL schema (#2413)
add 551401872e Merge branch 'main' of https://gitbox.apache.org/repos/asf/ignite-3
add 8451881ebf IGNITE-20161 Fix NPE in AppendEntriesRequestProcessor (#2407)
add 9f4dd29a0a IGNITE-19361: Sql. Add negative test cases for UUID custom type (#2416)
add dfdc132f5b IGNITE-20153 Prepare existing tests for the distributed zone to switch to the catalog (#2420)
add e51f3d9799 [IGNITE-19785] Sql. Rework execution of 2-phase aggregates (#2312)
add 9f5c135ea7 IGNITE-19953 Fix --verbose/-v option in CLI interactive mode (#2419)
add da612fd99a IGNITE-19841 Add tests for schema validation consistency in client and embedded API (#2421)
add 8e37291b97 IGNITE-19108 Check connection during REPL session in CLI (#2359)
add f4c33ff66f IGNITE-14865 Sql. Public SQL API should only throw public exceptions (#2345)
add ee06eb1bc0 IGNITE-19978 Java client: Change Gradle dependencies from implementation to api (#2427)
add 4dd4743579 IGNITE-20152 Fix PartitionAwarenessTest.startServer2 flakiness (#2430)
add 47bf25dedd IGNITE-19877 Sql. Fix not allowed CAST operations - Fixes #2368.
add e490bfe781 IGNITE-20056 .NET: Track observable timestamp (#2426)
add ae8c6c5011 IGNITE-19947 Sql. Fix CAST(n AS DECIMAL(precision, scale)) behaviour for scale > precision issues (#2396)
add 0e0ba6a3ca IGNITE-20180 Fix flaky ItTablePersistenceTest#testSnapshot (#2428)
add c1a6a07307 IGNITE-19838 .NET: Retry outdated schema error (#2434)
add 960ce0a72d IGNITE-19294 Support merged configuration roots for multiple modules (#2386)
add 76410e1f86 IGNITE-19995 testMultithreadedWaitForWithValue muted (#2438)
add 791abd1831 IGNITE-19789 Sql. Introduce RowSchema for RowFactory (#2398)
add 3efece8245 IGNITE-19919 Sql. ResultSet#close should close implicit transaction if any (#2423)
add 027bdd1681 IGNITE-20200 Fix Gradle non-zero exit code on test failure (#2442)
add af65a70c4c IGNITE-20053 ItRebalanceDistributedTest fixed (#2433)
add a5a7bac093 IGNITE-20030 Sql. Delete operation fails if PK is set on arbitrary columns (#2397)
add cfe909d121 IGNITE-19936 Add username and password parameters to the connect command (#2339)
add c00e7ed902 IGNITE-20192 Fix default length for variable-length columns (#2435)
add 7b5d0b3a3b IGNITE-20188 Add improvements to the catalog associated with the DistributionZone #2 (#2432)
add 4a646a7cd7 IGNITE-19836 .NET: Reject Tuples and POCOs with unmapped fields (#2444)
add f6214ae730 IGNITE-20035 Sql. Fixed handling "maxRows" jdbc query parameter (#2437)
add 99f7775253 IGNITE-20049 Remove BinaryRow#hasValue method (#2424)
add e98dee77ee IGNITE-20214 Fix flaky ItSimpleCounterServerTest#testRefreshLeader test (#2445)
add 7989e7e253 IGNITE-20189 Prepare existing tests for the distributed zone to switch to the catalog #2 (#2436)
add 19bc621eaf IGNITE-20171 Handle case when there is no Problem json in response (#2418)
add 730d214f92 IGNITE-19840 .NET: Reload schema when unmapped columns are detected (#2454)
add 1e9fe13003 IGNITE-20229 Get rid of configurations in PlacementDriverManager (#2453)
add bb2c93aa6b IGNITE-20243 Introduce a Matcher for BinaryRows (#2457)
add 2c22342bb1 IGNITE-20082 Fix ODBC DEB\RPM packages (#2376)
add 641b340d76 IGNITE-16700 Fix flaky ItTxDistributedTestThreeNodesThreeReplicas#testBalance (#2439)
add bb382455ea IGNITE-20183 Fix testNonNullTxDisablesPartitionAwareness flakiness (#2458)
add b04aee524e IGNITE-19096 Sql. Replace placeholder values from ModifyNode (#2446)
add 0e680321e1 IGNITE-20251 NPE in ItTxDistributedTestThreeNodesThreeReplicas (#2464)
add db52d5016d IGNITE-20159 Add README for the project (#2409)
add 5295cd0d5e IGNITE-20249 Refactoring some tests to make it easier to switch to catalog (#2465)
add e32fd8d092 IGNITE 19148 Switch tests from using JUL to log4j2 (#2429)
add eeeadbe5b2 IGNITE-20197 .NET: Fix excessive dictionary lookups in GetFieldByColumnName (#2467)
add 77d9823c37 IGNITE-19009 Introduce file transfer support in messaging (#2390)
add 6112498dd7 IGNITE-20196 Sql. Review list of reserved keywords (#2452)
add b584cd863b IGNITE-19631 (#2466) Allow passing extra JVM args to bin/ignite3db
add fefcadb4d2 IGNITE-19893: Sql. Add plan checks to BaseIndexDataTypeTest. (#2422)
add f72bf5f036 IGNITE-20261 Configure Xmx for unit tests (#2474)
add c8e47892b9 IGNITE-19711 Add a note for CREATE INDEX (#2362)
add 7e0987afe1 IGNITE-19920 Fix ALTER TABLE syntax (#2361)
add 49601d2fcb IGNITE-20057 Track observable timestamp in C++ client and ODBC (#2471)
add 7efadf98c1 IGNITE-19957 Refactor ODBC to re-use protocol-related code from client (#2470)
add accf8ea49b IGNITE-19211 ODBC 3.0: Type traits clean up (#2478)
add 3afaddcda9 IGNITE-20257 fix flaky ItCliServiceTest#testSnapshot test @alievmirza (#2469)
add 6b987b721c IGNITE-20248 Fix validation of autoAdjust, scaleUp and scaleDown when creating a zone in the catalog (#2462)
add c87284c92a IGNITE-20219 Fix the typo of user name to username (#2451)
add 40d611dea0 IGNITE-20230 ItRebalanceDistributedTest#testDestroyPartitionStoragesOnEvictNode fixed. (#2477)
add b191cf8c42 IGNITE-19983 C++: Support BOOLEAN datatype (#2481)
add 4a5b7357d6 IGNITE-19995 PendingComparableValuesTrackerTest#testMultithreadedWaitFor fails with ConcurrentModificationException (#2482)
add d15b975b97 IGNITE-19542 .NET: Add BinaryTupleIgniteTupleAdapter (#2479)
add 18d79f347d IGNITE-20246 Sql. Decouple distribution trait and function (#2463)
add d748e48ed4 IGNITE-19951 Enable checks of using NotNull annotation. (#2468)
add 6404013215 IGNITE-20104 Sql. Improve error messages from Sql parser (#2460)
add 19f158ceff IGNITE-20185 Sql. Fix missed casting rules (#2431)
add df5734462d IGNITE-19992 Sql. Rework execution of 2-phase set operators (#2443)
add fe84f76259 IGNITE-20270 Improve RocksDB iterator performance (#2487)
add f9bfb52907 IGNITE-19570 Write intent resolution for RW transactions (#2475)
add 73150f1b45 IGNITE-20155 Validate BinaryTuple coming from client (#2491)
add 18f67c8fe2 IGNITE-20271 Error in CLI on SQL repl command (#2486)
new 0beda7a18a Implement ArchUnit rule to detect wrong test classes hierarchy.
new 455976f38b IGNITE-20086
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a93737b3ef)
\
N -- N -- N refs/heads/ignite-20086 (455976f38b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/PULL_REQUEST_TEMPLATE.md | 12 +-
.idea/codeStyles/Project.xml | 3 +-
.idea/inspectionProfiles/Project_Default.xml | 8 +-
README.md | 103 ++-
build.gradle | 2 +-
buildscripts/java-core.gradle | 4 +-
buildscripts/java-integration-test.gradle | 5 +
buildscripts/java-junit5.gradle | 6 +
buildscripts/java-test-fixtures.gradle | 5 +
buildscripts/sql-parser-generator.gradle | 33 +-
check-rules/pmd-rules.xml | 19 +
config/java.util.logging.properties | 57 --
docs/_docs/sql-reference/ddl.adoc | 23 +-
gradle/libs.versions.toml | 13 +-
.../affinity/RendezvousAffinityFunctionTest.java | 2 -
modules/api/build.gradle | 11 +-
.../org/apache/ignite/InitParametersBuilder.java | 2 +-
.../org/apache/ignite/compute/IgniteCompute.java | 35 +-
.../ignite/lang/ColumnAlreadyExistsException.java | 2 +-
.../ignite/lang/ColumnNotFoundException.java | 12 +-
.../java/org/apache/ignite/lang/ErrorGroup.java | 0
.../java/org/apache/ignite/lang/ErrorGroups.java | 0
.../apache/ignite/lang/IgniteCheckedException.java | 2 +-
.../org/apache/ignite/lang/IgniteException.java | 2 +-
.../apache/ignite/lang/IgniteExceptionUtils.java | 544 ---------------
.../ignite/lang/IndexAlreadyExistsException.java | 5 +-
.../apache/ignite/lang/IndexNotFoundException.java | 5 +-
.../ignite/lang/SchemaNotFoundException.java | 3 +-
.../ignite/lang/TableAlreadyExistsException.java | 2 +-
.../apache/ignite/lang/TableNotFoundException.java | 2 +-
.../org/apache/ignite/lang/TraceableException.java | 0
.../apache/ignite/lang}/util/IgniteNameUtils.java | 12 +-
.../org/apache/ignite/lang}/util/StringUtils.java | 2 +-
.../org/apache/ignite/lang/util/TraceIdUtils.java | 56 ++
.../org/apache/ignite/network/ClusterNode.java | 90 +--
.../main/java/org/apache/ignite/sql/Session.java | 61 +-
.../org/apache/ignite/sql/SqlBatchException.java | 19 +-
.../java/org/apache/ignite/sql/SqlException.java | 13 -
.../main/java/org/apache/ignite/sql/Statement.java | 19 +-
.../java/org/apache/ignite/table/KeyValueView.java | 77 +-
.../java/org/apache/ignite/table/RecordView.java | 57 +-
.../main/java/org/apache/ignite/table/Table.java | 3 +-
.../main/java/org/apache/ignite/table/Tuple.java | 29 +-
.../java/org/apache/ignite/table/TupleImpl.java | 47 +-
.../org/apache/ignite/table/mapper/Mapper.java | 20 +-
.../apache/ignite/table/mapper/MapperBuilder.java | 19 +-
.../ignite/table/mapper/OneColumnMapperImpl.java | 5 +-
.../org/apache/ignite/table/mapper/PojoMapper.java | 13 +-
.../apache/ignite/table/mapper/PojoMapperImpl.java | 14 +-
modules/arch-test/build.gradle | 6 +
.../internal/TestClassHierarchyArchTest.java | 39 +-
.../apache/ignite/lang/IgniteTestImportOption.java | 8 +-
modules/binary-tuple/build.gradle | 1 +
.../internal/binarytuple/BinaryTupleCommon.java | 6 -
modules/catalog/build.gradle | 16 +-
.../apache/ignite/internal/catalog/Catalog.java | 4 +-
.../ignite/internal/catalog/CatalogManager.java | 8 +-
.../internal/catalog/CatalogManagerImpl.java | 145 ++--
.../catalog/CatalogParamsValidationUtils.java | 175 +++++
.../ignite/internal/catalog/CatalogService.java | 26 +-
.../catalog/CatalogValidationException.java | 53 ++
.../commands/AbstractUpdateZoneCommandParams.java | 195 ++++++
.../commands/AbstractZoneCommandParams.java | 32 +-
.../internal/catalog/commands/AlterZoneParams.java | 193 ++---
.../internal/catalog/commands/CatalogUtils.java | 224 +++++-
.../internal/catalog/commands/ColumnParams.java | 19 +-
.../catalog/commands/CreateZoneParams.java | 201 ++----
...{DropZoneParams.java => DataStorageParams.java} | 56 +-
.../internal/catalog/commands/DropZoneParams.java | 49 +-
.../catalog/commands/RenameZoneParams.java | 20 +-
.../descriptors/CatalogDataStorageDescriptor.java | 5 +-
.../catalog/descriptors/CatalogZoneDescriptor.java | 44 +-
.../internal/catalog/CatalogManagerSelfTest.java | 145 ++--
.../catalog/CatalogManagerValidationTest.java | 585 ++++++++++++++++
.../catalog/commands/CatalogUtilsTest.java | 219 ++++++
.../catalog/storage/UpdateLogImplTest.java | 3 +-
.../internal/catalog/BaseCatalogManagerTest.java | 84 +++
modules/cli/build.gradle | 1 +
...liCommandTestNotInitializedIntegrationBase.java | 12 +-
.../cli/commands/ItClusterCommandTest.java | 44 +-
.../cli/commands/ItConnectionHeartbeatTest.java | 142 ++++
.../cli/commands/connect/ItConnectCommandTest.java | 23 +
...tConnectWithBasicAuthenticationCommandTest.java | 195 +++++-
.../cli/commands/sql/ItSqlCommandTest.java | 2 +-
.../repl/executor/ItIgnitePicocliCommandsTest.java | 7 +-
.../apache/ignite/internal/cli/ssl/ItSslTest.java | 4 +-
.../apache/ignite/internal/cli/ReplManager.java | 5 +
.../internal/cli/call/connect/ConnectCall.java | 111 +--
.../cli/call/connect/ConnectCallInput.java | 105 +++
.../internal/cli/call/connect/ConnectSslCall.java | 7 +-
.../cli/call/connect/ConnectSslConfigCall.java | 5 +-
.../internal/cli/call/connect/DisconnectCall.java | 23 +-
.../ignite/internal/cli/commands/Options.java | 18 +
.../cli/commands/connect/ConnectCommand.java | 16 +-
.../cli/commands/connect/ConnectOptions.java | 49 ++
.../cli/commands/connect/ConnectReplCommand.java | 28 +-
.../questions/ConnectToClusterQuestion.java | 33 +-
.../internal/cli/commands/sql/SqlReplCommand.java | 7 +-
.../ignite/internal/cli/config/ConfigManager.java | 4 +
.../ignite/internal/cli/core/JdbcUrlFactory.java | 2 +-
.../handler/IgniteCliApiExceptionHandler.java | 25 +-
...SessionEventListener.java => ConnectEvent.java} | 26 +-
.../cli/core/repl/ConnectionHeartBeat.java | 134 ++++
...EventListener.java => ConnectionLostEvent.java} | 17 +-
...tListener.java => ConnectionRestoredEvent.java} | 17 +-
...sionEventListener.java => DisconnectEvent.java} | 17 +-
.../core/repl/EventListeningActivationPoint.java | 91 +++
.../cli/core/repl/PeriodicSessionTaskExecutor.java | 3 +-
.../apache/ignite/internal/cli/core/repl/Repl.java | 11 +-
.../ignite/internal/cli/core/repl/ReplBuilder.java | 16 +-
.../ignite/internal/cli/core/repl/Session.java | 42 +-
.../ignite/internal/cli/core/repl/SessionInfo.java | 50 +-
.../cli/core/repl/executor/ReplExecutor.java | 2 +
.../cli/core/repl/prompt/ReplPromptProvider.java | 19 +-
.../registry/impl/ClusterConfigRegistryImpl.java | 4 +-
.../repl/registry/impl/MetricRegistryImpl.java | 4 +-
.../repl/registry/impl/NodeConfigRegistryImpl.java | 4 +-
.../core/repl/registry/impl/UnitsRegistryImpl.java | 4 +-
.../internal/cli/core/rest/ApiClientFactory.java | 82 ++-
.../cli/event/ConnectionEventListener.java | 65 ++
.../apache/ignite/internal/cli/event/Event.java} | 12 +-
.../ignite/internal/cli/event/EventFactory.java | 84 +++
.../ignite/internal/cli/event/EventListener.java | 14 +-
.../ignite/internal/cli/event/EventPublisher.java | 18 +-
.../EventSubscriptionManager.java} | 14 +-
.../ignite/internal/cli/event/EventType.java} | 15 +-
.../apache/ignite/internal/cli/event/Events.java | 67 ++
.../ignite/internal/cli/logger/HttpLogging.java | 5 +
.../cli/commands/connect/ConnectCommandTest.java | 48 ++
.../cli/config/ini/IniConfigManagerTest.java | 2 +-
.../handler/IgniteCliApiExceptionHandlerTest.java | 87 +++
.../core/repl/SessionDefaultValueProviderTest.java | 6 +-
.../filter/DynamicCompleterFilterTest.java | 10 +-
.../internal/cli/logger/HttpLoggingTest.java | 35 +-
.../ignite/internal/cli/AbstractCliTest.java | 3 +-
.../client/proto/ClientBinaryTupleUtils.java | 6 +-
.../table/MutableTupleBinaryTupleAdapter.java | 35 +-
.../proto/ClientMessagePackerUnpackerTest.java | 3 +-
modules/client-handler/build.gradle | 1 -
.../client/handler/ItClientHandlerMetricsTest.java | 3 +-
.../ignite/client/handler/ItClientHandlerTest.java | 3 +-
.../client/handler/ItSslClientHandlerTest.java | 3 +-
.../ignite/client/handler/ClientResource.java | 3 +-
.../client/handler/JdbcQueryEventHandlerImpl.java | 5 +-
.../handler/requests/jdbc/JdbcQueryCursor.java | 11 +-
.../handler/requests/table/ClientTableCommon.java | 2 -
.../client/handler/requests/table/ClientTuple.java | 5 +-
.../requests/jdbc/JdbcQueryCursorSelfTest.java | 101 +++
modules/client/build.gradle | 4 +-
.../ignite/internal/client/ClientClusterNode.java} | 40 +-
.../apache/ignite/internal/client/ClientUtils.java | 7 +-
.../ignite/internal/client/TcpClientChannel.java | 13 +-
.../ignite/internal/client/TcpIgniteClient.java | 2 +-
.../internal/client/compute/ClientCompute.java | 49 ++
.../ignite/internal/client/sql/ClientSession.java | 4 +-
.../ignite/internal/client/sql/ClientSqlRow.java | 7 +-
.../internal/client/sql/ClientStatement.java | 7 +-
.../client/sql/ClientStatementBuilder.java | 13 +-
.../internal/client/table/ClientDataStreamer.java | 2 -
.../client/table/ClientKeyValueBinaryView.java | 77 +-
.../internal/client/table/ClientKeyValueView.java | 85 ++-
.../client/table/ClientRecordBinaryView.java | 57 +-
.../client/table/ClientRecordSerializer.java | 5 +-
.../internal/client/table/ClientRecordView.java | 57 +-
.../ignite/internal/client/table/ClientSchema.java | 11 +-
.../ignite/internal/client/table/ClientTable.java | 190 ++---
.../ignite/internal/client/table/ClientTuple.java | 7 +-
.../client/table/ClientTupleSerializer.java | 94 ++-
.../internal/client/tx/ClientTransaction.java | 3 +-
.../internal/client/tx/ClientTransactions.java | 2 -
.../ignite/client/AbstractClientTableTest.java | 104 ++-
.../apache/ignite/client/AbstractClientTest.java | 3 +-
.../ignite/client/ClientKeyValueViewTest.java | 85 +--
.../apache/ignite/client/ClientRecordViewTest.java | 41 +-
.../org/apache/ignite/client/ClientTableTest.java | 4 +-
.../java/org/apache/ignite/client/CustomTuple.java | 32 +-
.../org/apache/ignite/client/DataStreamerTest.java | 12 +-
.../client/ObservableTimestampPropagationTest.java | 3 +-
.../ignite/client/PartitionAwarenessTest.java | 48 +-
.../java/org/apache/ignite/client/TestServer.java | 3 +-
.../ignite/client/fakes/FakeAsyncResultSet.java | 2 -
.../apache/ignite/client/fakes/FakeCompute.java | 50 ++
.../ignite/client/fakes/FakeIgniteTables.java | 24 +-
.../ignite/client/fakes/FakeInternalTable.java | 133 ++--
.../ignite/client/fakes/FakeSchemaRegistry.java | 17 +-
.../apache/ignite/client/fakes/FakeSession.java | 4 +-
.../org/apache/ignite/client/fakes/FakeSqlRow.java | 32 +-
.../apache/ignite/client/fakes/FakeTxManager.java | 3 +-
modules/cluster-management/build.gradle | 1 -
.../management/raft/ItCmgRaftServiceTest.java | 3 +-
.../cluster/management/ClusterInitializer.java | 2 +-
.../raft/commands/ClusterNodeMessage.java | 3 +-
.../management/topology/api/LogicalNode.java | 3 +-
.../cluster/management/ClusterInitializerTest.java | 17 +-
.../AbstractClusterStateStorageManagerTest.java | 4 +-
.../ignite/internal/deployunit/UnitContent.java | 2 -
.../metastore/DeploymentUnitStoreImplTest.java | 3 +-
.../deployunit/DeploymentUnitAccessorImplTest.java | 3 +-
.../DeploymentUnitAcquiredWaiterTest.java | 5 +-
.../ignite/internal/compute/IgniteComputeImpl.java | 52 +-
.../internal/compute/ComputeComponentImplTest.java | 3 +-
.../internal/compute/IgniteComputeImplTest.java | 5 +-
.../compute/JobExecutionContextImplTest.java | 3 +-
.../compute/loader/JobClassLoaderFactoryTest.java | 3 +-
.../compute/loader/JobClassLoaderTest.java | 3 +-
...tibleSchemaAnnotations0ConfigurationSchema.java | 6 +-
.../ErrorInjectedName4ConfigurationSchema.java | 6 +-
.../ErrorInjectedName5ConfigurationSchema.java | 4 +-
.../ErrorInternal0ConfigurationSchema.java | 6 +-
.../ErrorInternal1ConfigurationSchema.java | 6 +-
.../ErrorInternal2ConfigurationSchema.java | 6 +-
.../ErrorInternal3ConfigurationSchema.java | 6 +-
.../ErrorInternal4ConfigurationSchema.java | 4 +-
.../ErrorInternal5ConfigurationSchema.java | 4 +-
.../ExtendedSimpleConfigurationSchema.java | 4 +-
.../ExtendedSimpleRootConfigurationSchema.java | 4 +-
.../ErrorPolymorphic2ConfigurationSchema.java | 6 +-
...rorPolymorphicInstance2ConfigurationSchema.java | 6 +-
.../processor/ConfigurationProcessor.java | 32 +-
.../ignite/configuration/ConfigurationModule.java | 14 +-
.../org/apache/ignite/configuration/RootKey.java | 10 +-
...figuration.java => ConfigurationExtension.java} | 12 +-
modules/configuration-presentation/build.gradle | 1 -
modules/configuration/README.md | 76 ++
modules/configuration/build.gradle | 1 +
.../configuration/ConfigurationTreeGenerator.java | 30 +-
.../configuration/DynamicConfiguration.java | 7 +-
.../configuration/NamedListConfiguration.java | 2 +-
.../internal/configuration/RootInnerNode.java | 4 +-
.../configuration/asm/AbstractAsmGenerator.java | 19 +-
.../asm/ConfigurationAsmGenerator.java | 47 +-
.../asm/ConfigurationImplAsmGenerator.java | 73 +-
.../configuration/asm/DirectProxyAsmGenerator.java | 16 +-
.../configuration/asm/InnerNodeAsmGenerator.java | 94 +--
.../configuration/hocon/HoconConverter.java | 3 +-
.../internal/configuration/tree/InnerNode.java | 7 +-
.../configuration/util/ConfigurationFlattener.java | 3 +-
.../configuration/util/ConfigurationUtil.java | 52 +-
.../validation/ConfigurationValidatorImpl.java | 6 +-
.../configuration/ConfigurationRegistryTest.java | 4 +-
.../asm/ConfigurationTreeGeneratorTest.java | 44 +-
.../notifications/ConfigurationListenerTest.java | 4 +-
.../ExtendedDiscoveryConfigurationSchema.java | 4 +-
.../testframework/ConfigurationExtensionTest.java | 11 +-
.../tree/ConverterToMapVisitorTest.java | 3 +-
.../configuration/tree/InternalIdTest.java | 4 +-
.../configuration/util/ConfigurationUtilTest.java | 228 +++++-
.../validation/ConfigurationValidatorImplTest.java | 7 +-
.../validation/OneOfValidatorTest.java | 3 +-
.../validation/PowerOfTwoValidatorTest.java | 3 +-
.../validation/RangeValidatorTest.java | 3 +-
.../storage/TestConfigurationStorage.java | 3 +-
.../testframework/ConfigurationExtension.java | 23 +-
.../testframework/ExtendedConfigurationSchema.java | 4 +-
.../testframework/InjectConfiguration.java | 6 +-
modules/core/build.gradle | 15 +-
.../DistributionZoneAlreadyExistsException.java | 4 +-
.../DistributionZoneBindTableException.java | 4 +-
.../DistributionZoneNotFoundException.java | 4 +-
.../ignite/internal/hlc/HybridTimestamp.java | 19 +-
.../ignite/internal/logger/IgniteLogger.java | 3 +-
.../ignite/internal/manager/EventListener.java | 5 +-
.../internal/properties/IgniteProductVersion.java | 2 +-
.../ignite/internal/sql/AbstractSession.java | 153 ++++
.../ignite/internal}/sql/SyncResultSetAdapter.java | 8 +-
...java => AbstractStripedThreadPoolExecutor.java} | 116 ++-
.../thread/StripedScheduledThreadPoolExecutor.java | 105 +++
.../internal/thread/StripedThreadPoolExecutor.java | 196 +-----
.../internal/tostring/IgniteToStringBuilder.java | 3 +-
.../ignite/internal/util/ExceptionUtils.java | 548 ++++++++++++++-
.../ignite/internal/util/FilteringIterator.java | 5 +-
.../apache/ignite/internal/util/GridUnsafe.java | 10 +-
.../apache/ignite/internal/util/IgniteUtils.java | 47 +-
.../PendingIndependentComparableValuesTracker.java | 4 +-
.../apache/ignite/lang/IgniteExceptionMapper.java | 0
.../ignite/lang/IgniteExceptionMapperUtil.java | 0
.../lang/IgniteExceptionMappersProvider.java | 0
.../lang/IgniteInternalCheckedException.java | 2 +-
.../ignite/lang/IgniteInternalException.java | 15 +-
...eFiveFunction.java => IgnitePentaFunction.java} | 2 +-
...eTetraFunction.java => IgniteQuadFunction.java} | 2 +-
.../apache/ignite/internal/HybridClockTest.java | 3 +-
.../causality/CompletableVersionedValueTest.java | 3 +-
.../causality/IncrementalVersionedValueTest.java | 3 +-
.../ignite/internal/hlc/HybridTimestampTest.java | 80 +++
.../ignite/internal/manager/ProducerTest.java | 5 +-
.../apache/ignite/internal/util/CursorTest.java | 3 +-
.../ignite/internal/util/IgniteNameUtilsTest.java | 12 +-
.../ignite/internal/util/IgniteUtilsTest.java | 7 +-
.../util/PendingComparableValuesTrackerTest.java | 2 -
.../internal/util/RefCountedObjectPoolTest.java | 2 +-
.../subscription/TransformingPublisherTest.java | 3 +-
.../apache/ignite/lang/ExceptionUtilsTest.java} | 7 +-
.../ignite/lang/IgniteExceptionMapperUtilTest.java | 0
.../apache/ignite/lang/IgniteExceptionTest.java | 11 +-
.../lang/TestIgniteExceptionMappersProvider.java | 0
.../testframework/BaseIgniteAbstractTest.java | 14 -
.../testframework/IntegrationTestBase.java | 0
.../testframework/TestIgnitionManager.java | 0
.../testframework/log4j2/LogInspector.java | 364 ++++++++++
.../testframework/matchers/PathMatcher.java | 105 +++
.../resources/java.util.logging.properties | 57 --
.../src/testFixtures/resources/log4j2-test.xml | 58 ++
modules/distribution-zones/build.gradle | 1 +
.../distributionzones/DistributionZoneManager.java | 59 +-
.../distributionzones/DistributionZonesUtil.java | 14 +-
.../CausalityDataNodesEngine.java | 2 +-
.../rebalance/DistributionZoneRebalanceEngine.java | 2 +-
.../distributionzones/rebalance/RebalanceUtil.java | 8 +-
.../utils/CatalogAlterZoneEventListener.java | 212 ++++++
.../BaseDistributionZoneManagerTest.java | 64 +-
.../DistributionZoneFiltersTest.java | 1 -
.../DistributionZoneManagerAlterFilterTest.java | 184 ++---
...ibutionZoneManagerConfigurationChangesTest.java | 101 +--
.../DistributionZoneManagerFilterTest.java | 42 +-
.../DistributionZoneManagerScaleUpTest.java | 618 ++++++++--------
.../DistributionZoneManagerTest.java | 776 +--------------------
.../DistributionZoneManagerWatchListenerTest.java | 36 +-
.../DistributionZoneMockTest.java | 3 +-
.../DistributionZonesSchedulersTest.java | 237 ++++---
.../DistributionZoneCausalityDataNodesTest.java | 545 ++++++---------
.../DistributionZoneRebalanceEngineTest.java | 58 +-
.../utils/CatalogAlterZoneEventListenerTest.java | 267 +++++++
.../DistributionZonesTestUtil.java | 181 +++--
modules/file-transfer/README.md | 26 +
.../{configuration => file-transfer}/build.gradle | 29 +-
.../internal/network/file/ItFileTransferTest.java | 518 ++++++++++++++
.../ignite/internal/network/file/TestCluster.java | 188 +++++
.../ignite/internal/network/file/Channel.java} | 17 +-
.../internal/network/file/ChunkedFileReader.java | 119 ++++
.../internal/network/file/ChunkedFileWriter.java | 112 +++
.../network/file/FileChunkMessagesStream.java | 166 +++++
.../internal/network/file/FileConsumer.java} | 21 +-
.../internal/network/file/FileProvider.java} | 19 +-
.../ignite/internal/network/file/FileReceiver.java | 197 ++++++
.../ignite/internal/network/file/FileSender.java | 266 +++++++
.../network/file/FileTransferMessagesHandler.java | 168 +++++
.../internal/network/file/FileTransferService.java | 69 ++
.../network/file/FileTransferServiceImpl.java | 641 +++++++++++++++++
.../network/file/TransferredFilesCollector.java} | 18 +-
.../network/file/exception/ErrorCodes.java} | 17 +-
.../file/exception/FileTransferException.java} | 31 +-
.../file/exception/FileValidationException.java} | 21 +-
.../network/file/messages/FileChunkMessage.java} | 41 +-
.../network/file/messages/FileChunkResponse.java} | 23 +-
.../file/messages/FileDownloadRequest.java} | 29 +-
.../file/messages/FileDownloadResponse.java} | 23 +-
.../internal/network/file/messages/FileHeader.java | 68 ++
.../network/file/messages/FileTransferError.java | 66 ++
.../file/messages/FileTransferErrorMessage.java} | 29 +-
.../file/messages/FileTransferInitMessage.java} | 50 +-
.../file/messages/FileTransferInitResponse.java} | 23 +-
.../file/messages/FileTransferMessageType.java | 76 ++
.../network/file/messages/Identifier.java} | 19 +-
.../network/file/ChunkedFileReaderTest.java | 86 +++
.../network/file/ChunkedFileWriterTest.java | 81 +++
.../network/file/FileChunkMessagesStreamTest.java | 121 ++++
.../internal/network/file/FileReceiverTest.java | 174 +++++
.../internal/network/file/FileSenderTest.java | 297 ++++++++
.../network/file/FileTransferServiceImplTest.java | 301 ++++++++
.../network/file/TestMessagingService.java | 81 +++
.../internal/network/file/TestTopologyService.java | 68 ++
.../internal/network/file/FileGenerator.java} | 38 +-
.../internal/network/file/PathAssertions.java | 44 ++
modules/index/build.gradle | 1 -
.../apache/ignite/internal/index/IndexManager.java | 51 +-
.../ignite/internal/index/IndexManagerTest.java | 3 +-
modules/jdbc/build.gradle | 1 +
.../apache/ignite/jdbc/ItJdbcErrorsSelfTest.java | 6 +-
.../ignite/jdbc/ItJdbcResultSetSelfTest.java | 24 +-
.../internal/jdbc/ConnectionPropertiesImpl.java | 2 -
.../internal/jdbc/PreparedStatementParamsTest.java | 3 +-
.../ignite/internal/marshaller/FieldAccessor.java | 1 +
.../ignite/internal/marshaller/Marshaller.java | 71 +-
.../ignite/internal/marshaller/MarshallerUtil.java | 58 ++
.../marshaller/UnmappedColumnsException.java | 14 +-
.../TestObjectWithNoDefaultConstructor.java | 4 +
modules/metastorage/build.gradle | 1 +
.../server/AbstractCompoundCondition.java | 3 +-
.../server/AbstractSimpleCondition.java | 11 +-
.../metastorage/server/ExistenceCondition.java | 6 +-
.../metastorage/server/RevisionCondition.java | 6 +-
.../metastorage/server/TombstoneCondition.java | 5 +-
.../ignite/internal/metastorage/server/Value.java | 4 +-
.../metastorage/server/ValueCondition.java | 7 +-
.../impl/MetaStorageManagerRecoveryTest.java | 3 +-
.../metastorage/impl/MetaStorageRangeTest.java | 3 +-
.../metastorage/server/OrConditionTest.java | 3 +-
.../metastorage/server/time/ClusterTimeTest.java | 3 +-
.../server/AbstractKeyValueStorageTest.java | 3 +-
modules/metrics/build.gradle | 1 +
.../metrics/exporters/ItJvmMetricSourceTest.java | 3 +-
.../exporters/ItMetricExportersLoadingTest.java | 3 +-
.../ignite/internal/metrics/MetricManager.java | 2 -
.../ignite/internal/metrics/MetricRegistry.java | 8 +-
.../ignite/internal/metrics/JmxExporterTest.java | 3 +-
.../internal/metrics/MetricConfigurationTest.java | 3 +-
modules/network-annotation-processor/build.gradle | 1 +
.../network/processor/tests/GenerationTest.java | 3 +-
.../apache/ignite/network/ClusterNodeImpl.java} | 33 +-
.../apache/ignite/network/MessagingService.java | 20 +
modules/network/build.gradle | 3 +-
.../network/netty/ItConnectionManagerTest.java | 3 +-
.../network/scalecube/ItClusterServiceTest.java | 3 +-
.../scalecube/ItScaleCubeNetworkMessagingTest.java | 36 +-
.../FileTransferConfigurationSchema.java} | 29 +-
.../configuration/NetworkConfigurationSchema.java | 4 +
.../SslConfigurationValidatorImpl.java | 2 +-
.../network/netty/InboundRecoveryHandler.java | 3 +-
.../serialization/marshal/BuiltInMarshalling.java | 2 -
.../ignite/network/DefaultMessagingService.java | 13 +
.../ScaleCubeDirectMarshallerTransport.java | 3 +-
.../scalecube/ScaleCubeTopologyService.java | 3 +-
.../SslConfigurationValidatorImplTest.java | 3 +-
.../netty/IoExceptionSuppressingHandlerTest.java | 3 +-
.../network/processor/InheritedMessageTest.java | 3 +-
.../network/processor/SerializationOrderTest.java | 3 +-
...TransferableObjectProcessorIncrementalTest.java | 3 +-
.../network/recovery/VaultStateIdsTest.java | 3 +-
.../serialization/ClassDescriptorMergerTest.java | 3 +-
.../network/serialization/MarshallableTest.java | 3 +-
.../marshal/BestEffortInstantiationTest.java | 3 +-
.../marshal/DefaultSchemaMismatchHandlerTest.java | 3 +-
.../DefaultUserObjectMarshallerCommonTest.java | 2 +-
...erObjectMarshallerWithArbitraryObjectsTest.java | 3 -
...ltUserObjectMarshallerWithSchemaChangeTest.java | 3 +-
...ltUserObjectMarshallerWithSerializableTest.java | 14 -
.../marshal/SerializableInstantiationTest.java | 3 +-
.../network/ssl/SslContextProviderTest.java | 3 +-
.../network/AbstractMessagingServiceTest.java | 3 +-
.../network/DefaultMessagingServiceTest.java | 7 +-
.../MessageSerializationRegistryImplTest.java | 3 +-
.../pagememory/datastructure/DataStructure.java | 2 +-
.../persistence/PartitionMetaManagerTest.java | 3 +-
.../AwaitTasksCompletionExecutorTest.java | 3 +-
.../checkpoint/CheckpointDirtyPagesTest.java | 3 +-
.../checkpoint/CheckpointManagerTest.java | 3 +-
.../checkpoint/CheckpointPagesWriterTest.java | 3 +-
.../persistence/checkpoint/CheckpointTest.java | 3 +-
.../checkpoint/CheckpointTimeoutLockTest.java | 7 +-
.../checkpoint/CheckpointWorkflowTest.java | 7 +-
.../persistence/checkpoint/CheckpointerTest.java | 3 +-
.../ReentrantReadWriteLockWithTrackingTest.java | 6 +-
.../persistence/compaction/CompactorTest.java | 7 +-
.../store/AbstractFilePageStoreIoTest.java | 3 +-
.../store/FilePageStoreManagerTest.java | 3 +-
.../persistence/store/FilePageStoreTest.java | 3 +-
.../persistence/store/GroupPageStoresMapTest.java | 3 +-
.../pagememory/util/GradualTaskExecutorTest.java | 3 +-
modules/placement-driver/build.gradle | 2 +
.../internal/placementdriver/ActiveActorTest.java | 14 +-
.../placementdriver/BasePlacementDriverTest.java | 75 ++
.../MultiActorPlacementDriverTest.java | 100 +--
.../PlacementDriverManagerTest.java | 88 +--
.../internal/placementdriver/LeaseUpdater.java | 106 ++-
.../placementdriver/PlacementDriverManager.java | 104 ++-
.../internal/placementdriver/TopologyTracker.java | 3 +-
.../placementdriver/leases/LeaseTracker.java | 168 ++---
.../internal/placementdriver/leases/Leases.java} | 42 +-
.../placementdriver/PlacementDriverTest.java | 3 +-
modules/platforms/build.gradle | 3 +
.../ignite/client/detail/cluster_connection.cpp | 14 +-
.../cpp/ignite/client/detail/cluster_connection.h | 48 +-
.../ignite/client/detail/compute/compute_impl.cpp | 7 +-
.../client/detail/connection_event_handler.h} | 42 +-
.../ignite/client/detail/ignite_client_impl.cpp | 2 +-
.../cpp/ignite/client/detail/node_connection.cpp | 65 +-
.../cpp/ignite/client/detail/node_connection.h | 29 +-
.../cpp/ignite/client/detail/sql/result_set_impl.h | 4 +-
.../cpp/ignite/client/detail/sql/sql_impl.cpp | 7 +-
.../cpp/ignite/client/detail/table/table_impl.cpp | 61 +-
.../cpp/ignite/client/detail/table/tables_impl.cpp | 4 +-
.../client/detail/transaction/transaction_impl.h | 3 +-
.../client/detail/transaction/transactions_impl.h | 8 +-
.../platforms/cpp/ignite/client/detail/utils.cpp | 6 +
modules/platforms/cpp/ignite/odbc/CMakeLists.txt | 1 -
.../platforms/cpp/ignite/odbc/meta/column_meta.cpp | 24 +-
.../platforms/cpp/ignite/odbc/meta/column_meta.h | 18 +-
.../platforms/cpp/ignite/odbc/protocol_version.cpp | 136 ----
.../platforms/cpp/ignite/odbc/protocol_version.h | 186 -----
.../platforms/cpp/ignite/odbc/query/data_query.cpp | 12 +-
.../platforms/cpp/ignite/odbc/sql_connection.cpp | 110 ++-
modules/platforms/cpp/ignite/odbc/sql_connection.h | 42 +-
.../platforms/cpp/ignite/odbc/sql_statement.cpp | 1 +
modules/platforms/cpp/ignite/odbc/type_traits.cpp | 117 +++-
modules/platforms/cpp/ignite/odbc/type_traits.h | 51 --
.../platforms/cpp/ignite/protocol/CMakeLists.txt | 3 +
.../cpp/ignite/protocol/client_operation.h | 4 +-
modules/platforms/cpp/ignite/protocol/messages.cpp | 76 ++
modules/platforms/cpp/ignite/protocol/messages.h | 61 ++
.../{client/detail => protocol}/protocol_context.h | 11 +-
.../cpp/ignite/protocol/protocol_version.cpp | 82 +++
.../{client/detail => protocol}/protocol_version.h | 100 ++-
modules/platforms/cpp/ignite/protocol/utils.cpp | 6 +-
.../cpp/tests/client-test/all_fields_type.h | 3 +
.../client-test/key_value_binary_view_test.cpp | 1 +
.../cpp/tests/client-test/key_value_view_test.cpp | 2 +
.../tests/client-test/record_binary_view_test.cpp | 1 +
.../cpp/tests/client-test/record_view_test.cpp | 2 +
.../platforms/cpp/tests/client-test/sql_test.cpp | 11 +-
.../cpp/tests/odbc-test/connection_test.cpp | 4 +-
.../cpp/tests/odbc-test/meta_queries_test.cpp | 2 +-
.../cpp/tests/odbc-test/odbc_connection.h | 2 +-
.../platforms/cpp/tests/odbc-test/queries_test.cpp | 22 +-
.../dotnet/Apache.Ignite.Benchmarks/Program.cs | 4 +-
.../SerializerHandlerReadBenchmarks.cs | 55 +-
.../ErrorGroupsGenerator.cs | 2 +-
.../dotnet/Apache.Ignite.Tests/.editorconfig | 3 +
.../Apache.Ignite.Tests/ClientSocketTests.cs | 23 +-
.../Apache.Ignite.Tests/Compute/ComputeTests.cs | 10 +-
.../dotnet/Apache.Ignite.Tests/ErrorGroupTests.cs | 2 +-
.../dotnet/Apache.Ignite.Tests/FakeServer.cs | 23 +-
.../dotnet/Apache.Ignite.Tests/IgniteTestsBase.cs | 6 +-
.../Linq/LinqSqlGenerationTests.cs | 4 +-
.../Linq/LinqTests.Aggregate.cs | 22 +-
.../Apache.Ignite.Tests/Linq/LinqTests.GroupBy.cs | 22 +-
.../Apache.Ignite.Tests/Linq/LinqTests.KvView.cs | 22 +-
.../dotnet/Apache.Ignite.Tests/Linq/LinqTests.cs | 2 +-
.../dotnet/Apache.Ignite.Tests/ListLogger.cs | 3 +-
.../Apache.Ignite.Tests/PartitionAwarenessTests.cs | 2 +-
.../Apache.Ignite.Tests/ProjectFilesTests.cs | 5 +-
.../Proto/ColocationHashTests.cs | 7 +-
.../dotnet/Apache.Ignite.Tests/RetryPolicyTests.cs | 8 +-
.../Sql/IgniteDbDataReaderTests.cs | 4 +-
.../Sql/SqlResultSetObjectMappingTests.cs | 2 +-
.../dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs | 8 +-
.../Table/BinaryTupleIgniteTupleAdapterTests.cs | 111 +++
.../Apache.Ignite.Tests/Table/DataStreamerTests.cs | 2 +-
.../Apache.Ignite.Tests/Table/IgniteTupleTests.cs | 36 +-
.../CollectionExtensions.cs => Table/KeyPoco.cs} | 23 +-
.../Table/KeyValueViewBinaryTests.cs | 2 +-
.../Table/KeyValueViewPocoPrimitiveTests.cs | 118 ++--
.../Table/KeyValueViewPocoTests.cs | 123 ++--
.../Table/KeyValueViewPrimitivePocoTests.cs | 97 ++-
.../Apache.Ignite.Tests/Table/PocoAllColumnsSql.cs | 10 +-
.../Table/PocoAllColumnsSqlNullable.cs | 10 +-
.../dotnet/Apache.Ignite.Tests/Table/PocoStruct.cs | 4 +-
.../Table/RecordViewBinaryTests.cs | 17 +-
.../Table/RecordViewCustomMappingTest.cs | 13 +-
.../Table/RecordViewPocoTests.cs | 2 +-
.../Table/RecordViewPrimitiveTests.cs | 3 +-
.../Table/SchemaSynchronizationTest.cs | 371 ++++++++++
.../Table/SchemaValidationTest.cs | 357 ++++++++++
.../Table/Serialization/ReflectionUtilsTests.cs | 21 +-
.../CollectionExtensions.cs => Table/ValPoco.cs} | 26 +-
.../dotnet/Apache.Ignite.Tests/ToStringTests.cs | 3 +-
.../Transactions/TransactionsTests.cs | 29 +-
.../Apache.Ignite/Internal/ClientFailoverSocket.cs | 60 +-
.../dotnet/Apache.Ignite/Internal/ClientSocket.cs | 40 +-
.../Column.cs => Common/CollectionExtensions.cs} | 25 +-
.../Internal/Common/ExceptionExtensions.cs | 52 ++
.../Apache.Ignite/Internal/Compute/Compute.cs | 23 +-
.../Column.cs => IClientSocketEventListener.cs} | 27 +-
.../Internal/Linq/IgniteQueryExecutor.cs | 3 +-
.../Internal/Linq/IgniteQueryExpressionVisitor.cs | 8 +-
.../Apache.Ignite/Internal/Linq/ResultSelector.cs | 27 +-
.../BinaryTuple/BinaryTupleIgniteTupleAdapter.cs | 143 ++++
.../{Table/Column.cs => Proto/ErrorExtensions.cs} | 20 +-
.../dotnet/Apache.Ignite/Internal/Sql/Sql.cs | 16 +-
.../dotnet/Apache.Ignite/Internal/Table/Column.cs | 8 +-
.../Table/{Column.cs => IgniteTupleCommon.cs} | 33 +-
.../Apache.Ignite/Internal/Table/RecordView.cs | 233 +++++--
.../Internal/Table/Serialization/KvPair.cs | 2 +
.../Table/Serialization/ObjectSerializerHandler.cs | 120 +++-
.../Table/Serialization/ReflectionUtils.cs | 22 +-
.../Serialization/SerializerExceptionExtensions.cs | 50 ++
.../Serialization/TuplePairSerializerHandler.cs | 67 ++
.../Table/Serialization/TupleSerializerHandler.cs | 81 ++-
.../dotnet/Apache.Ignite/Internal/Table/Table.cs | 24 +-
.../Internal/Transactions/Transactions.cs | 4 +-
.../dotnet/Apache.Ignite/Table/IIgniteTuple.cs | 18 +
.../dotnet/Apache.Ignite/Table/IgniteTuple.cs | 53 +-
modules/raft/build.gradle | 1 -
.../apache/ignite/internal/raft/ItLozaTest.java | 3 +-
.../raft/ItTruncateSuffixAndRestartTest.java | 3 +-
.../ignite/raft/jraft/core/ItCliServiceTest.java | 23 +-
.../apache/ignite/raft/jraft/core/ItNodeTest.java | 168 +++--
.../raft/server/ItJraftCounterServerTest.java | 2 -
.../raft/server/ItSimpleCounterServerTest.java | 6 +-
.../org/apache/ignite/raft/jraft/JRaftUtils.java | 4 +-
.../ignite/raft/jraft/core/FSMCallerImpl.java | 6 +-
.../apache/ignite/raft/jraft/core/NodeImpl.java | 108 +--
.../raft/jraft/core/ReadOnlyServiceImpl.java | 53 +-
.../apache/ignite/raft/jraft/core/Replicator.java | 19 +-
.../raft/jraft/disruptor/DisruptorBuilder.java | 1 -
.../apache/ignite/raft/jraft/entity/LogEntry.java | 25 +
.../ignite/raft/jraft/entity/ReadIndexStatus.java | 7 +
.../raft/jraft/error/OverloadException.java} | 43 +-
.../ignite/raft/jraft/option/ApplyTaskMode.java} | 15 +-
.../ignite/raft/jraft/option/NodeOptions.java | 78 ++-
.../ignite/raft/jraft/option/RaftOptions.java | 19 +
.../apache/ignite/raft/jraft/rpc/RpcRequests.java | 2 +-
.../raft/jraft/rpc/impl/AbstractClientService.java | 2 +-
.../ignite/raft/jraft/storage/LogManager.java | 8 +
.../raft/jraft/storage/impl/LogManagerImpl.java | 106 +--
.../raft/jraft/storage/impl/RocksDBLogStorage.java | 34 +-
.../storage/snapshot/SnapshotExecutorImpl.java | 2 +-
.../snapshot/local/LocalSnapshotStorage.java | 2 +-
.../raft/jraft/util/StorageOptionsFactory.java | 2 -
.../org/apache/ignite/raft/jraft/util/Utils.java | 11 +
.../raft/JraftGroupEventsListenerTest.java | 3 +-
.../ignite/internal/raft/RaftGroupServiceTest.java | 7 +-
.../impl/RocksDbSharedLogStorageAdvancedTest.java | 3 +-
.../raft/jraft/conf/ConfigurationEntryTest.java | 11 +-
.../raft/jraft/conf/ConfigurationManagerTest.java | 13 +-
.../ignite/raft/jraft/core/BallotBoxTest.java | 15 +-
.../ignite/raft/jraft/core/FSMCallerTest.java | 11 +-
.../ignite/raft/jraft/core/IteratorImplTest.java | 17 +-
.../ignite/raft/jraft/core/IteratorTest.java | 15 +-
.../raft/jraft/core/ReadOnlyServiceTest.java | 51 +-
.../raft/jraft/core/ReplicatorGroupTest.java | 14 +-
.../ignite/raft/jraft/core/ReplicatorTest.java | 21 +-
.../ignite/raft/jraft/entity/LogEntryTest.java | 36 +
.../entity/codec/BaseLogEntryCodecFactoryTest.java | 12 +-
.../raft/jraft/rpc/AbstractClientServiceTest.java | 23 +-
.../jraft/rpc/impl/PingRequestProcessorTest.java | 7 +-
.../impl/cli/AbstractCliRequestProcessorTest.java | 3 +-
.../rpc/impl/cli/BaseCliRequestProcessorTest.java | 13 +-
.../impl/core/BaseNodeRequestProcessorTest.java | 3 +-
.../rpc/impl/core/NodeRequestProcessorTest.java | 11 +-
.../ignite/raft/jraft/storage/BaseStorageTest.java | 3 +-
.../ignite/raft/jraft/storage/FileServiceTest.java | 9 +-
.../raft/jraft/storage/impl/LogManagerTest.java | 7 +
.../impl/VolatileLogStorageSpecificsTest.java | 3 +-
.../storage/snapshot/remote/CopySessionTest.java | 13 +-
.../snapshot/remote/RemoteFileCopierTest.java | 11 +-
.../ignite/raft/jraft/test/MockAsyncContext.java | 3 +-
.../ignite/raft/jraft/util/ThreadIdTest.java | 11 +-
.../service/ItAbstractListenerSnapshotTest.java | 7 +
.../ignite/raft/jraft/core/ExpectClosure.java | 29 +-
.../ignite/raft/jraft/core/MockStateMachine.java | 17 +-
.../ignite/internal/replicator/ReplicaManager.java | 25 +-
.../ignite/internal/replicator/ReplicaService.java | 2 +-
.../client/TopologyAwareRaftGroupServiceTest.java | 3 -
.../replicator/PlacementDriverReplicaSideTest.java | 5 +-
modules/rest-api/build.gradle | 1 +
.../internal/rest/api/cluster/InitCommand.java | 2 +-
.../handler/IgniteExceptionHandlerTest.java | 3 +-
modules/rest/build.gradle | 1 -
.../ConfigurationControllerBaseTest.java | 2 -
modules/rocksdb-common/build.gradle | 1 +
.../ignite/internal/rocksdb/ColumnFamily.java | 11 +-
.../ignite/internal/rocksdb/RocksUtilsTest.java | 3 +-
modules/runner/README.md | 2 +-
modules/runner/build.gradle | 1 -
.../configuration/generator/DefaultsGenerator.java | 2 +-
.../ItDistributedConfigurationPropertiesTest.java | 3 +-
.../ItDistributedConfigurationStorageTest.java | 3 +-
.../storage/ItRebalanceDistributedTest.java | 388 ++++++-----
...niteDistributionZoneManagerNodeRestartTest.java | 366 +++++-----
.../inmemory/ItRaftStorageVolatilityTest.java | 31 +-
.../raftsnapshot/ItTableRaftSnapshotsTest.java | 81 +--
.../rest/authentication/ItAuthenticationTest.java | 3 +-
.../runner/app/AbstractSchemaChangeTest.java | 2 +-
.../runner/app/ItIgniteNodeRestartTest.java | 5 +-
.../ItRaftCommandLeftInLogUntilRestartTest.java | 64 +-
.../runner/app/PlatformTestNodeRunner.java | 10 +-
.../ItThinClientMarshallingEmbeddedTest.java} | 20 +-
.../app/client/ItThinClientMarshallingTest.java | 348 +++++++++
.../ItThinClientSchemaSynchronizationTest.java | 176 ++++-
.../runner/app/client/ItThinClientSqlTest.java | 13 +-
.../ignite/internal/sql/api/ItCommonApiTest.java | 33 +-
.../internal/sql/api/ItSqlAsynchronousApiTest.java | 205 ++++--
.../internal/sql/api/ItSqlSynchronousApiTest.java | 126 +++-
.../internal/sql/engine/ItAggregatesTest.java | 188 ++++-
.../internal/sql/engine/ItDataTypesTest.java | 43 +-
.../ignite/internal/sql/engine/ItDmlTest.java | 79 ++-
.../sql/engine/ItDynamicParameterTest.java | 7 +-
.../internal/sql/engine/ItFunctionsTest.java | 29 +-
.../ignite/internal/sql/engine/ItIntervalTest.java | 4 +
.../internal/sql/engine/ItLimitOffsetTest.java | 41 +-
.../ignite/internal/sql/engine/ItSetOpTest.java | 123 +++-
.../internal/sql/engine/ItSqlOperatorsTest.java | 7 +-
.../ignite/internal/sql/engine/ItZoneDdlTest.java | 122 ++--
.../sql/engine/datatypes/DataTypeTestSpecs.java | 10 +-
.../engine/datatypes/tests/BaseDataTypeTest.java | 32 +-
.../datatypes/tests/BaseDmlDataTypeTest.java | 21 +
.../tests/BaseExpressionDataTypeTest.java | 11 +
.../datatypes/tests/BaseIndexDataTypeTest.java | 20 +-
.../datatypes/tests/BaseQueryDataTypeTest.java | 6 +
.../engine/datatypes/tests/TestTypeArguments.java | 2 +
.../datatypes/uuid/ItUuidExpressionTest.java | 19 +
.../sql/engine/datatypes/uuid/ItUuidQueryTest.java | 2 +-
.../datatypes/varbinary/ItVarBinaryDmlTest.java | 2 +-
.../varbinary/ItVarBinaryExpressionTest.java | 13 -
.../datatypes/varbinary/ItVarBinaryIndexTest.java | 99 +++
.../datatypes/varbinary/ItVarBinaryQueryTest.java | 2 +-
.../apache/ignite/internal/sqllogic/Script.java | 2 -
.../apache/ignite/internal/start/ItStartTest.java | 42 +-
.../streamer/ItAbstractDataStreamerTest.java | 31 +-
.../internal/table/ItReadOnlyTransactionTest.java | 4 +-
.../ignite/internal/table/ItRoReadsTest.java | 112 ++-
.../ignite/internal/table/ItTableScanTest.java | 8 +-
.../internal/table/ItThinClientColocationTest.java | 4 +-
.../sql/aggregate/having/test_having.test | 6 +-
.../sql/cast/test_boolean_cast.test | 73 +-
.../filter/test_constant_comparisons.test_ignore | 12 -
.../sql/filter/test_obsolete_filters.test_ignore | 281 --------
...sert_type.test_ignore => test_insert_type.test} | 1 -
.../src/integrationTest/sql/sqlite/join/join1.test | 7 +-
.../sql/sqlite/join/join1.test_ignore | 159 -----
...est_ignored => select2_erroneous_hash_res.test} | 0
...res.test_ignored => select2_erroneous_res.test} | 0
...test_ignore => select3_erroneous_hash_res.test} | 0
..._res.test_ignore => select3_erroneous_res.test} | 0
.../any_all/test_uncorrelated_all_subquery.test | 22 +-
.../test_uncorrelated_all_subquery.test_ignore | 217 ------
...ignored => test_uncorrelated_any_subquery.test} | 1 -
.../subquery/exists/test_correlated_exists.test | 16 +
.../exists/test_correlated_exists.test_ignore | 17 -
.../scalar/test_count_star_subquery.test_ignore | 2 +-
.../scalar/test_uncorrelated_scalar_subquery.test | 7 +-
.../test_uncorrelated_scalar_subquery.test_ignore | 126 ----
...est_aliasing.test_ignore => test_aliasing.test} | 2 -
.../sql/subquery/table/test_table_subquery.test | 6 +
.../subquery/table/test_table_subquery.test_ignore | 55 --
.../integrationTest/sql/subquery/test_neumann.test | 6 +-
.../integrationTest/sql/types/blob/test_blob.test | 34 +-
.../sql/types/blob/test_blob_cast.test | 20 +-
.../sql/types/blob/test_blob_function.test | 27 +-
.../sql/types/blob/test_blob_operator.test | 45 +-
.../sql/types/blob/test_blob_string.test | 2 +-
.../types/timestamp/test_incorrect_timestamp.test | 30 +-
.../sql/types/timestamp/test_timestamp.test | 26 +-
.../org/apache/ignite/internal/app/IgniteImpl.java | 9 +-
.../internal/configuration/CompoundModule.java | 4 +-
.../internal/configuration/CompoundModuleTest.java | 9 +-
.../configuration/ConfigurationModulesTest.java | 3 +-
.../DistributedConfigurationUpdaterTest.java | 3 +-
.../ignite/internal/sql/engine/util/VarBinary.java | 3 +-
modules/schema/build.gradle | 3 +
.../apache/ignite/internal/schema/BinaryRow.java | 19 -
.../ignite/internal/schema/BinaryRowConverter.java | 82 ++-
.../ignite/internal/schema/BinaryRowImpl.java | 18 +-
.../ignite/internal/schema/ByteBufferRow.java | 84 ---
.../org/apache/ignite/internal/schema/Column.java | 3 +-
.../ignite/internal/schema/ColumnsExtractor.java} | 29 +-
.../ignite/internal/schema/DecimalNativeType.java | 6 -
.../apache/ignite/internal/schema/NativeType.java | 3 +-
.../ignite/internal/schema/NativeTypeSpec.java | 2 +-
.../apache/ignite/internal/schema/NativeTypes.java | 10 +-
.../ignite/internal/schema/SchemaDescriptor.java | 3 +-
.../ignite/internal/schema/SchemaRegistry.java | 10 +-
.../ignite/internal/schema/TemporalNativeType.java | 24 +-
.../ExtendedTableConfigurationSchema.java | 4 +-
.../SchemaDistributedConfigurationModule.java | 2 +-
.../internal/schema/mapping/ColumnMapper.java | 3 +-
.../internal/schema/mapping/ColumnMapperImpl.java | 3 +-
.../internal/schema/mapping/ColumnMapping.java | 3 +-
.../internal/schema/marshaller/KvMarshaller.java | 9 +-
.../internal/schema/marshaller/MarshallerUtil.java | 3 +-
.../schema/marshaller/RecordMarshaller.java | 7 +-
.../marshaller/asm/AsmMarshallerGenerator.java | 5 +-
.../asm/ObjectMarshallerCodeGenerator.java | 12 +
.../marshaller/reflection/ColumnBinding.java | 8 +-
.../marshaller/reflection/KvMarshallerImpl.java | 49 +-
.../schema/marshaller/reflection/Marshaller.java | 72 +-
.../marshaller/reflection/ObjectStatistics.java | 6 +-
.../reflection/RecordMarshallerImpl.java | 32 +-
.../reflection/ReflectionMarshallerFactory.java | 5 +-
.../schema/registry/SchemaRegistryImpl.java | 58 +-
.../schema/registry/UpgradingRowAdapter.java | 40 +-
.../org/apache/ignite/internal/schema/row/Row.java | 52 +-
.../ignite/internal/schema/row/RowAssembler.java | 60 +-
.../apache/ignite/internal/util/ObjectFactory.java | 2 +
.../benchmarks/SerializerBenchmarkTest.java | 7 +-
.../schema/AbstractSchemaConverterTest.java | 6 +-
.../internal/schema/CatalogSchemaManagerTest.java | 3 +-
.../org/apache/ignite/internal/schema/RowTest.java | 2 +-
.../SchemaDistributedConfigurationModuleTest.java | 2 +-
.../configuration/TableValidatorImplTest.java | 3 +-
.../index/IndexValidatorImplTest.java | 3 +-
.../schema/marshaller/KvMarshallerTest.java | 207 +++---
.../schema/marshaller/RecordMarshallerTest.java | 90 ++-
.../RecordMarshallerValidationsTest.java | 9 +-
.../schema/registry/UpgradingRowAdapterTest.java | 3 +-
.../schema/serializer/AbstractSerializerTest.java | 6 +-
.../ignite/internal/schema/BinaryRowMatcher.java | 62 ++
.../schema/testobjects/TestBitmaskObject.java} | 32 +-
.../schema/testobjects/TestSimpleObjectKey.java} | 39 +-
.../schema/testobjects/TestSimpleObjectVal.java} | 41 +-
.../testutils/SchemaConfigurationConverter.java | 3 +-
.../testutils/builder/AbstractIndexBuilder.java | 2 +-
.../builder/ColumnDefinitionBuilderImpl.java | 2 +-
.../builder/HashIndexDefinitionBuilderImpl.java | 2 +-
.../builder/PrimaryKeyDefinitionBuilderImpl.java | 2 +-
.../schema/testutils/builder/SchemaBuilders.java | 2 +-
.../builder/SortedIndexDefinitionBuilderImpl.java | 2 +-
.../builder/TableDefinitionBuilderImpl.java | 2 +-
.../schema/testutils/definition/ColumnType.java | 6 +-
.../AuthenticationProvidersValidatorImpl.java | 2 +-
.../AuthenticationConfigurationValidatorTest.java | 3 +-
.../AuthenticationProvidersValidatorTest.java | 3 +-
.../SecurityConfigurationModuleTest.java | 4 +-
.../AuthenticationManagerImplTest.java | 3 +-
modules/sql-engine/build.gradle | 5 +-
modules/sql-engine/src/main/codegen/config.fmpp | 345 +--------
.../src/main/codegen/includes/parserImpls.ftl | 8 +-
.../internal/sql/api/AsyncResultSetImpl.java | 31 +-
.../internal/sql/api/SessionBuilderImpl.java | 5 +-
.../ignite/internal/sql/api/SessionImpl.java | 76 +-
.../internal/sql/api/StatementBuilderImpl.java | 13 +-
.../ignite/internal/sql/api/StatementImpl.java | 7 +-
.../internal/sql/engine/AsyncSqlCursorImpl.java | 22 +-
.../internal/sql/engine/SqlQueryProcessor.java | 21 +-
.../internal/sql/engine/exec/ArrayRowHandler.java | 6 +-
.../sql/engine/exec/DestinationFactory.java | 110 +++
.../sql/engine/exec/ExchangeServiceImpl.java | 43 +-
.../internal/sql/engine/exec/ExecutableTable.java | 6 +
.../engine/exec/ExecutableTableRegistryImpl.java | 6 +
.../engine/exec/ExecutionDependencyResolver.java | 3 +-
.../exec/ExecutionDependencyResolverImpl.java | 37 +-
.../sql/engine/exec/ExecutionServiceImpl.java | 19 +-
.../sql/engine/exec/LogicalRelImplementor.java | 89 ++-
.../sql/engine/exec/ResolvedDependencies.java | 9 +
.../internal/sql/engine/exec/RowHandler.java | 34 +-
.../internal/sql/engine/exec/RuntimeHashIndex.java | 2 -
.../sql/engine/exec/TableFunctionScan.java | 2 -
.../sql/engine/exec/UpdatableTableImpl.java | 147 ++--
.../sql/engine/exec/ddl/DdlCommandHandler.java | 6 +-
.../engine/exec/ddl/DdlCommandHandlerWrapper.java | 12 +-
.../exec/ddl/DdlToCatalogCommandConverter.java | 13 +
.../sql/engine/exec/exp/ExpressionFactoryImpl.java | 57 +-
.../sql/engine/exec/exp/IgniteSqlFunctions.java | 111 +--
.../internal/sql/engine/exec/exp/RexImpTable.java | 13 +-
.../sql/engine/exec/exp/agg/Accumulator.java | 5 +-
.../engine/exec/exp/agg/AccumulatorWrapper.java | 4 -
.../sql/engine/exec/exp/agg/Accumulators.java | 178 +----
.../engine/exec/exp/agg/AccumulatorsFactory.java | 25 +-
.../sql/engine/exec/exp/agg/AggregateRow.java | 86 +++
.../internal/sql/engine/exec/exp/agg/GroupKey.java | 21 +-
.../sql/engine/exec/rel/AbstractSetOpNode.java | 170 +++--
.../sql/engine/exec/rel/HashAggregateNode.java | 146 ++--
.../sql/engine/exec/rel/IntersectNode.java | 97 ++-
.../sql/engine/exec/rel/MergeJoinNode.java | 17 +-
.../internal/sql/engine/exec/rel/MinusNode.java | 94 ++-
.../internal/sql/engine/exec/rel/ModifyNode.java | 60 +-
.../sql/engine/exec/rel/NestedLoopJoinNode.java | 17 +-
.../internal/sql/engine/exec/rel/RootNode.java | 14 +-
.../internal/sql/engine/exec/rel/SingleNode.java | 5 +-
.../sql/engine/exec/rel/SortAggregateNode.java | 69 +-
.../sql/engine/exec/row/BaseTypeSpec.java} | 65 +-
.../sql/engine/exec/row/NullTypeSpec.java} | 34 +-
.../internal/sql/engine/exec/row/RowSchema.java | 104 +++
.../sql/engine/exec/row/RowSchemaTypes.java | 85 +++
.../internal/sql/engine/exec/row/RowType.java} | 63 +-
.../internal/sql/engine/exec/row/TypeSpec.java} | 43 +-
.../internal/sql/engine/externalize/RelJson.java | 24 +-
.../sql/engine/metadata/ColocationGroup.java | 2 -
.../sql/engine/metadata/FragmentMapping.java | 3 +-
.../internal/sql/engine/prepare/CacheKey.java | 26 +-
.../engine/prepare/IgniteSqlToRelConvertor.java | 119 +++-
.../sql/engine/prepare/IgniteSqlValidator.java | 73 +-
.../sql/engine/prepare/IgniteTypeCoercion.java | 2 +-
.../sql/engine/prepare/PlanningContext.java | 5 +-
.../sql/engine/prepare/PrepareServiceImpl.java | 36 +-
.../sql/engine/rel/agg/IgniteMapHashAggregate.java | 26 +-
.../sql/engine/rel/agg/IgniteMapSortAggregate.java | 20 +-
.../engine/rel/agg/IgniteReduceHashAggregate.java | 5 -
.../sql/engine/rel/agg/MapReduceAggregates.java | 347 +++++++++
.../engine/rel/set/IgniteColocatedIntersect.java | 9 +
.../sql/engine/rel/set/IgniteColocatedMinus.java | 9 +
.../sql/engine/rel/set/IgniteMapIntersect.java | 17 +-
.../sql/engine/rel/set/IgniteMapMinus.java | 12 +-
.../sql/engine/rel/set/IgniteMapSetOp.java | 32 +-
.../internal/sql/engine/rel/set/IgniteMinus.java | 10 +-
.../sql/engine/rel/set/IgniteMinusBase.java | 104 ---
.../sql/engine/rel/set/IgniteReduceIntersect.java | 18 +-
.../sql/engine/rel/set/IgniteReduceMinus.java | 12 +-
.../engine/rule/HashAggregateConverterRule.java | 71 +-
.../sql/engine/rule/SetOpConverterRule.java | 3 +-
.../engine/rule/SortAggregateConverterRule.java | 68 +-
.../sql/engine/rule/TableModifyConverterRule.java | 27 +-
.../sql/engine/schema/CatalogColumnDescriptor.java | 11 +-
.../sql/engine/schema/CatalogSqlSchemaManager.java | 98 ++-
.../internal/sql/engine/schema/IgniteSchema.java | 32 +-
.../sql/engine/schema/IgniteSchemaTable.java | 4 +-
.../sql/engine/schema/SqlSchemaManager.java | 24 +-
.../sql/engine/schema/SqlSchemaManagerImpl.java | 54 +-
.../internal/sql/engine/sql/IgniteSqlParser.java | 103 ++-
.../sql/engine/trait/DistributionFunction.java | 73 --
.../sql/engine/trait/DistributionTrait.java | 8 -
.../sql/engine/trait/IgniteDistribution.java | 11 -
.../sql/engine/type/IgniteTypeFactory.java | 5 +-
.../internal/sql/engine/type/IgniteTypeSystem.java | 11 +-
.../ignite/internal/sql/engine/util/Commons.java | 47 +-
.../sql/engine/util/HashFunctionFactory.java | 6 +-
.../sql/engine/util/HashFunctionFactoryImpl.java | 25 +-
.../engine/util/IgniteCustomAssigmentsRules.java | 275 ++++++++
.../internal/sql/engine/util/IgniteResource.java | 14 +-
.../ignite/internal/sql/engine/util/PlanUtils.java | 125 ++++
.../engine/util/SqlExceptionMapperProvider.java | 63 ++
.../ignite/internal/sql/engine/util/TypeUtils.java | 93 ++-
.../sql/engine/AsyncSqlCursorImplTest.java | 117 ++++
.../internal/sql/engine/StopCalciteModuleTest.java | 13 +-
.../apache/ignite/internal/sql/engine/TestRow.java | 2 -
.../exec/ExecutableTableRegistrySelfTest.java | 3 +-
.../exec/ExecutionDependencyResolverSelfTest.java | 10 +-
.../sql/engine/exec/ExecutionServiceImplTest.java | 22 +-
.../sql/engine/exec/MockedStructuresTest.java | 25 +-
.../sql/engine/exec/RuntimeSortedIndexTest.java | 4 +-
.../engine/exec/TestExecutableTableRegistry.java | 6 +
.../DdlCommandHandlerExceptionHandlingTest.java | 95 +--
.../exec/ddl/DdlToCatalogCommandConverterTest.java | 150 ++++
.../ddl/DistributionZoneDdlCommandHandlerTest.java | 179 +----
.../engine/exec/exp/ExpressionFactoryImplTest.java | 4 +-
.../engine/exec/exp/IgniteSqlFunctionsTest.java | 34 +-
.../sql/engine/exec/rel/AbstractExecutionTest.java | 6 +-
.../exec/rel/AbstractSetOpExecutionTest.java | 20 +-
.../sql/engine/exec/rel/BaseAggregateTest.java | 20 +
.../sql/engine/exec/rel/ExchangeExecutionTest.java | 13 +-
.../sql/engine/exec/rel/ExecutionTest.java | 16 +-
.../exec/rel/HashAggregateExecutionTest.java | 9 +-
.../rel/HashAggregateSingleGroupExecutionTest.java | 129 ++--
.../exec/rel/HashIndexSpoolExecutionTest.java | 3 +-
.../exec/rel/IndexScanNodeExecutionTest.java | 7 +-
.../engine/exec/rel/IntersectExecutionTest.java | 4 +-
.../sql/engine/exec/rel/MinusExecutionTest.java | 4 +-
.../engine/exec/rel/ScannableTableSelfTest.java | 22 +-
.../exec/rel/SortAggregateExecutionTest.java | 9 +-
.../exec/rel/SortedIndexSpoolExecutionTest.java | 3 +-
.../exec/rel/TableScanNodeExecutionTest.java | 13 +-
.../engine/exec/rel/TableSpoolExecutionTest.java | 3 +-
.../sql/engine/exec/row/RowSchemaTest.java | 76 ++
.../sql/engine/exec/row/RowSchemaTypesTest.java | 221 ++++++
.../engine/exec/schema/SqlSchemaManagerTest.java | 37 +-
.../engine/framework/ClusterServiceFactory.java | 12 +-
.../sql/engine/framework/NoOpTransaction.java | 30 +-
.../engine/framework/PredefinedSchemaManager.java | 39 +-
.../sql/engine/framework/TestBuilders.java | 27 +-
.../sql/engine/framework/TestClusterTest.java | 3 +-
.../internal/sql/engine/framework/TestNode.java | 5 +-
.../planner/AbstractAggregatePlannerTest.java | 115 +--
.../sql/engine/planner/AbstractPlannerTest.java | 12 +-
.../sql/engine/planner/AggregatePlannerTest.java | 69 +-
.../sql/engine/planner/CastResolutionTest.java | 362 ++++++++++
.../planner/ColocatedHashAggregatePlannerTest.java | 33 +
.../planner/ColocatedSortAggregatePlannerTest.java | 34 +
.../sql/engine/planner/DmlPlannerTest.java | 52 +-
.../sql/engine/planner/DynamicParametersTest.java | 10 +-
.../sql/engine/planner/ImplicitCastsTest.java | 2 +-
.../sql/engine/planner/JoinCommutePlannerTest.java | 6 +-
.../planner/MapReduceHashAggregatePlannerTest.java | 90 ++-
.../planner/MapReduceSortAggregatePlannerTest.java | 89 ++-
.../sql/engine/planner/UnionPlannerTest.java | 23 +-
.../sql/engine/prepare/TypeCoercionTest.java | 30 +-
.../engine/schema/CatalogSqlSchemaManagerTest.java | 25 +-
.../engine/sql/IgniteSqlDecimalLiteralTest.java | 10 -
.../sql/engine/sql/IgniteSqlParserTest.java | 61 +-
.../internal/sql/engine/sql/SqlDdlParserTest.java | 4 +-
.../sql/engine/sql/SqlReservedWordsTest.java | 265 +++++++
.../internal/sql/engine/util/CommonsTest.java | 54 ++
.../internal/sql/engine/util/PlanUtilsTest.java | 113 +++
.../internal/sql/engine/util/StatementChecker.java | 27 +-
.../internal/sql/engine/util/TypeUtilsTest.java | 183 ++++-
modules/sql-engine/src/test/resources/tpch/q11.sql | 4 +-
.../internal/sql/engine/util/SqlTestUtils.java | 22 +
.../internal/storage/DataStorageManagerTest.java | 3 +-
.../internal/storage/DataStorageModulesTest.java | 3 +-
.../ExistingDataStorageValidatorTest.java | 3 +-
.../internal/storage/util/LockHolderTest.java | 4 +-
.../storage/util/MvPartitionStoragesTest.java | 3 +-
.../AbstractMvPartitionStorageConcurrencyTest.java | 35 +-
.../storage/AbstractMvPartitionStorageGcTest.java | 21 +-
.../storage/AbstractMvPartitionStorageTest.java | 117 ++--
.../storage/AbstractMvTableStorageTest.java | 4 +-
.../internal/storage/BaseMvStoragesTest.java | 42 +-
.../storage/impl/TestMvPartitionStorage.java | 10 +-
.../storage/index/AbstractIndexStorageTest.java | 3 +-
.../PersistentPageMemoryDataRegionTest.java | 3 +-
.../PageMemoryDataRegionValidatorImplTest.java | 3 +-
.../storage/pagememory/index/InlineUtilsTest.java | 3 +-
.../AbstractPageMemoryMvPartitionStorageTest.java | 11 +-
.../storage/pagememory/mv/BlobStorageTest.java | 3 +-
...PersistentPageMemoryMvPartitionStorageTest.java | 3 +-
.../storage/rocksdb/PartitionDataHelper.java | 10 +-
.../storage/rocksdb/RocksDbMvPartitionStorage.java | 23 +-
.../instance/SharedRocksDbInstanceCreator.java | 12 +-
.../storage/rocksdb/RocksDbStorageEngineTest.java | 3 +-
.../RocksDbDataRegionValidatorImplTest.java | 3 +-
modules/table/build.gradle | 1 -
.../ItAbstractInternalTableScanTest.java | 4 +-
.../ItInternalTableReadOnlyOperationsTest.java | 13 +-
.../ignite/distributed/ItTablePersistenceTest.java | 43 +-
.../distributed/ItTxDistributedTestSingleNode.java | 12 +-
.../ignite/distributed/ReplicaUnavailableTest.java | 27 +-
.../ignite/internal/table/ItColocationTest.java | 16 +-
.../schema/marshaller/TupleMarshaller.java | 7 +-
.../schema/marshaller/TupleMarshallerImpl.java | 58 +-
.../internal/table/AbstractRowTupleAdapter.java | 35 +-
.../apache/ignite/internal/table/DataStreamer.java | 2 -
.../apache/ignite/internal/table/IndexWrapper.java | 12 +-
.../internal/table/KeyValueBinaryViewImpl.java | 91 ++-
.../ignite/internal/table/KeyValueViewImpl.java | 85 ++-
.../internal/table/MutableRowTupleAdapter.java | 33 +-
.../internal/table/RecordBinaryViewImpl.java | 77 +-
.../ignite/internal/table/RecordViewImpl.java | 63 +-
.../apache/ignite/internal/table/TableImpl.java | 8 +-
.../org/apache/ignite/internal/table/TableRow.java | 13 +-
.../table/distributed/HashIndexLocker.java | 20 +-
.../internal/table/distributed/IndexLocker.java | 18 +-
.../table/distributed/SortedIndexLocker.java | 21 +-
.../table/distributed/StorageUpdateHandler.java | 81 ++-
.../internal/table/distributed/TableManager.java | 38 +-
.../table/distributed/TableMessageGroup.java | 6 +
.../distributed/TableSchemaAwareIndexStorage.java | 21 +-
.../distributed/command/PartitionCommand.java | 5 +
.../distributed/command/UpdateAllCommand.java | 4 +-
.../table/distributed/command/UpdateCommand.java | 13 +-
.../distributed/index/IndexUpdateHandler.java | 4 +-
.../distributed/raft/PartitionDataStorage.java | 9 +
.../table/distributed/raft/PartitionListener.java | 31 +-
.../snapshot/incoming/IncomingSnapshotCopier.java | 7 +-
.../snapshot/message/SnapshotMvDataResponse.java | 4 +-
.../raft/snapshot/outgoing/OutgoingSnapshot.java | 24 +-
.../SnapshotAwarePartitionDataStorage.java | 8 +
...owReplicaRequest.java => BinaryRowMessage.java} | 26 +-
.../request/MultipleRowReplicaRequest.java | 15 +-
.../request/ReadWriteMultiRowReplicaRequest.java | 5 +
.../ReadWriteScanRetrieveBatchReplicaRequest.java | 4 +
.../request/ReadWriteSingleRowReplicaRequest.java | 5 +
.../request/ReadWriteSwapRowReplicaRequest.java | 5 +
.../request/SingleRowReplicaRequest.java | 6 +-
.../replication/request/SwapRowReplicaRequest.java | 10 +-
.../replicator/PartitionReplicaListener.java | 708 ++++++++++---------
.../distributed/schema/SchemaSyncService.java | 44 ++
.../distributed/schema/SchemaSyncServiceImpl.java | 54 ++
.../distributed/storage/InternalTableImpl.java | 274 ++++----
.../table/ColocationHashCalculationTest.java | 5 +-
.../KeyValueViewOperationsSimpleSchemaTest.java | 2 -
.../internal/table/KeyValueViewOperationsTest.java | 6 +-
.../internal/table/MutableRowTupleAdapterTest.java | 2 -
.../table/RecordBinaryViewOperationsTest.java | 2 -
.../internal/table/RecordViewOperationsTest.java | 3 -
.../RepeatedFinishReadWriteTransactionTest.java | 6 +-
.../apache/ignite/internal/table/TxLocalTest.java | 62 +-
.../distributed/ConfiguredTablesCacheTest.java | 3 +-
.../internal/table/distributed/IndexBaseTest.java | 84 ++-
.../table/distributed/LowWatermarkTest.java | 3 +-
.../table/distributed/PartitionMoverTest.java | 3 +-
.../distributed/StorageUpdateHandlerTest.java | 5 +-
.../table/distributed/TableManagerTest.java | 222 +++---
.../PartitionRaftCommandsSerializationTest.java | 41 +-
.../internal/table/distributed/gc/MvGcTest.java | 3 +-
.../gc/VolatilePageMemoryGcUpdateHandlerTest.java | 2 -
.../distributed/index/IndexUpdateHandlerTest.java | 3 +-
.../raft/PartitionCommandListenerTest.java | 53 +-
.../raft/snapshot/PartitionAccessImplTest.java | 3 +-
.../PartitionSnapshotStorageFactoryTest.java | 3 +-
.../snapshot/PartitionSnapshotStorageTest.java | 3 +-
.../incoming/IncomingSnapshotCopierTest.java | 14 +-
.../incoming/IncomingSnapshotReaderTest.java | 3 +-
.../outgoing/OutgoingSnapshotCommonTest.java | 3 +-
.../OutgoingSnapshotMvDataStreamingTest.java | 82 ++-
.../outgoing/OutgoingSnapshotReaderTest.java | 3 +-
.../OutgoingSnapshotTxDataStreamingTest.java | 3 +-
.../outgoing/OutgoingSnapshotsManagerTest.java | 3 +-
.../SnapshotAwarePartitionDataStorageTest.java | 3 +-
.../snapshot/outgoing/SnapshotMetaUtilsTest.java | 3 +-
.../PartitionReplicaListenerIndexLockingTest.java | 99 ++-
.../replication/PartitionReplicaListenerTest.java | 249 ++++---
.../distributed/schema/FullTableSchemaTest.java | 3 -
.../schema/SchemaSyncServiceImplTest.java | 85 +++
.../distributed/storage/InternalTableImplTest.java | 3 +-
.../table/type/NumericTypesSerializerTest.java | 2 -
.../distributed/TestPartitionDataStorage.java | 5 +
.../ignite/internal/table/TxAbstractTest.java | 49 +-
.../table/impl/DummyInternalTableImpl.java | 82 +--
.../table/impl/DummySchemaManagerImpl.java | 18 +-
.../internal/table/impl/TestTupleBuilder.java | 32 +-
.../ignite/internal/tx/InternalTransaction.java | 4 +-
.../org/apache/ignite/internal/tx/Timestamp.java | 3 +-
.../ignite/internal/tx/impl/HeapLockManager.java | 5 +-
.../tx/impl/IgniteAbstractTransactionImpl.java | 4 +-
.../internal/tx/impl/ReadWriteTransactionImpl.java | 32 +-
.../apache/ignite/internal/tx/TxManagerTest.java | 5 +-
.../tx/impl/ReadOnlyTransactionImplTest.java | 3 +-
.../tx/impl/ReadWriteTransactionImplTest.java | 3 +-
packaging/common/bootstrap-functions.sh | 4 +-
packaging/docker/docker-entrypoint.sh | 4 +-
packaging/odbc/build.gradle | 4 +-
settings.gradle | 2 +
1082 files changed, 27687 insertions(+), 14445 deletions(-)
delete mode 100644 config/java.util.logging.properties
rename modules/{core => api}/src/main/java/org/apache/ignite/lang/ErrorGroup.java (100%)
rename modules/{core => api}/src/main/java/org/apache/ignite/lang/ErrorGroups.java (100%)
delete mode 100755 modules/api/src/main/java/org/apache/ignite/lang/IgniteExceptionUtils.java
rename modules/{core => api}/src/main/java/org/apache/ignite/lang/TraceableException.java (100%)
rename modules/{core/src/main/java/org/apache/ignite/internal => api/src/main/java/org/apache/ignite/lang}/util/IgniteNameUtils.java (91%)
copy modules/{core/src/main/java/org/apache/ignite/internal => api/src/main/java/org/apache/ignite/lang}/util/StringUtils.java (97%)
create mode 100755 modules/api/src/main/java/org/apache/ignite/lang/util/TraceIdUtils.java
create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogValidationException.java
create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractUpdateZoneCommandParams.java
copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{DropZoneParams.java => DataStorageParams.java} (51%)
create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerValidationTest.java
create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
create mode 100644 modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
create mode 100644 modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectionHeartbeatTest.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/call/connect/ConnectCallInput.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectOptions.java
copy modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => ConnectEvent.java} (63%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/ConnectionHeartBeat.java
copy modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => ConnectionLostEvent.java} (74%)
copy modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => ConnectionRestoredEvent.java} (73%)
copy modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => DisconnectEvent.java} (74%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/EventListeningActivationPoint.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/event/ConnectionEventListener.java
copy modules/{platforms/dotnet/Apache.Ignite.Tests/Table/PocoStruct.cs => cli/src/main/java/org/apache/ignite/internal/cli/event/Event.java} (82%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/event/EventFactory.java
copy buildscripts/java-test-fixtures.gradle => modules/cli/src/main/java/org/apache/ignite/internal/cli/event/EventListener.java (81%)
copy buildscripts/java-test-fixtures.gradle => modules/cli/src/main/java/org/apache/ignite/internal/cli/event/EventPublisher.java (76%)
rename modules/cli/src/main/java/org/apache/ignite/internal/cli/{core/repl/AsyncSessionEventListener.java => event/EventSubscriptionManager.java} (74%)
copy modules/{platforms/dotnet/Apache.Ignite.Tests/Table/PocoStruct.cs => cli/src/main/java/org/apache/ignite/internal/cli/event/EventType.java} (81%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/event/Events.java
create mode 100644 modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java
create mode 100644 modules/client-handler/src/test/java/org/apache/ignite/client/handler/requests/jdbc/JdbcQueryCursorSelfTest.java
copy modules/{api/src/main/java/org/apache/ignite/network/ClusterNode.java => client/src/main/java/org/apache/ignite/internal/client/ClientClusterNode.java} (74%)
mode change 100644 => 100755
rename modules/configuration-api/src/main/java/org/apache/ignite/configuration/annotation/{InternalConfiguration.java => ConfigurationExtension.java} (74%)
rename modules/{api/src/main/java/org/apache/ignite/lang => core/src/main/java/org/apache/ignite/internal/distributionzones}/DistributionZoneAlreadyExistsException.java (92%)
rename modules/{api/src/main/java/org/apache/ignite/lang => core/src/main/java/org/apache/ignite/internal/distributionzones}/DistributionZoneBindTableException.java (93%)
rename modules/{api/src/main/java/org/apache/ignite/lang => core/src/main/java/org/apache/ignite/internal/distributionzones}/DistributionZoneNotFoundException.java (93%)
create mode 100755 modules/core/src/main/java/org/apache/ignite/internal/sql/AbstractSession.java
rename modules/{api/src/main/java/org/apache/ignite => core/src/main/java/org/apache/ignite/internal}/sql/SyncResultSetAdapter.java (94%)
copy modules/core/src/main/java/org/apache/ignite/internal/thread/{StripedThreadPoolExecutor.java => AbstractStripedThreadPoolExecutor.java} (63%)
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/thread/StripedScheduledThreadPoolExecutor.java
rename modules/{api => core}/src/main/java/org/apache/ignite/lang/IgniteExceptionMapper.java (100%)
rename modules/{api => core}/src/main/java/org/apache/ignite/lang/IgniteExceptionMapperUtil.java (100%)
rename modules/{api => core}/src/main/java/org/apache/ignite/lang/IgniteExceptionMappersProvider.java (100%)
rename modules/core/src/main/java/org/apache/ignite/lang/{IgniteFiveFunction.java => IgnitePentaFunction.java} (97%)
rename modules/core/src/main/java/org/apache/ignite/lang/{IgniteTetraFunction.java => IgniteQuadFunction.java} (97%)
mode change 100755 => 100644
rename modules/{api/src/test/java/org/apache/ignite/lang/IgniteExceptionUtilsTest.java => core/src/test/java/org/apache/ignite/lang/ExceptionUtilsTest.java} (96%)
rename modules/{api => core}/src/test/java/org/apache/ignite/lang/IgniteExceptionMapperUtilTest.java (100%)
rename modules/{api => core}/src/test/java/org/apache/ignite/lang/IgniteExceptionTest.java (95%)
rename modules/{api => core}/src/test/java/org/apache/ignite/lang/TestIgniteExceptionMappersProvider.java (100%)
rename modules/{api => core}/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java (100%)
rename modules/{api => core}/src/testFixtures/java/org/apache/ignite/internal/testframework/TestIgnitionManager.java (100%)
create mode 100755 modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/log4j2/LogInspector.java
create mode 100644 modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/matchers/PathMatcher.java
delete mode 100644 modules/core/src/testFixtures/resources/java.util.logging.properties
create mode 100755 modules/core/src/testFixtures/resources/log4j2-test.xml
create mode 100644 modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListener.java
create mode 100644 modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListenerTest.java
create mode 100644 modules/file-transfer/README.md
copy modules/{configuration => file-transfer}/build.gradle (62%)
create mode 100644 modules/file-transfer/src/integrationTest/java/org/apache/ignite/internal/network/file/ItFileTransferTest.java
create mode 100644 modules/file-transfer/src/integrationTest/java/org/apache/ignite/internal/network/file/TestCluster.java
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/PartitionCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/Channel.java} (70%)
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/ChunkedFileReader.java
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/ChunkedFileWriter.java
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileChunkMessagesStream.java
copy modules/{sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionDependencyResolver.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileConsumer.java} (53%)
copy modules/{sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionDependencyResolver.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileProvider.java} (65%)
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileReceiver.java
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileSender.java
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileTransferMessagesHandler.java
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileTransferService.java
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/FileTransferServiceImpl.java
copy modules/{sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionDependencyResolver.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/TransferredFilesCollector.java} (67%)
copy modules/{binary-tuple/build.gradle => file-transfer/src/main/java/org/apache/ignite/internal/network/file/exception/ErrorCodes.java} (66%)
copy modules/{configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ErrorInternal1ConfigurationSchema.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/exception/FileTransferException.java} (57%)
copy modules/{configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ErrorInternal1ConfigurationSchema.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/exception/FileValidationException.java} (63%)
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/UpdateCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileChunkMessage.java} (55%)
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/UpdateCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileChunkResponse.java} (66%)
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/UpdateCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileDownloadRequest.java} (60%)
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/UpdateCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileDownloadResponse.java} (59%)
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileHeader.java
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileTransferError.java
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/UpdateCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileTransferErrorMessage.java} (64%)
copy modules/{cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/raft/commands/ClusterNodeMessage.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileTransferInitMessage.java} (52%)
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/UpdateCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileTransferInitResponse.java} (65%)
create mode 100644 modules/file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/FileTransferMessageType.java
copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/command/UpdateAllCommand.java => file-transfer/src/main/java/org/apache/ignite/internal/network/file/messages/Identifier.java} (61%)
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/ChunkedFileReaderTest.java
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/ChunkedFileWriterTest.java
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileChunkMessagesStreamTest.java
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileReceiverTest.java
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileSenderTest.java
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/TestMessagingService.java
create mode 100644 modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/TestTopologyService.java
copy modules/{raft/src/test/java/org/apache/ignite/raft/jraft/storage/BaseStorageTest.java => file-transfer/src/testFixtures/java/org/apache/ignite/internal/network/file/FileGenerator.java} (55%)
create mode 100644 modules/file-transfer/src/testFixtures/java/org/apache/ignite/internal/network/file/PathAssertions.java
copy buildscripts/java-test-fixtures.gradle => modules/marshaller-common/src/main/java/org/apache/ignite/internal/marshaller/UnmappedColumnsException.java (78%)
copy modules/{api/src/main/java/org/apache/ignite/network/ClusterNode.java => network-api/src/main/java/org/apache/ignite/network/ClusterNodeImpl.java} (77%)
mode change 100644 => 100755
copy modules/{configuration/src/testFixtures/java/org/apache/ignite/internal/configuration/testframework/ExtendedConfigurationSchema.java => network/src/main/java/org/apache/ignite/internal/network/configuration/FileTransferConfigurationSchema.java} (55%)
create mode 100644 modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/BasePlacementDriverTest.java
copy modules/{cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionInfo.java => placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/leases/Leases.java} (52%)
copy modules/{metastorage/src/main/java/org/apache/ignite/internal/metastorage/server/TombstoneCondition.java => platforms/cpp/ignite/client/detail/connection_event_handler.h} (52%)
delete mode 100644 modules/platforms/cpp/ignite/odbc/protocol_version.cpp
delete mode 100644 modules/platforms/cpp/ignite/odbc/protocol_version.h
create mode 100644 modules/platforms/cpp/ignite/protocol/messages.cpp
create mode 100644 modules/platforms/cpp/ignite/protocol/messages.h
rename modules/platforms/cpp/ignite/{client/detail => protocol}/protocol_context.h (86%)
create mode 100644 modules/platforms/cpp/ignite/protocol/protocol_version.cpp
rename modules/platforms/cpp/ignite/{client/detail => protocol}/protocol_version.h (63%)
create mode 100644 modules/platforms/dotnet/Apache.Ignite.Tests/Table/BinaryTupleIgniteTupleAdapterTests.cs
copy modules/platforms/dotnet/Apache.Ignite.Tests/{Common/CollectionExtensions.cs => Table/KeyPoco.cs} (72%)
create mode 100644 modules/platforms/dotnet/Apache.Ignite.Tests/Table/SchemaSynchronizationTest.cs
create mode 100644 modules/platforms/dotnet/Apache.Ignite.Tests/Table/SchemaValidationTest.cs
copy modules/platforms/dotnet/Apache.Ignite.Tests/{Common/CollectionExtensions.cs => Table/ValPoco.cs} (68%)
copy modules/platforms/dotnet/Apache.Ignite/Internal/{Table/Column.cs => Common/CollectionExtensions.cs} (61%)
create mode 100644 modules/platforms/dotnet/Apache.Ignite/Internal/Common/ExceptionExtensions.cs
copy modules/platforms/dotnet/Apache.Ignite/Internal/{Table/Column.cs => IClientSocketEventListener.cs} (64%)
create mode 100644 modules/platforms/dotnet/Apache.Ignite/Internal/Proto/BinaryTuple/BinaryTupleIgniteTupleAdapter.cs
copy modules/platforms/dotnet/Apache.Ignite/Internal/{Table/Column.cs => Proto/ErrorExtensions.cs} (69%)
copy modules/platforms/dotnet/Apache.Ignite/Internal/Table/{Column.cs => IgniteTupleCommon.cs} (59%)
create mode 100644 modules/platforms/dotnet/Apache.Ignite/Internal/Table/Serialization/SerializerExceptionExtensions.cs
rename modules/{core/src/main/java/org/apache/ignite/internal/util/StringUtils.java => raft/src/main/java/org/apache/ignite/raft/jraft/error/OverloadException.java} (52%)
copy modules/{configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ErrorInternal3ConfigurationSchema.java => raft/src/main/java/org/apache/ignite/raft/jraft/option/ApplyTaskMode.java} (67%)
rename modules/{platforms/dotnet/Apache.Ignite.Tests/Common/CollectionExtensions.cs => runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientMarshallingEmbeddedTest.java} (71%)
create mode 100644 modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientMarshallingTest.java
delete mode 100644 modules/runner/src/integrationTest/sql/filter/test_constant_comparisons.test_ignore
delete mode 100644 modules/runner/src/integrationTest/sql/filter/test_obsolete_filters.test_ignore
rename modules/runner/src/integrationTest/sql/insert/{test_insert_type.test_ignore => test_insert_type.test} (88%)
delete mode 100644 modules/runner/src/integrationTest/sql/sqlite/join/join1.test_ignore
rename modules/runner/src/integrationTest/sql/sqlite/select2/{select2_erroneous_hash_res.test_ignored => select2_erroneous_hash_res.test} (100%)
rename modules/runner/src/integrationTest/sql/sqlite/select2/{select2_erroneous_res.test_ignored => select2_erroneous_res.test} (100%)
rename modules/runner/src/integrationTest/sql/sqlite/select3/{select3_erroneous_hash_res.test_ignore => select3_erroneous_hash_res.test} (100%)
rename modules/runner/src/integrationTest/sql/sqlite/select3/{select3_erroneous_res.test_ignore => select3_erroneous_res.test} (100%)
delete mode 100644 modules/runner/src/integrationTest/sql/subquery/any_all/test_uncorrelated_all_subquery.test_ignore
rename modules/runner/src/integrationTest/sql/subquery/any_all/{test_uncorrelated_any_subquery.test_ignored => test_uncorrelated_any_subquery.test} (97%)
delete mode 100644 modules/runner/src/integrationTest/sql/subquery/scalar/test_uncorrelated_scalar_subquery.test_ignore
rename modules/runner/src/integrationTest/sql/subquery/table/{test_aliasing.test_ignore => test_aliasing.test} (86%)
delete mode 100644 modules/runner/src/integrationTest/sql/subquery/table/test_table_subquery.test_ignore
delete mode 100644 modules/schema/src/main/java/org/apache/ignite/internal/schema/ByteBufferRow.java
copy modules/{sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTable.java => schema/src/main/java/org/apache/ignite/internal/schema/ColumnsExtractor.java} (55%)
create mode 100644 modules/schema/src/testFixtures/java/org/apache/ignite/internal/schema/BinaryRowMatcher.java
rename modules/{core/src/testFixtures/java/org/apache/ignite/internal/testframework/jul/NoOpHandler.java => schema/src/testFixtures/java/org/apache/ignite/internal/schema/testobjects/TestBitmaskObject.java} (62%)
copy modules/{marshaller-common/src/test/java/org/apache/ignite/internal/marshaller/testobjects/TestObjectWithNoDefaultConstructor.java => schema/src/testFixtures/java/org/apache/ignite/internal/schema/testobjects/TestSimpleObjectKey.java} (59%)
copy modules/{marshaller-common/src/test/java/org/apache/ignite/internal/marshaller/testobjects/TestObjectWithNoDefaultConstructor.java => schema/src/testFixtures/java/org/apache/ignite/internal/schema/testobjects/TestSimpleObjectVal.java} (57%)
create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/DestinationFactory.java
create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/agg/AggregateRow.java
copy modules/{schema/src/main/java/org/apache/ignite/internal/schema/DecimalNativeType.java => sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/row/BaseTypeSpec.java} (53%)
copy modules/{arch-test/src/test/java/org/apache/ignite/lang/IgniteTestImportOption.java => sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/row/NullTypeSpec.java} (57%)
create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/row/RowSchema.java
create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/row/RowSchemaTypes.java
copy modules/{schema/src/main/java/org/apache/ignite/internal/schema/DecimalNativeType.java => sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/row/RowType.java} (54%)
rename modules/{arch-test/src/test/java/org/apache/ignite/lang/TestsWithFixturesImportOption.java => sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/row/TypeSpec.java} (50%)
create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/agg/MapReduceAggregates.java
delete mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/set/IgniteMinusBase.java
create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/IgniteCustomAssigmentsRules.java
create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/SqlExceptionMapperProvider.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/AsyncSqlCursorImplTest.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlToCatalogCommandConverterTest.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/RowSchemaTest.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/RowSchemaTypesTest.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/CastResolutionTest.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/SqlReservedWordsTest.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/CommonsTest.java
create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/PlanUtilsTest.java
copy modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/{ReadWriteMultiRowReplicaRequest.java => BinaryRowMessage.java} (66%)
create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaSyncService.java
create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaSyncServiceImpl.java
create mode 100644 modules/table/src/test/java/org/apache/ignite/internal/table/distributed/schema/SchemaSyncServiceImplTest.java
[ignite-3] 02/02: IGNITE-20086
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apolovtsev pushed a commit to branch ignite-20086
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 455976f38bde3ef176c52a321b1937acc9355329
Author: Aleksandr Polovtsev <al...@gmail.com>
AuthorDate: Thu Aug 24 16:38:38 2023 +0300
IGNITE-20086
---
gradle/libs.versions.toml | 2 +-
modules/arch-test/build.gradle | 6 +
.../internal/TestClassHierarchyArchTest.java | 39 +++----
.../apache/ignite/lang/IgniteTestImportOption.java | 8 +-
.../ignite/lang/TestsWithFixturesImportOption.java | 38 -------
.../catalog/storage/UpdateLogImplTest.java | 3 +-
modules/cli/build.gradle | 1 +
.../handler/IgniteCliApiExceptionHandlerTest.java | 3 +-
.../ignite/internal/cli/AbstractCliTest.java | 3 +-
.../client/handler/ItClientHandlerMetricsTest.java | 3 +-
.../ignite/client/handler/ItClientHandlerTest.java | 3 +-
.../client/handler/ItSslClientHandlerTest.java | 3 +-
.../client/ObservableTimestampPropagationTest.java | 3 +-
.../management/raft/ItCmgRaftServiceTest.java | 3 +-
.../metastore/DeploymentUnitStoreImplTest.java | 3 +-
.../deployunit/DeploymentUnitAccessorImplTest.java | 3 +-
.../DeploymentUnitAcquiredWaiterTest.java | 3 +-
.../compute/JobExecutionContextImplTest.java | 3 +-
.../compute/loader/JobClassLoaderFactoryTest.java | 3 +-
.../compute/loader/JobClassLoaderTest.java | 3 +-
.../testframework/ConfigurationExtensionTest.java | 3 +-
.../tree/ConverterToMapVisitorTest.java | 3 +-
.../validation/ConfigurationValidatorImplTest.java | 3 +-
.../validation/OneOfValidatorTest.java | 3 +-
.../validation/PowerOfTwoValidatorTest.java | 3 +-
.../validation/RangeValidatorTest.java | 3 +-
.../apache/ignite/internal/HybridClockTest.java | 3 +-
.../causality/CompletableVersionedValueTest.java | 3 +-
.../causality/IncrementalVersionedValueTest.java | 3 +-
.../apache/ignite/internal/util/CursorTest.java | 3 +-
.../ignite/internal/util/IgniteUtilsTest.java | 7 +-
.../subscription/TransformingPublisherTest.java | 3 +-
.../DistributionZoneMockTest.java | 3 +-
.../internal/network/file/ItFileTransferTest.java | 3 +-
.../internal/network/file/FileSenderTest.java | 3 +-
.../network/file/FileTransferServiceImplTest.java | 3 +-
.../ignite/internal/index/IndexManagerTest.java | 3 +-
modules/jdbc/build.gradle | 1 +
.../internal/jdbc/PreparedStatementParamsTest.java | 3 +-
modules/metastorage/build.gradle | 1 +
.../impl/MetaStorageManagerRecoveryTest.java | 3 +-
.../metastorage/impl/MetaStorageRangeTest.java | 3 +-
.../metastorage/server/OrConditionTest.java | 3 +-
.../metastorage/server/time/ClusterTimeTest.java | 3 +-
.../server/AbstractKeyValueStorageTest.java | 3 +-
modules/metrics/build.gradle | 1 +
.../metrics/exporters/ItJvmMetricSourceTest.java | 3 +-
.../exporters/ItMetricExportersLoadingTest.java | 3 +-
.../ignite/internal/metrics/JmxExporterTest.java | 3 +-
.../internal/metrics/MetricConfigurationTest.java | 3 +-
modules/network-annotation-processor/build.gradle | 1 +
.../network/processor/tests/GenerationTest.java | 3 +-
.../network/netty/ItConnectionManagerTest.java | 3 +-
.../network/scalecube/ItClusterServiceTest.java | 3 +-
.../SslConfigurationValidatorImplTest.java | 3 +-
.../netty/IoExceptionSuppressingHandlerTest.java | 3 +-
.../network/processor/InheritedMessageTest.java | 3 +-
.../network/processor/SerializationOrderTest.java | 3 +-
...TransferableObjectProcessorIncrementalTest.java | 3 +-
.../network/recovery/VaultStateIdsTest.java | 3 +-
.../serialization/ClassDescriptorMergerTest.java | 3 +-
.../network/serialization/MarshallableTest.java | 3 +-
.../marshal/BestEffortInstantiationTest.java | 3 +-
.../marshal/DefaultSchemaMismatchHandlerTest.java | 3 +-
...ltUserObjectMarshallerWithSchemaChangeTest.java | 3 +-
.../marshal/SerializableInstantiationTest.java | 3 +-
.../network/ssl/SslContextProviderTest.java | 3 +-
.../network/AbstractMessagingServiceTest.java | 3 +-
.../network/DefaultMessagingServiceTest.java | 3 +-
.../MessageSerializationRegistryImplTest.java | 3 +-
.../persistence/PartitionMetaManagerTest.java | 3 +-
.../AwaitTasksCompletionExecutorTest.java | 3 +-
.../checkpoint/CheckpointDirtyPagesTest.java | 3 +-
.../checkpoint/CheckpointManagerTest.java | 3 +-
.../checkpoint/CheckpointPagesWriterTest.java | 3 +-
.../persistence/checkpoint/CheckpointTest.java | 3 +-
.../checkpoint/CheckpointTimeoutLockTest.java | 7 +-
.../checkpoint/CheckpointWorkflowTest.java | 7 +-
.../persistence/checkpoint/CheckpointerTest.java | 3 +-
.../ReentrantReadWriteLockWithTrackingTest.java | 6 +-
.../persistence/compaction/CompactorTest.java | 7 +-
.../store/AbstractFilePageStoreIoTest.java | 3 +-
.../store/FilePageStoreManagerTest.java | 3 +-
.../persistence/store/FilePageStoreTest.java | 3 +-
.../persistence/store/GroupPageStoresMapTest.java | 3 +-
.../pagememory/util/GradualTaskExecutorTest.java | 3 +-
.../placementdriver/PlacementDriverTest.java | 3 +-
.../apache/ignite/internal/raft/ItLozaTest.java | 3 +-
.../raft/ItTruncateSuffixAndRestartTest.java | 3 +-
.../ignite/raft/jraft/core/ItCliServiceTest.java | 3 +-
.../apache/ignite/raft/jraft/core/ItNodeTest.java | 125 ++++++++++-----------
.../raft/JraftGroupEventsListenerTest.java | 3 +-
.../impl/RocksDbSharedLogStorageAdvancedTest.java | 3 +-
.../raft/jraft/conf/ConfigurationEntryTest.java | 11 +-
.../raft/jraft/conf/ConfigurationManagerTest.java | 13 ++-
.../ignite/raft/jraft/core/BallotBoxTest.java | 15 +--
.../ignite/raft/jraft/core/FSMCallerTest.java | 11 +-
.../ignite/raft/jraft/core/IteratorImplTest.java | 17 +--
.../ignite/raft/jraft/core/IteratorTest.java | 15 +--
.../raft/jraft/core/ReadOnlyServiceTest.java | 3 +-
.../raft/jraft/core/ReplicatorGroupTest.java | 14 +--
.../ignite/raft/jraft/core/ReplicatorTest.java | 21 ++--
.../raft/jraft/rpc/AbstractClientServiceTest.java | 23 ++--
.../jraft/rpc/impl/PingRequestProcessorTest.java | 7 +-
.../impl/cli/AbstractCliRequestProcessorTest.java | 3 +-
.../rpc/impl/cli/BaseCliRequestProcessorTest.java | 13 ++-
.../impl/core/BaseNodeRequestProcessorTest.java | 3 +-
.../rpc/impl/core/NodeRequestProcessorTest.java | 11 +-
.../ignite/raft/jraft/storage/BaseStorageTest.java | 3 +-
.../ignite/raft/jraft/storage/FileServiceTest.java | 9 +-
.../impl/VolatileLogStorageSpecificsTest.java | 3 +-
.../storage/snapshot/remote/CopySessionTest.java | 13 ++-
.../snapshot/remote/RemoteFileCopierTest.java | 11 +-
.../ignite/raft/jraft/util/ThreadIdTest.java | 11 +-
modules/rest-api/build.gradle | 1 +
.../handler/IgniteExceptionHandlerTest.java | 3 +-
modules/rocksdb-common/build.gradle | 1 +
.../ignite/internal/rocksdb/RocksUtilsTest.java | 3 +-
.../ItDistributedConfigurationPropertiesTest.java | 3 +-
.../ItDistributedConfigurationStorageTest.java | 3 +-
.../rest/authentication/ItAuthenticationTest.java | 3 +-
.../internal/configuration/CompoundModuleTest.java | 3 +-
.../configuration/ConfigurationModulesTest.java | 3 +-
.../DistributedConfigurationUpdaterTest.java | 3 +-
.../schema/AbstractSchemaConverterTest.java | 3 +-
.../internal/schema/CatalogSchemaManagerTest.java | 3 +-
.../configuration/TableValidatorImplTest.java | 3 +-
.../index/IndexValidatorImplTest.java | 3 +-
.../AuthenticationConfigurationValidatorTest.java | 3 +-
.../AuthenticationProvidersValidatorTest.java | 3 +-
.../AuthenticationManagerImplTest.java | 3 +-
.../internal/sql/engine/StopCalciteModuleTest.java | 10 +-
.../exec/ExecutableTableRegistrySelfTest.java | 3 +-
.../sql/engine/exec/ExecutionServiceImplTest.java | 11 +-
.../engine/exec/rel/ScannableTableSelfTest.java | 3 +-
.../sql/engine/framework/TestClusterTest.java | 3 +-
.../engine/schema/CatalogSqlSchemaManagerTest.java | 3 +-
.../internal/sql/engine/util/TypeUtilsTest.java | 3 +-
.../internal/storage/DataStorageManagerTest.java | 3 +-
.../internal/storage/DataStorageModulesTest.java | 3 +-
.../ExistingDataStorageValidatorTest.java | 3 +-
.../internal/storage/util/LockHolderTest.java | 4 +-
.../storage/util/MvPartitionStoragesTest.java | 3 +-
.../internal/storage/BaseMvStoragesTest.java | 3 +-
.../storage/index/AbstractIndexStorageTest.java | 3 +-
.../PersistentPageMemoryDataRegionTest.java | 3 +-
.../PageMemoryDataRegionValidatorImplTest.java | 3 +-
.../storage/pagememory/index/InlineUtilsTest.java | 3 +-
.../storage/pagememory/mv/BlobStorageTest.java | 3 +-
.../storage/rocksdb/RocksDbStorageEngineTest.java | 3 +-
.../RocksDbDataRegionValidatorImplTest.java | 3 +-
.../RepeatedFinishReadWriteTransactionTest.java | 3 +-
.../distributed/ConfiguredTablesCacheTest.java | 3 +-
.../table/distributed/LowWatermarkTest.java | 3 +-
.../table/distributed/PartitionMoverTest.java | 3 +-
.../distributed/StorageUpdateHandlerTest.java | 3 +-
.../internal/table/distributed/gc/MvGcTest.java | 3 +-
.../distributed/index/IndexUpdateHandlerTest.java | 3 +-
.../raft/PartitionCommandListenerTest.java | 3 +-
.../raft/snapshot/PartitionAccessImplTest.java | 3 +-
.../PartitionSnapshotStorageFactoryTest.java | 3 +-
.../snapshot/PartitionSnapshotStorageTest.java | 3 +-
.../incoming/IncomingSnapshotCopierTest.java | 3 +-
.../incoming/IncomingSnapshotReaderTest.java | 3 +-
.../outgoing/OutgoingSnapshotCommonTest.java | 3 +-
.../OutgoingSnapshotMvDataStreamingTest.java | 3 +-
.../outgoing/OutgoingSnapshotReaderTest.java | 3 +-
.../OutgoingSnapshotTxDataStreamingTest.java | 3 +-
.../outgoing/OutgoingSnapshotsManagerTest.java | 3 +-
.../SnapshotAwarePartitionDataStorageTest.java | 3 +-
.../snapshot/outgoing/SnapshotMetaUtilsTest.java | 3 +-
.../schema/SchemaSyncServiceImplTest.java | 3 +-
.../distributed/storage/InternalTableImplTest.java | 3 +-
.../tx/impl/ReadOnlyTransactionImplTest.java | 3 +-
.../tx/impl/ReadWriteTransactionImplTest.java | 3 +-
175 files changed, 504 insertions(+), 409 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 853346a008..0277d0a912 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -71,7 +71,7 @@ fastutil = "8.5.6"
kryo = "4.0.1"
bytebuddy = "1.12.8"
mockServer = "5.13.2"
-archunit = "1.0.1"
+archunit = "1.1.0"
testkit = "1.8.2"
openapi = "4.8.6"
autoService = "1.0.1"
diff --git a/modules/arch-test/build.gradle b/modules/arch-test/build.gradle
index ec43164df1..e8c27b30f2 100644
--- a/modules/arch-test/build.gradle
+++ b/modules/arch-test/build.gradle
@@ -24,6 +24,11 @@ dependencies {
parent.subprojects {
if (it != this.project) {
testImplementation it
+
+ // Add dependency on test fixtures only if a given project declares them.
+ if (!it.getTasksByName("testFixturesClasses", false).isEmpty()) {
+ testImplementation testFixtures(it)
+ }
}
}
@@ -35,5 +40,6 @@ tasks.withType(Test).configureEach {
parent.subprojects.forEach {
dependsOn it.getTasksByName("testClasses", true)
dependsOn it.getTasksByName("integrationTestClasses", true)
+ dependsOn it.getTasksByName("testFixturesClasses", true)
}
}
diff --git a/modules/arch-test/src/test/java/org/apache/ignite/internal/TestClassHierarchyArchTest.java b/modules/arch-test/src/test/java/org/apache/ignite/internal/TestClassHierarchyArchTest.java
index 915cb1b01f..c2a245f1ff 100644
--- a/modules/arch-test/src/test/java/org/apache/ignite/internal/TestClassHierarchyArchTest.java
+++ b/modules/arch-test/src/test/java/org/apache/ignite/internal/TestClassHierarchyArchTest.java
@@ -20,46 +20,43 @@ package org.apache.ignite.internal;
import static com.tngtech.archunit.core.domain.properties.CanBeAnnotated.Predicates.annotatedWith;
import com.tngtech.archunit.base.DescribedPredicate;
-import com.tngtech.archunit.core.domain.AccessTarget;
-import com.tngtech.archunit.core.domain.JavaCall;
-import com.tngtech.archunit.core.domain.JavaClass.Functions;
-import com.tngtech.archunit.core.domain.JavaClass.Predicates;
-import com.tngtech.archunit.core.domain.properties.HasName;
+import com.tngtech.archunit.core.domain.JavaClass;
import com.tngtech.archunit.junit.AnalyzeClasses;
import com.tngtech.archunit.junit.ArchTest;
import com.tngtech.archunit.lang.ArchRule;
import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
+import org.apache.ignite.lang.IgniteTestImportOption;
import org.apache.ignite.lang.LocationProvider.RootLocationProvider;
-import org.apache.ignite.lang.TestsWithFixturesImportOption;
+import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
/**
- * Tests that tests classes, which uses Mockito spies, extends BaseIgniteAbstractTest. Using BaseIgniteAbstractTest guarantees the Mockito
+ * Tests that tests classes, which uses Mockito, extends BaseIgniteAbstractTest. Using BaseIgniteAbstractTest guarantees the Mockito
* resources will be released after tests finishes.
*/
@SuppressWarnings("JUnitTestCaseWithNoTests")
@AnalyzeClasses(
packages = "org.apache.ignite",
- importOptions = TestsWithFixturesImportOption.class,
+ importOptions = IgniteTestImportOption.class,
locations = RootLocationProvider.class)
public class TestClassHierarchyArchTest {
- private static final String BASE_IGNITE_ABSTRACT_TEST_CLASSNAME = "org.apache.ignite.internal.testframework.BaseIgniteAbstractTest";
+ private static final DescribedPredicate<JavaClass> hasMockitoDependency = DescribedPredicate.describe(
+ "Depends on Mockito",
+ javaClass -> javaClass.getTransitiveDependenciesFromSelf().stream()
+ .anyMatch(dependency -> dependency.getTargetClass().getPackageName().startsWith("org.mockito")));
@ArchTest
public static final ArchRule TEST_CLASS_WITH_MOCKS_EXTENDS_BASE_TEST_CLASS = ArchRuleDefinition
.classes()
- // are classes with tests
- .that(Predicates.containAnyMethodsThat(annotatedWith(Test.class).or(annotatedWith(ParameterizedTest.class))))
- // uses Mockito framework
- .and(Functions.GET_METHOD_CALLS_FROM_SELF.is(DescribedPredicate.anyElementThat(
- JavaCall.Predicates.target(
- AccessTarget.Predicates.declaredIn("org.mockito.Mockito")
- .and(HasName.Predicates.name("spy"))
- )
- )))
+ .that()
+ // Ignore nested test classes, only their outer classes need to inherit.
+ .areNotAnnotatedWith(Nested.class)
+ .and()
+ .containAnyMethodsThat(annotatedWith(Test.class).or(annotatedWith(ParameterizedTest.class)))
+ .and(hasMockitoDependency)
.should()
- .beAssignableTo(BASE_IGNITE_ABSTRACT_TEST_CLASSNAME)
- .as("Test classes, which use Mockito spies, must extends BaseIgniteAbstractTest")
- .allowEmptyShould(true);
+ .beAssignableTo(BaseIgniteAbstractTest.class)
+ .as("Test classes which use Mockito must extends BaseIgniteAbstractTest");
}
diff --git a/modules/arch-test/src/test/java/org/apache/ignite/lang/IgniteTestImportOption.java b/modules/arch-test/src/test/java/org/apache/ignite/lang/IgniteTestImportOption.java
index e89d89dcbf..ba27dd2d04 100644
--- a/modules/arch-test/src/test/java/org/apache/ignite/lang/IgniteTestImportOption.java
+++ b/modules/arch-test/src/test/java/org/apache/ignite/lang/IgniteTestImportOption.java
@@ -25,11 +25,13 @@ import java.util.regex.Pattern;
* Provide the ability to evaluate every class location, to determine if the class should be treated as a test class.
*/
public class IgniteTestImportOption implements ImportOption {
- private final Pattern integrationTestPattern = Pattern.compile(".*/build/classes/([^/]+/)integrationTest/.*");
+ private static final Pattern INTEGRATION_TEST_PATTERN = Pattern.compile(".*/build/classes/[^/]+/integrationTest/.*");
+ private static final Pattern TEST_FIXTURES_PATTERN = Pattern.compile(".*/build/classes/[^/]+/testFixtures/.*");
- /** {@inheritDoc} */
@Override
public boolean includes(Location location) {
- return Predefined.ONLY_INCLUDE_TESTS.includes(location) || location.matches(integrationTestPattern);
+ return Predefined.ONLY_INCLUDE_TESTS.includes(location)
+ || location.matches(INTEGRATION_TEST_PATTERN)
+ || location.matches(TEST_FIXTURES_PATTERN);
}
}
diff --git a/modules/arch-test/src/test/java/org/apache/ignite/lang/TestsWithFixturesImportOption.java b/modules/arch-test/src/test/java/org/apache/ignite/lang/TestsWithFixturesImportOption.java
deleted file mode 100644
index 4954fde668..0000000000
--- a/modules/arch-test/src/test/java/org/apache/ignite/lang/TestsWithFixturesImportOption.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.lang;
-
-import com.tngtech.archunit.core.importer.ImportOption;
-import com.tngtech.archunit.core.importer.Location;
-import java.util.regex.Pattern;
-
-/**
- * Provide the ability to evaluate every class location, to determine if the class should be treated as a test fixture class.
- */
-public class TestsWithFixturesImportOption implements ImportOption {
- private static final Pattern fixturesTestPattern = Pattern.compile(".*/build/classes/([^/]+/)testFixtures/.*");
- private static final Pattern integrationTestPattern = Pattern.compile(".*/build/classes/([^/]+/)integrationTest/.*");
-
- /** {@inheritDoc} */
- @Override
- public boolean includes(Location location) {
- return Predefined.ONLY_INCLUDE_TESTS.includes(location)
- || location.matches(integrationTestPattern)
- || location.matches(fixturesTestPattern);
- }
-}
diff --git a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/UpdateLogImplTest.java b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/UpdateLogImplTest.java
index 275bae9979..27c1b524c2 100644
--- a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/UpdateLogImplTest.java
+++ b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/UpdateLogImplTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import org.apache.ignite.internal.metastorage.server.KeyValueStorage;
import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tostring.S;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.vault.VaultManager;
@@ -49,7 +50,7 @@ import org.junit.jupiter.params.provider.ValueSource;
/** Tests to verify {@link UpdateLogImpl}. */
@SuppressWarnings("ConstantConditions")
-class UpdateLogImplTest {
+class UpdateLogImplTest extends BaseIgniteAbstractTest {
private KeyValueStorage keyValueStorage;
private MetaStorageManager metastore;
diff --git a/modules/cli/build.gradle b/modules/cli/build.gradle
index bf52713ad4..a4c28040a0 100644
--- a/modules/cli/build.gradle
+++ b/modules/cli/build.gradle
@@ -87,6 +87,7 @@ dependencies {
testFixturesImplementation libs.micronaut.inject
testFixturesImplementation libs.micronaut.picocli
testFixturesImplementation libs.micronaut.junit5
+ testFixturesImplementation testFixtures(project(":ignite-core"))
integrationTestAnnotationProcessor libs.picocli.annotation.processor
integrationTestAnnotationProcessor libs.micronaut.inject.annotation.processor
diff --git a/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java
index 2baf347286..9f1d0ab2cd 100644
--- a/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/exception/handler/IgniteCliApiExceptionHandlerTest.java
@@ -26,10 +26,11 @@ import io.micronaut.http.HttpStatus;
import java.util.Collections;
import org.apache.ignite.internal.cli.core.exception.ExceptionWriter;
import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.rest.client.invoker.ApiException;
import org.junit.jupiter.api.Test;
-class IgniteCliApiExceptionHandlerTest {
+class IgniteCliApiExceptionHandlerTest extends BaseIgniteAbstractTest {
private static final String NODE_URL = "nodeUrl";
diff --git a/modules/cli/src/testFixtures/java/org/apache/ignite/internal/cli/AbstractCliTest.java b/modules/cli/src/testFixtures/java/org/apache/ignite/internal/cli/AbstractCliTest.java
index 983a241acb..c9e30b3d17 100644
--- a/modules/cli/src/testFixtures/java/org/apache/ignite/internal/cli/AbstractCliTest.java
+++ b/modules/cli/src/testFixtures/java/org/apache/ignite/internal/cli/AbstractCliTest.java
@@ -24,6 +24,7 @@ import jakarta.inject.Inject;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
import org.apache.ignite.internal.cli.commands.TopLevelCliCommand;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeAll;
import picocli.CommandLine;
@@ -31,7 +32,7 @@ import picocli.CommandLine;
* Base class for any CLI tests.
*/
@MicronautTest(rebuildContext = true)
-public abstract class AbstractCliTest {
+public abstract class AbstractCliTest extends BaseIgniteAbstractTest {
@Inject
private ApplicationContext ctx;
diff --git a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerMetricsTest.java b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerMetricsTest.java
index 537025c58e..2ef7371fa1 100644
--- a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerMetricsTest.java
+++ b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerMetricsTest.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.net.SocketException;
import java.nio.file.Path;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
@@ -35,7 +36,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Client handler metrics tests. See also {@code org.apache.ignite.client.MetricsTest}.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class ItClientHandlerMetricsTest {
+public class ItClientHandlerMetricsTest extends BaseIgniteAbstractTest {
private TestServer testServer;
@WorkDirectory
diff --git a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java
index dc2de84d7d..cb0cda204a 100644
--- a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java
+++ b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItClientHandlerTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.internal.configuration.AuthenticationConfiguration;
import org.apache.ignite.internal.configuration.BasicAuthenticationProviderChange;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -47,7 +48,7 @@ import org.msgpack.core.MessagePack;
* Client connector integration tests with real sockets.
*/
@ExtendWith(ConfigurationExtension.class)
-public class ItClientHandlerTest {
+public class ItClientHandlerTest extends BaseIgniteAbstractTest {
private ClientHandlerModule serverModule;
private TestServer testServer;
diff --git a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItSslClientHandlerTest.java b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItSslClientHandlerTest.java
index 928247887b..2294e7a672 100644
--- a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItSslClientHandlerTest.java
+++ b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/ItSslClientHandlerTest.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import java.net.SocketException;
import java.nio.file.Path;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.lang.IgniteException;
@@ -36,7 +37,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
/** SSL client integration test. */
@ExtendWith(WorkDirectoryExtension.class)
-public class ItSslClientHandlerTest {
+public class ItSslClientHandlerTest extends BaseIgniteAbstractTest {
private ClientHandlerModule serverModule;
private TestServer testServer;
diff --git a/modules/client/src/test/java/org/apache/ignite/client/ObservableTimestampPropagationTest.java b/modules/client/src/test/java/org/apache/ignite/client/ObservableTimestampPropagationTest.java
index 78b4c31293..0dc1add517 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ObservableTimestampPropagationTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ObservableTimestampPropagationTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.client.fakes.FakeIgnite;
import org.apache.ignite.internal.TestHybridClock;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.tx.TransactionOptions;
import org.jetbrains.annotations.Nullable;
@@ -36,7 +37,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests that observable timestamp (causality token) is propagated from server to client and back.
*/
-public class ObservableTimestampPropagationTest {
+public class ObservableTimestampPropagationTest extends BaseIgniteAbstractTest {
private static TestServer testServer;
private static FakeIgnite ignite;
diff --git a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java
index 17132b91c3..86394349ce 100644
--- a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java
+++ b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java
@@ -62,6 +62,7 @@ import org.apache.ignite.internal.raft.RaftManager;
import org.apache.ignite.internal.raft.RaftNodeId;
import org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import org.apache.ignite.internal.raft.service.RaftGroupService;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -83,7 +84,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class ItCmgRaftServiceTest {
+public class ItCmgRaftServiceTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private static RaftConfiguration raftConfiguration;
diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java
index 663b3993e2..dd66badea3 100644
--- a/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java
+++ b/modules/code-deployment/src/test/java/org/apache/ignite/deployment/metastore/DeploymentUnitStoreImplTest.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import org.apache.ignite.internal.metastorage.server.KeyValueStorage;
import org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValueStorage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.vault.VaultManager;
@@ -60,7 +61,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Test suite for {@link DeploymentUnitStoreImpl}.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class DeploymentUnitStoreImplTest {
+public class DeploymentUnitStoreImplTest extends BaseIgniteAbstractTest {
private static final String LOCAL_NODE = "localNode";
private final VaultManager vaultManager = new VaultManager(new InMemoryVaultService());
diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java
index 63d9c0b3e1..2d84529ec0 100644
--- a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java
+++ b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAccessorImplTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.ignite.compute.DeploymentUnit;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
@@ -28,7 +29,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class DeploymentUnitAccessorImplTest {
+class DeploymentUnitAccessorImplTest extends BaseIgniteAbstractTest {
@Mock
private FileDeployerService deployerService;
diff --git a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java
index 2bee6bdd16..c363a5dcc7 100644
--- a/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java
+++ b/modules/code-deployment/src/test/java/org/apache/ignite/internal/deployunit/DeploymentUnitAcquiredWaiterTest.java
@@ -32,6 +32,7 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.compute.DeploymentUnit;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -42,7 +43,7 @@ import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class DeploymentUnitAcquiredWaiterTest {
+class DeploymentUnitAcquiredWaiterTest extends BaseIgniteAbstractTest {
private static final int DELAY_IN_MILLIS = 500;
private final Set<DeploymentUnit> removingUnits = new CopyOnWriteArraySet<>();
diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/JobExecutionContextImplTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/JobExecutionContextImplTest.java
index 014c771b0c..d57bba9d63 100644
--- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/JobExecutionContextImplTest.java
+++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/JobExecutionContextImplTest.java
@@ -23,13 +23,14 @@ import static org.hamcrest.Matchers.sameInstance;
import org.apache.ignite.Ignite;
import org.apache.ignite.compute.JobExecutionContext;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class JobExecutionContextImplTest {
+class JobExecutionContextImplTest extends BaseIgniteAbstractTest {
@Mock
private Ignite ignite;
diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java
index 96641a0cd9..1f1edb5320 100644
--- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java
+++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderFactoryTest.java
@@ -32,13 +32,14 @@ import java.util.stream.Collectors;
import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.DeploymentUnit;
import org.apache.ignite.internal.deployunit.DisposableDeploymentUnit;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class JobClassLoaderFactoryTest {
+class JobClassLoaderFactoryTest extends BaseIgniteAbstractTest {
private final Path unitsDir = Path.of(JobClassLoaderFactory.class.getClassLoader().getResource("units").getPath());
private final JobClassLoaderFactory jobClassLoaderFactory = new JobClassLoaderFactory();
diff --git a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderTest.java b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderTest.java
index d6bb0b3b1c..722de43c4c 100644
--- a/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderTest.java
+++ b/modules/compute/src/test/java/org/apache/ignite/internal/compute/loader/JobClassLoaderTest.java
@@ -34,6 +34,7 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.ignite.internal.compute.JobExecutionContextImpl;
import org.apache.ignite.internal.deployunit.DisposableDeploymentUnit;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.IgniteException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,7 +46,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class JobClassLoaderTest {
+class JobClassLoaderTest extends BaseIgniteAbstractTest {
@Mock
private ClassLoader parentClassLoader;
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java
index 6d84f856c1..37c96940ce 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/testframework/ConfigurationExtensionTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.internal.configuration.notifications.ConfigurationStora
import org.apache.ignite.internal.configuration.sample.DiscoveryConfiguration;
import org.apache.ignite.internal.configuration.sample.ExtendedDiscoveryConfiguration;
import org.apache.ignite.internal.configuration.sample.ExtendedDiscoveryConfigurationSchema;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,7 +44,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Test basic scenarios of {@link ConfigurationExtension}.
*/
@ExtendWith(ConfigurationExtension.class)
-class ConfigurationExtensionTest {
+class ConfigurationExtensionTest extends BaseIgniteAbstractTest {
/** Injected field. */
@InjectConfiguration(extensions = ExtendedDiscoveryConfigurationSchema.class)
private DiscoveryConfiguration fieldCfg;
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/ConverterToMapVisitorTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/ConverterToMapVisitorTest.java
index ce5e320cf8..b2c374503e 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/ConverterToMapVisitorTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/ConverterToMapVisitorTest.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.UUID;
import org.apache.ignite.configuration.annotation.Secret;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -33,7 +34,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class ConverterToMapVisitorTest {
+class ConverterToMapVisitorTest extends BaseIgniteAbstractTest {
private final ConverterToMapVisitor maskingVisitor = ConverterToMapVisitor.builder()
.maskSecretValues(true)
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/ConfigurationValidatorImplTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/ConfigurationValidatorImplTest.java
index 77464155ee..1794ce34d0 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/ConfigurationValidatorImplTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/ConfigurationValidatorImplTest.java
@@ -50,6 +50,7 @@ import org.apache.ignite.internal.configuration.SuperRoot;
import org.apache.ignite.internal.configuration.asm.ConfigurationAsmGenerator;
import org.apache.ignite.internal.configuration.tree.InnerNode;
import org.apache.ignite.internal.configuration.util.ConfigurationUtil;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tostring.IgniteToStringInclude;
import org.apache.ignite.internal.tostring.S;
import org.jetbrains.annotations.Nullable;
@@ -65,7 +66,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Test class for {@link ConfigurationValidatorImpl}.
*/
@ExtendWith(MockitoExtension.class)
-public class ConfigurationValidatorImplTest {
+public class ConfigurationValidatorImplTest extends BaseIgniteAbstractTest {
private static ConfigurationAsmGenerator cgen;
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/OneOfValidatorTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/OneOfValidatorTest.java
index 067c2ab13f..e0ccaa9a6a 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/OneOfValidatorTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/OneOfValidatorTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
import org.apache.ignite.configuration.validation.OneOf;
import org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.configuration.validation.ValidationIssue;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.ArgumentCaptor;
@@ -34,7 +35,7 @@ import org.mockito.ArgumentCaptor;
/**
* Test class for {@link OneOf}.
*/
-public class OneOfValidatorTest {
+public class OneOfValidatorTest extends BaseIgniteAbstractTest {
/**
* Test.
*/
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/PowerOfTwoValidatorTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/PowerOfTwoValidatorTest.java
index 035c795153..2fe08faa06 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/PowerOfTwoValidatorTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/PowerOfTwoValidatorTest.java
@@ -22,12 +22,13 @@ import static org.apache.ignite.internal.configuration.validation.TestValidation
import static org.mockito.Mockito.mock;
import org.apache.ignite.configuration.validation.PowerOfTwo;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* For {@link PowerOfTwoValidator} testing.
*/
-public class PowerOfTwoValidatorTest {
+public class PowerOfTwoValidatorTest extends BaseIgniteAbstractTest {
@Test
void testValidationSuccess() {
PowerOfTwo powerOfTwo = mock(PowerOfTwo.class);
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/RangeValidatorTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/RangeValidatorTest.java
index c7a0067ab3..ef232a8263 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/RangeValidatorTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/validation/RangeValidatorTest.java
@@ -23,13 +23,14 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.ignite.configuration.validation.Range;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
/**
* For {@link RangeValidator} testing.
*/
-public class RangeValidatorTest {
+public class RangeValidatorTest extends BaseIgniteAbstractTest {
@Test
void testValidationSuccess() {
Range range0 = createRange(0L, 100L);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/HybridClockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/HybridClockTest.java
index 7aafc60950..a0ee0af6c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/HybridClockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/HybridClockTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.hlc.ClockUpdateListener;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -42,7 +43,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* {@link HybridClock}
*/
@ExtendWith(MockitoExtension.class)
-class HybridClockTest {
+class HybridClockTest extends BaseIgniteAbstractTest {
/**
* Mock of a system clock.
*/
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/causality/CompletableVersionedValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/causality/CompletableVersionedValueTest.java
index a632299bb7..14fd5831bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/causality/CompletableVersionedValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/causality/CompletableVersionedValueTest.java
@@ -37,6 +37,7 @@ import static org.mockito.Mockito.verify;
import java.util.concurrent.CompletableFuture;
import java.util.stream.IntStream;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.RepeatedTest;
import org.junit.jupiter.api.Test;
@@ -44,7 +45,7 @@ import org.junit.jupiter.api.Test;
* Tests of causality token implementation based on versioned value.
* {@link CompletableVersionedValue}
*/
-public class CompletableVersionedValueTest {
+public class CompletableVersionedValueTest extends BaseIgniteAbstractTest {
/** Test value. */
private static final int TEST_VALUE = 1;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/causality/IncrementalVersionedValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/causality/IncrementalVersionedValueTest.java
index 5759e53d80..08865e8d10 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/causality/IncrementalVersionedValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/causality/IncrementalVersionedValueTest.java
@@ -52,6 +52,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.LongFunction;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.IgniteInternalException;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.RepeatedTest;
@@ -60,7 +61,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests for {@link IncrementalVersionedValue}.
*/
-public class IncrementalVersionedValueTest {
+public class IncrementalVersionedValueTest extends BaseIgniteAbstractTest {
/** Test value. */
private static final int TEST_VALUE = 1;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/CursorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/CursorTest.java
index f085234789..9b451a1e78 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/CursorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/CursorTest.java
@@ -27,9 +27,10 @@ import static org.mockito.Mockito.when;
import java.util.Iterator;
import java.util.List;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
-class CursorTest {
+class CursorTest extends BaseIgniteAbstractTest {
@Test
void bareIteratorAdapterProvidesDataFromIterator() throws Exception {
try (Cursor<Integer> cursor = Cursor.fromBareIterator(List.of(1, 2).iterator())) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsTest.java
index 9912ba8b10..7501eac7a3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsTest.java
@@ -45,17 +45,14 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.worker.IgniteWorker;
import org.junit.jupiter.api.Test;
/**
* Test suite for {@link IgniteUtils}.
*/
-class IgniteUtilsTest {
- private final IgniteLogger log = Loggers.forClass(IgniteUtilsTest.class);
-
+class IgniteUtilsTest extends BaseIgniteAbstractTest {
/**
* Tests that all resources are closed by the {@link IgniteUtils#closeAll} even if {@link AutoCloseable#close} throws an exception.
*/
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/subscription/TransformingPublisherTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/subscription/TransformingPublisherTest.java
index 9ede1426cb..761f9c6595 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/subscription/TransformingPublisherTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/subscription/TransformingPublisherTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import java.util.concurrent.Flow.Publisher;
import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.Flow.Subscription;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
@@ -37,7 +38,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Unit tests for {@link TransformingPublisher}.
*/
@ExtendWith(MockitoExtension.class)
-public class TransformingPublisherTest {
+public class TransformingPublisherTest extends BaseIgniteAbstractTest {
@Mock
private Publisher<Integer> input;
diff --git a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneMockTest.java b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneMockTest.java
index c2917d2cde..013ea06b14 100644
--- a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneMockTest.java
+++ b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneMockTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.configuration.testframework.InjectConfiguratio
import org.apache.ignite.internal.distributionzones.configuration.DistributionZonesConfiguration;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.vault.VaultManager;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,7 +36,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Tests for distribution zone manager.
*/
@ExtendWith(ConfigurationExtension.class)
-public class DistributionZoneMockTest {
+public class DistributionZoneMockTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private DistributionZonesConfiguration zonesConfiguration;
diff --git a/modules/file-transfer/src/integrationTest/java/org/apache/ignite/internal/network/file/ItFileTransferTest.java b/modules/file-transfer/src/integrationTest/java/org/apache/ignite/internal/network/file/ItFileTransferTest.java
index 64d0d1d3bd..68f4e37be3 100644
--- a/modules/file-transfer/src/integrationTest/java/org/apache/ignite/internal/network/file/ItFileTransferTest.java
+++ b/modules/file-transfer/src/integrationTest/java/org/apache/ignite/internal/network/file/ItFileTransferTest.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.network.file.TestCluster.Node;
import org.apache.ignite.internal.network.file.exception.FileTransferException;
import org.apache.ignite.internal.network.file.messages.FileTransferFactory;
import org.apache.ignite.internal.network.file.messages.Identifier;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher;
@@ -61,7 +62,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(ConfigurationExtension.class)
@ExtendWith(WorkDirectoryExtension.class)
-public class ItFileTransferTest {
+public class ItFileTransferTest extends BaseIgniteAbstractTest {
private static final String DOWNLOADS_DIR = "downloads";
@WorkDirectory
diff --git a/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileSenderTest.java b/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileSenderTest.java
index 9abf5afdce..d30cee0b3f 100644
--- a/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileSenderTest.java
+++ b/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileSenderTest.java
@@ -43,6 +43,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.internal.network.file.messages.FileChunkMessage;
import org.apache.ignite.internal.network.file.messages.FileChunkResponse;
import org.apache.ignite.internal.network.file.messages.FileTransferFactory;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -56,7 +57,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
@ExtendWith(WorkDirectoryExtension.class)
-class FileSenderTest {
+class FileSenderTest extends BaseIgniteAbstractTest {
private static final long RESPONSE_TIMEOUT = 1000;
private static final int CHUNK_SIZE = 1024;
diff --git a/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java b/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
index d9e4fb0418..5d15984eea 100644
--- a/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
+++ b/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
@@ -54,6 +54,7 @@ import org.apache.ignite.internal.network.file.messages.FileTransferInitMessage;
import org.apache.ignite.internal.network.file.messages.FileTransferInitResponse;
import org.apache.ignite.internal.network.file.messages.FileTransferMessageType;
import org.apache.ignite.internal.network.file.messages.Identifier;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.network.ClusterNodeImpl;
@@ -69,7 +70,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
@ExtendWith(WorkDirectoryExtension.class)
-class FileTransferServiceImplTest {
+class FileTransferServiceImplTest extends BaseIgniteAbstractTest {
private static final String SOURCE_CONSISTENT_ID = "source";
private static final String TARGET_CONSISTENT_ID = "target";
diff --git a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
index 8230656614..56b3f41815 100644
--- a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
+++ b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
@@ -53,6 +53,7 @@ import org.apache.ignite.internal.table.InternalTable;
import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.table.distributed.PartitionSet;
import org.apache.ignite.internal.table.distributed.TableManager;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.impl.HeapLockManager;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.lang.IndexNotFoundException;
@@ -65,7 +66,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Test class to verify {@link IndexManager}.
*/
@ExtendWith(ConfigurationExtension.class)
-public class IndexManagerTest {
+public class IndexManagerTest extends BaseIgniteAbstractTest {
@InjectConfiguration(
"mock.tables.tName {"
+ "id: 1, "
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
index ddfa9b3928..79171fc050 100644
--- a/modules/jdbc/build.gradle
+++ b/modules/jdbc/build.gradle
@@ -33,6 +33,7 @@ dependencies {
implementation libs.jetbrains.annotations
implementation libs.auto.service.annotations
+ testImplementation testFixtures(project(":ignite-core"))
testImplementation libs.mockito.core
testImplementation libs.hamcrest.core
diff --git a/modules/jdbc/src/test/java/org/apache/ignite/internal/jdbc/PreparedStatementParamsTest.java b/modules/jdbc/src/test/java/org/apache/ignite/internal/jdbc/PreparedStatementParamsTest.java
index 26cdccea60..b71301c8a7 100644
--- a/modules/jdbc/src/test/java/org/apache/ignite/internal/jdbc/PreparedStatementParamsTest.java
+++ b/modules/jdbc/src/test/java/org/apache/ignite/internal/jdbc/PreparedStatementParamsTest.java
@@ -48,6 +48,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
import org.apache.ignite.internal.jdbc.proto.JdbcQueryEventHandler;
import org.apache.ignite.internal.jdbc.proto.event.JdbcConnectResult;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -59,7 +60,7 @@ import org.mockito.Mockito;
/**
* Unit tests for PreparedStatement methods.
*/
-public class PreparedStatementParamsTest {
+public class PreparedStatementParamsTest extends BaseIgniteAbstractTest {
/** Values for supported JDBC types. */
private static final Map<JDBCType, Object> SUPPORTED_TYPES = new HashMap<>();
diff --git a/modules/metastorage/build.gradle b/modules/metastorage/build.gradle
index a7e9f66380..cb6078b479 100644
--- a/modules/metastorage/build.gradle
+++ b/modules/metastorage/build.gradle
@@ -68,6 +68,7 @@ dependencies {
testFixturesImplementation project(':ignite-replicator')
testFixturesImplementation project(':ignite-rocksdb-common')
testFixturesImplementation project(':ignite-vault')
+ testFixturesImplementation testFixtures(project(':ignite-core'))
testFixturesImplementation libs.jetbrains.annotations
testFixturesImplementation libs.mockito.core
}
diff --git a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerRecoveryTest.java b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerRecoveryTest.java
index e9155fbb84..6b03ff01c6 100644
--- a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerRecoveryTest.java
+++ b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerRecoveryTest.java
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStora
import org.apache.ignite.internal.raft.RaftManager;
import org.apache.ignite.internal.raft.client.TopologyAwareRaftGroupServiceFactory;
import org.apache.ignite.internal.raft.service.RaftGroupService;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.internal.vault.inmemory.InMemoryVaultService;
import org.apache.ignite.network.ClusterService;
@@ -54,7 +55,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
/** Tests MetaStorage manager recovery basics. */
@ExtendWith(ConfigurationExtension.class)
-public class MetaStorageManagerRecoveryTest {
+public class MetaStorageManagerRecoveryTest extends BaseIgniteAbstractTest {
private static final String NODE_NAME = "node";
private static final String LEADER_NAME = "ms-leader";
diff --git a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeTest.java b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeTest.java
index e88eee9966..984eb87157 100644
--- a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeTest.java
+++ b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRangeTest.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.metastorage.Entry;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.server.KeyValueStorage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.ByteUtils;
@@ -60,7 +61,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Test for cursor created by {@link MetaStorageService#range(ByteArray, ByteArray)} commands.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public abstract class MetaStorageRangeTest {
+public abstract class MetaStorageRangeTest extends BaseIgniteAbstractTest {
private final VaultManager vaultManager = new VaultManager(new InMemoryVaultService());
private KeyValueStorage storage;
diff --git a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/OrConditionTest.java b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/OrConditionTest.java
index 77503ed68e..a73d664120 100644
--- a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/OrConditionTest.java
+++ b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/OrConditionTest.java
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.when;
import java.util.Arrays;
import org.apache.ignite.internal.metastorage.Entry;
import org.apache.ignite.internal.metastorage.impl.EntryImpl;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.ArrayUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -38,7 +39,7 @@ import org.junit.jupiter.api.Test;
*
* @see OrCondition
*/
-public class OrConditionTest {
+public class OrConditionTest extends BaseIgniteAbstractTest {
private Condition cond1;
private Condition cond2;
private Condition cond3;
diff --git a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeTest.java b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeTest.java
index cc3c13cb52..fcb6b50467 100644
--- a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeTest.java
+++ b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/time/ClusterTimeTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.metastorage.configuration.MetaStorageConfiguration;
import org.apache.ignite.internal.metastorage.server.time.ClusterTimeImpl.SyncTimeAction;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.internal.util.TrackerClosedException;
import org.junit.jupiter.api.AfterEach;
@@ -49,7 +50,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Tests for {@link ClusterTimeImpl}.
*/
@ExtendWith(ConfigurationExtension.class)
-public class ClusterTimeTest {
+public class ClusterTimeTest extends BaseIgniteAbstractTest {
private final ClusterTimeImpl clusterTime = new ClusterTimeImpl("foo", new IgniteSpinBusyLock(), new HybridClockImpl());
@AfterEach
diff --git a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/AbstractKeyValueStorageTest.java b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/AbstractKeyValueStorageTest.java
index 166889fad9..73160d3721 100644
--- a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/AbstractKeyValueStorageTest.java
+++ b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/server/AbstractKeyValueStorageTest.java
@@ -19,13 +19,14 @@ package org.apache.ignite.internal.metastorage.server;
import static java.nio.charset.StandardCharsets.UTF_8;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
/**
* Abstract test for {@link KeyValueStorage}.
*/
-public abstract class AbstractKeyValueStorageTest {
+public abstract class AbstractKeyValueStorageTest extends BaseIgniteAbstractTest {
protected KeyValueStorage storage;
@BeforeEach
diff --git a/modules/metrics/build.gradle b/modules/metrics/build.gradle
index dc7395c1eb..a609f8a095 100644
--- a/modules/metrics/build.gradle
+++ b/modules/metrics/build.gradle
@@ -42,6 +42,7 @@ dependencies {
integrationTestAnnotationProcessor project(":ignite-configuration-annotation-processor")
integrationTestAnnotationProcessor libs.auto.service
integrationTestImplementation project(':ignite-core')
+ integrationTestImplementation testFixtures(project(':ignite-core'))
integrationTestImplementation testFixtures(project(':ignite-configuration'))
integrationTestImplementation libs.auto.service.annotations
}
diff --git a/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItJvmMetricSourceTest.java b/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItJvmMetricSourceTest.java
index 52d597aab3..b2703554ca 100644
--- a/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItJvmMetricSourceTest.java
+++ b/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItJvmMetricSourceTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.configuration.testframework.InjectConfiguratio
import org.apache.ignite.internal.metrics.MetricManager;
import org.apache.ignite.internal.metrics.configuration.MetricConfiguration;
import org.apache.ignite.internal.metrics.sources.JvmMetricSource;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,7 +36,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Suite to test, that enabled by default jvm metrics aren't broken.
*/
@ExtendWith(ConfigurationExtension.class)
-public class ItJvmMetricSourceTest {
+public class ItJvmMetricSourceTest extends BaseIgniteAbstractTest {
@InjectConfiguration(
value = "mock.exporters = {"
+ "simple = {exporterName = simple}"
diff --git a/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItMetricExportersLoadingTest.java b/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItMetricExportersLoadingTest.java
index 5b8355b1d5..6fdd568c1d 100644
--- a/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItMetricExportersLoadingTest.java
+++ b/modules/metrics/src/integrationTest/java/org/apache/ignite/internal/metrics/exporters/ItMetricExportersLoadingTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.configuration.testframework.ConfigurationExten
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.metrics.MetricManager;
import org.apache.ignite.internal.metrics.configuration.MetricConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,7 +35,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Integration test for metrics' exporters loading.
*/
@ExtendWith(ConfigurationExtension.class)
-public class ItMetricExportersLoadingTest {
+public class ItMetricExportersLoadingTest extends BaseIgniteAbstractTest {
@InjectConfiguration(
value = "mock.exporters = {"
+ "testPull = {exporterName = testPull},"
diff --git a/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/JmxExporterTest.java b/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/JmxExporterTest.java
index d6c9f805e2..6bd179ab8c 100644
--- a/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/JmxExporterTest.java
+++ b/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/JmxExporterTest.java
@@ -45,6 +45,7 @@ import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.metrics.configuration.MetricConfiguration;
import org.apache.ignite.internal.metrics.exporters.configuration.JmxExporterView;
import org.apache.ignite.internal.metrics.exporters.jmx.JmxExporter;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.lang.IgniteBiTuple;
import org.junit.jupiter.api.AfterEach;
@@ -56,7 +57,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Tests for {@link JmxExporter}.
*/
@ExtendWith({ConfigurationExtension.class})
-public class JmxExporterTest {
+public class JmxExporterTest extends BaseIgniteAbstractTest {
@InjectConfiguration(value = "mock.exporters = {jmx = {exporterName = jmx}}")
private MetricConfiguration metricConfiguration;
diff --git a/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/MetricConfigurationTest.java b/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/MetricConfigurationTest.java
index 4b2fb531b9..b20aad62d9 100644
--- a/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/MetricConfigurationTest.java
+++ b/modules/metrics/src/test/java/org/apache/ignite/internal/metrics/MetricConfigurationTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.metrics.exporters.MetricExporter;
import org.apache.ignite.internal.metrics.exporters.TestExporter;
import org.apache.ignite.internal.metrics.exporters.TestExporterChange;
import org.apache.ignite.internal.metrics.exporters.TestExporterConfigurationSchema;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,7 +39,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Tests for exporters' configurations.
*/
@ExtendWith(ConfigurationExtension.class)
-public class MetricConfigurationTest {
+public class MetricConfigurationTest extends BaseIgniteAbstractTest {
@InjectConfiguration(
polymorphicExtensions = {
TestExporterConfigurationSchema.class
diff --git a/modules/network-annotation-processor/build.gradle b/modules/network-annotation-processor/build.gradle
index 401339b6fd..b5fa00858c 100644
--- a/modules/network-annotation-processor/build.gradle
+++ b/modules/network-annotation-processor/build.gradle
@@ -30,6 +30,7 @@ dependencies {
annotationProcessor libs.auto.service
testAnnotationProcessor project(":ignite-network-annotation-processor")
+ testImplementation testFixtures(project(':ignite-core'))
testImplementation libs.mockito.core
testImplementation libs.mockito.junit
testImplementation libs.hamcrest.core
diff --git a/modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/tests/GenerationTest.java b/modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/tests/GenerationTest.java
index 97a235dab7..a555b5dca9 100644
--- a/modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/tests/GenerationTest.java
+++ b/modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/tests/GenerationTest.java
@@ -28,13 +28,14 @@ import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import java.util.List;
import org.apache.ignite.internal.network.serialization.marshal.MarshalledObject;
import org.apache.ignite.internal.network.serialization.marshal.UserObjectMarshaller;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class GenerationTest {
+class GenerationTest extends BaseIgniteAbstractTest {
@Mock
private UserObjectMarshaller marshaller;
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
index a4d55a233e..748dd294da 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
+++ b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
@@ -56,6 +56,7 @@ import org.apache.ignite.internal.network.messages.TestMessagesFactory;
import org.apache.ignite.internal.network.recovery.AllIdsAreFresh;
import org.apache.ignite.internal.network.serialization.SerializationService;
import org.apache.ignite.internal.network.serialization.UserObjectSerializationContext;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.network.ChannelType;
@@ -72,7 +73,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Tests for {@link ConnectionManager}.
*/
@ExtendWith(ConfigurationExtension.class)
-public class ItConnectionManagerTest {
+public class ItConnectionManagerTest extends BaseIgniteAbstractTest {
/** Started connection managers. */
private final List<ConnectionManagerWrapper> startedManagers = new ArrayList<>();
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItClusterServiceTest.java b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItClusterServiceTest.java
index 089736c8e5..8ac8387484 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItClusterServiceTest.java
+++ b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItClusterServiceTest.java
@@ -32,6 +32,7 @@ import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.lang.NodeStoppingException;
import org.apache.ignite.network.ClusterNode;
@@ -46,7 +47,7 @@ import org.junit.jupiter.api.TestInfo;
/**
* Tests for ScaleCube based {@link ClusterService}.
*/
-public class ItClusterServiceTest {
+public class ItClusterServiceTest extends BaseIgniteAbstractTest {
@Test
void testShutdown(TestInfo testInfo) {
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/configuration/SslConfigurationValidatorImplTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/configuration/SslConfigurationValidatorImplTest.java
index 4ee4b2dd6c..9c3a5b0e02 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/configuration/SslConfigurationValidatorImplTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/configuration/SslConfigurationValidatorImplTest.java
@@ -24,13 +24,14 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.ignite.internal.configuration.validation.TestValidationUtil;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(WorkDirectoryExtension.class)
-class SslConfigurationValidatorImplTest {
+class SslConfigurationValidatorImplTest extends BaseIgniteAbstractTest {
@Test
public void nullKeyStorePath() {
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/IoExceptionSuppressingHandlerTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/IoExceptionSuppressingHandlerTest.java
index 6f07e4df5a..14a421f115 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/IoExceptionSuppressingHandlerTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/IoExceptionSuppressingHandlerTest.java
@@ -24,12 +24,13 @@ import static org.mockito.Mockito.verify;
import io.netty.channel.ChannelHandlerContext;
import java.io.IOException;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* Test class for the {@link IoExceptionSuppressingHandler}.
*/
-public class IoExceptionSuppressingHandlerTest {
+public class IoExceptionSuppressingHandlerTest extends BaseIgniteAbstractTest {
private final ChannelHandlerContext context = mock(ChannelHandlerContext.class);
private final IoExceptionSuppressingHandler handler = new IoExceptionSuppressingHandler();
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java
index 2b4cede65a..810a4d0c09 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
import org.apache.ignite.internal.network.messages.InheritedMessage;
import org.apache.ignite.internal.network.messages.InheritedMessageSerializationFactory;
import org.apache.ignite.internal.network.messages.TestMessagesFactory;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.serialization.MessageDeserializer;
import org.apache.ignite.network.serialization.MessageReader;
import org.apache.ignite.network.serialization.MessageSerializer;
@@ -39,7 +40,7 @@ import org.mockito.InOrder;
*
* @see InheritedMessage
*/
-public class InheritedMessageTest {
+public class InheritedMessageTest extends BaseIgniteAbstractTest {
private final TestMessagesFactory messageFactory = new TestMessagesFactory();
private final InheritedMessageSerializationFactory serializationFactory =
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java
index 71dacd236e..7de961357e 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
import org.apache.ignite.internal.network.messages.SerializationOrderMessage;
import org.apache.ignite.internal.network.messages.SerializationOrderMessageSerializationFactory;
import org.apache.ignite.internal.network.messages.TestMessagesFactory;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.serialization.MessageDeserializer;
import org.apache.ignite.network.serialization.MessageReader;
import org.apache.ignite.network.serialization.MessageSerializer;
@@ -37,7 +38,7 @@ import org.mockito.InOrder;
/**
* Test class for checking that writing and reading fields in the generated (de-)serializers is ordered alphanumerically.
*/
-public class SerializationOrderTest {
+public class SerializationOrderTest extends BaseIgniteAbstractTest {
private final TestMessagesFactory messageFactory = new TestMessagesFactory();
private final SerializationOrderMessageSerializationFactory serializationFactory =
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorIncrementalTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorIncrementalTest.java
index a3f68da756..debd80034a 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorIncrementalTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/processor/TransferableObjectProcessorIncrementalTest.java
@@ -48,6 +48,7 @@ import javax.tools.JavaFileObject.Kind;
import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.intellij.lang.annotations.Language;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -59,7 +60,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Tests for the {@link TransferableObjectProcessor} incremental compilation.
*/
@ExtendWith(MockitoExtension.class)
-public class TransferableObjectProcessorIncrementalTest {
+public class TransferableObjectProcessorIncrementalTest extends BaseIgniteAbstractTest {
/**
* Package name of the test sources.
*/
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/VaultStateIdsTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/VaultStateIdsTest.java
index cd2437a403..52dbcf1868 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/VaultStateIdsTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/VaultStateIdsTest.java
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.vault.VaultEntry;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.lang.ByteArray;
@@ -40,7 +41,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class VaultStateIdsTest {
+class VaultStateIdsTest extends BaseIgniteAbstractTest {
@Mock
private VaultManager vaultManager;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/ClassDescriptorMergerTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/ClassDescriptorMergerTest.java
index b4685a9c4a..c0a0a16123 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/ClassDescriptorMergerTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/ClassDescriptorMergerTest.java
@@ -27,9 +27,10 @@ import static org.mockito.Mockito.when;
import java.util.Arrays;
import java.util.List;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
-class ClassDescriptorMergerTest {
+class ClassDescriptorMergerTest extends BaseIgniteAbstractTest {
@Test
void mergesMatchingFields() {
List<FieldDescriptor> localFields = List.of(
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java
index da670e486b..317ec54ecc 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/MarshallableTest.java
@@ -51,6 +51,7 @@ import org.apache.ignite.internal.network.netty.OutboundEncoder;
import org.apache.ignite.internal.network.serialization.marshal.MarshalException;
import org.apache.ignite.internal.network.serialization.marshal.MarshalledObject;
import org.apache.ignite.internal.network.serialization.marshal.UserObjectMarshaller;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.OutNetworkObject;
import org.apache.ignite.network.serialization.MessageSerializationRegistry;
import org.jetbrains.annotations.Nullable;
@@ -59,7 +60,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests marshallable serialization.
*/
-public class MarshallableTest {
+public class MarshallableTest extends BaseIgniteAbstractTest {
/** {@link ByteBuf} allocator. */
private final UnpooledByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/BestEffortInstantiationTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/BestEffortInstantiationTest.java
index 2d6d81db2e..4a20a94c8f 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/BestEffortInstantiationTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/BestEffortInstantiationTest.java
@@ -27,6 +27,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,7 +35,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class BestEffortInstantiationTest {
+class BestEffortInstantiationTest extends BaseIgniteAbstractTest {
@Mock
private Instantiation delegate1;
@Mock
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultSchemaMismatchHandlerTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultSchemaMismatchHandlerTest.java
index b3d55583d0..cf2193040c 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultSchemaMismatchHandlerTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultSchemaMismatchHandlerTest.java
@@ -25,9 +25,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import java.io.ObjectInput;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
-class DefaultSchemaMismatchHandlerTest {
+class DefaultSchemaMismatchHandlerTest extends BaseIgniteAbstractTest {
private final DefaultSchemaMismatchHandler handler = new DefaultSchemaMismatchHandler();
@Test
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithSchemaChangeTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithSchemaChangeTest.java
index c36aedde30..25bb298199 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithSchemaChangeTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithSchemaChangeTest.java
@@ -60,6 +60,7 @@ import org.apache.ignite.internal.network.serialization.ClassNameMapBackedClassI
import org.apache.ignite.internal.network.serialization.CompositeDescriptorRegistry;
import org.apache.ignite.internal.network.serialization.FieldDescriptor;
import org.apache.ignite.internal.network.serialization.MapBackedIdIndexedDescriptors;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
@@ -75,7 +76,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* with a class which structure differs from our local version of the class.
*/
@ExtendWith(MockitoExtension.class)
-public class DefaultUserObjectMarshallerWithSchemaChangeTest {
+public class DefaultUserObjectMarshallerWithSchemaChangeTest extends BaseIgniteAbstractTest {
private static final byte[] INT_42_BYTES_IN_LITTLE_ENDIAN = {42, 0, 0, 0};
private static final String NON_LEAF_CLASS_NAME = "test.NonLeaf";
private static final String LEAF_CLASS_NAME = "test.Leaf";
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/SerializableInstantiationTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/SerializableInstantiationTest.java
index b575378c29..0d3000b630 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/SerializableInstantiationTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/SerializableInstantiationTest.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.Serializable;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -32,7 +33,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Tests for {@link SerializableInstantiation}.
*/
@ExtendWith(MockitoExtension.class)
-class SerializableInstantiationTest {
+class SerializableInstantiationTest extends BaseIgniteAbstractTest {
private final Instantiation instantiation = new SerializableInstantiation();
@Test
diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/ssl/SslContextProviderTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/ssl/SslContextProviderTest.java
index 032a46c770..41056cfafb 100644
--- a/modules/network/src/test/java/org/apache/ignite/internal/network/ssl/SslContextProviderTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/internal/network/ssl/SslContextProviderTest.java
@@ -37,6 +37,7 @@ import java.security.cert.CertificateException;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.network.configuration.SslConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.ErrorGroups.Common;
import org.apache.ignite.lang.IgniteException;
import org.junit.jupiter.api.BeforeEach;
@@ -45,7 +46,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
@ExtendWith(ConfigurationExtension.class)
-class SslContextProviderTest {
+class SslContextProviderTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private SslConfiguration configuration;
diff --git a/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java b/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java
index 9ce9563c43..7df3b1c34e 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/network/AbstractMessagingServiceTest.java
@@ -29,13 +29,14 @@ import java.lang.reflect.Field;
import java.util.List;
import java.util.concurrent.atomic.AtomicReferenceArray;
import org.apache.ignite.internal.network.messages.TestMessageTypes;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.annotations.MessageGroup;
import org.junit.jupiter.api.Test;
/**
* Test suite for the {@link AbstractMessagingService} class.
*/
-public class AbstractMessagingServiceTest {
+public class AbstractMessagingServiceTest extends BaseIgniteAbstractTest {
/**
* Tests a situation when multiple modules declare message group descriptors with the same group ID. Adding handlers for both of these
* groups should result in an exception being thrown.
diff --git a/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java b/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java
index 9782b8302e..68a1545fb0 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/network/DefaultMessagingServiceTest.java
@@ -57,6 +57,7 @@ import org.apache.ignite.internal.network.serialization.SerializationService;
import org.apache.ignite.internal.network.serialization.UserObjectSerializationContext;
import org.apache.ignite.internal.network.serialization.marshal.DefaultUserObjectMarshaller;
import org.apache.ignite.internal.network.serialization.marshal.UserObjectMarshaller;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.network.serialization.MessageDeserializer;
import org.apache.ignite.network.serialization.MessageSerializationFactory;
@@ -70,7 +71,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
@ExtendWith(ConfigurationExtension.class)
-class DefaultMessagingServiceTest {
+class DefaultMessagingServiceTest extends BaseIgniteAbstractTest {
private static final int SENDER_PORT = 2001;
private static final int RECEIVER_PORT = 2002;
diff --git a/modules/network/src/test/java/org/apache/ignite/network/serialization/MessageSerializationRegistryImplTest.java b/modules/network/src/test/java/org/apache/ignite/network/serialization/MessageSerializationRegistryImplTest.java
index 779867be06..21db839e6e 100644
--- a/modules/network/src/test/java/org/apache/ignite/network/serialization/MessageSerializationRegistryImplTest.java
+++ b/modules/network/src/test/java/org/apache/ignite/network/serialization/MessageSerializationRegistryImplTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.MessageSerializationRegistryImpl;
import org.apache.ignite.network.NetworkConfigurationException;
import org.apache.ignite.network.NetworkMessage;
@@ -29,7 +30,7 @@ import org.junit.jupiter.api.Test;
/**
* {@link MessageSerializationRegistryImpl} tests.
*/
-public class MessageSerializationRegistryImplTest {
+public class MessageSerializationRegistryImplTest extends BaseIgniteAbstractTest {
/** Default registry implementation. */
private final MessageSerializationRegistry registry = new MessageSerializationRegistryImpl();
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/PartitionMetaManagerTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/PartitionMetaManagerTest.java
index 3e30e9e465..9ebcc03853 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/PartitionMetaManagerTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/PartitionMetaManagerTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.pagememory.persistence.store.DeltaFilePageStor
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStore;
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStoreHeader;
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStoreIo;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.AfterAll;
@@ -50,7 +51,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* For {@link PartitionMetaManager} testing.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class PartitionMetaManagerTest {
+public class PartitionMetaManagerTest extends BaseIgniteAbstractTest {
private static final int PAGE_SIZE = 1024;
private static PageIoRegistry ioRegistry;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutorTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutorTest.java
index 34d03ada21..0ee57774a6 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutorTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutorTest.java
@@ -27,12 +27,13 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.util.concurrent.Executor;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* For {@link AwaitTasksCompletionExecutor} testing.
*/
-public class AwaitTasksCompletionExecutorTest {
+public class AwaitTasksCompletionExecutorTest extends BaseIgniteAbstractTest {
@Test
void testNoTasks() throws Exception {
Runnable updateHeartbeat = mock(Runnable.class);
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointDirtyPagesTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointDirtyPagesTest.java
index c15f7cfd95..7ffd866a3f 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointDirtyPagesTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointDirtyPagesTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.pagememory.FullPageId;
import org.apache.ignite.internal.pagememory.persistence.PersistentPageMemory;
import org.apache.ignite.internal.pagememory.persistence.checkpoint.CheckpointDirtyPages.CheckpointDirtyPagesView;
import org.apache.ignite.internal.pagememory.util.PageIdUtils;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteConcurrentMultiPairQueue;
import org.apache.ignite.internal.util.IgniteConcurrentMultiPairQueue.Result;
import org.apache.ignite.lang.IgniteBiTuple;
@@ -47,7 +48,7 @@ import org.junit.jupiter.api.Test;
/**
* For {@link CheckpointDirtyPages} testing.
*/
-public class CheckpointDirtyPagesTest {
+public class CheckpointDirtyPagesTest extends BaseIgniteAbstractTest {
@Test
void testDirtyPagesCount() {
DataRegionDirtyPages<FullPageId[]> dirtyPages0 = createDirtyPages(of(0, 0, 0), of(0, 0, 1));
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointManagerTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointManagerTest.java
index 209427dd0a..aabe251f6f 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointManagerTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointManagerTest.java
@@ -55,6 +55,7 @@ import org.apache.ignite.internal.pagememory.persistence.PersistentPageMemory;
import org.apache.ignite.internal.pagememory.persistence.store.DeltaFilePageStoreIo;
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStore;
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStoreManager;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.invocation.InvocationOnMock;
@@ -63,7 +64,7 @@ import org.mockito.invocation.InvocationOnMock;
* For {@link CheckpointManager} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class CheckpointManagerTest {
+public class CheckpointManagerTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private PageMemoryCheckpointConfiguration checkpointConfig;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointPagesWriterTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointPagesWriterTest.java
index e2ca9fb99b..9e25890bc2 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointPagesWriterTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointPagesWriterTest.java
@@ -60,6 +60,7 @@ import org.apache.ignite.internal.pagememory.persistence.PageStoreWriter;
import org.apache.ignite.internal.pagememory.persistence.PartitionMeta;
import org.apache.ignite.internal.pagememory.persistence.PersistentPageMemory;
import org.apache.ignite.internal.pagememory.persistence.WriteDirtyPage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteConcurrentMultiPairQueue;
import org.apache.ignite.lang.IgniteInternalCheckedException;
import org.jetbrains.annotations.Nullable;
@@ -71,7 +72,7 @@ import org.mockito.ArgumentCaptor;
/**
* For {@link CheckpointPagesWriter} testing.
*/
-public class CheckpointPagesWriterTest {
+public class CheckpointPagesWriterTest extends BaseIgniteAbstractTest {
private static final int PAGE_SIZE = 1024;
private static PageIoRegistry ioRegistry;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTest.java
index 6d3c4eb07f..6f5f6c3fc5 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTest.java
@@ -25,12 +25,13 @@ import static org.mockito.Mockito.mock;
import java.util.List;
import org.apache.ignite.internal.pagememory.FullPageId;
import org.apache.ignite.internal.pagememory.persistence.PersistentPageMemory;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* For {@link Checkpoint} testing.
*/
-public class CheckpointTest {
+public class CheckpointTest extends BaseIgniteAbstractTest {
@Test
void testHasDelta() {
CheckpointProgressImpl progress = mock(CheckpointProgressImpl.class);
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTimeoutLockTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTimeoutLockTest.java
index 03d84311fa..1635d90c74 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTimeoutLockTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointTimeoutLockTest.java
@@ -39,8 +39,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.lang.NodeStoppingException;
import org.jetbrains.annotations.Nullable;
@@ -50,9 +49,7 @@ import org.junit.jupiter.api.Test;
/**
* For {@link CheckpointTimeoutLock} testing.
*/
-public class CheckpointTimeoutLockTest {
- private final IgniteLogger log = Loggers.forClass(CheckpointTimeoutLockTest.class);
-
+public class CheckpointTimeoutLockTest extends BaseIgniteAbstractTest {
@Nullable
private CheckpointTimeoutLock timeoutLock;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointWorkflowTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointWorkflowTest.java
index a920aeb8cf..0a648dd03a 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointWorkflowTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointWorkflowTest.java
@@ -63,13 +63,12 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.stream.IntStream;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.pagememory.DataRegion;
import org.apache.ignite.internal.pagememory.FullPageId;
import org.apache.ignite.internal.pagememory.persistence.PersistentPageMemory;
import org.apache.ignite.internal.pagememory.persistence.checkpoint.CheckpointDirtyPages.CheckpointDirtyPagesView;
import org.apache.ignite.internal.pagememory.util.PageIdUtils;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.IgniteInternalCheckedException;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
@@ -79,9 +78,7 @@ import org.mockito.ArgumentCaptor;
/**
* For {@link CheckpointWorkflow} testing.
*/
-public class CheckpointWorkflowTest {
- private final IgniteLogger log = Loggers.forClass(CheckpointWorkflowTest.class);
-
+public class CheckpointWorkflowTest extends BaseIgniteAbstractTest {
@Nullable
private CheckpointWorkflow workflow;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointerTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointerTest.java
index edd3bc64d9..d0dce631ad 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointerTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/CheckpointerTest.java
@@ -75,6 +75,7 @@ import org.apache.ignite.internal.pagememory.persistence.compaction.Compactor;
import org.apache.ignite.internal.pagememory.persistence.store.DeltaFilePageStoreIo;
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStore;
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStoreManager;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.NodeStoppingException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -85,7 +86,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* For {@link Checkpointer} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class CheckpointerTest {
+public class CheckpointerTest extends BaseIgniteAbstractTest {
private static final int PAGE_SIZE = 1024;
private static PageIoRegistry ioRegistry;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/ReentrantReadWriteLockWithTrackingTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/ReentrantReadWriteLockWithTrackingTest.java
index baf9e94f85..c373185f80 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/ReentrantReadWriteLockWithTrackingTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/ReentrantReadWriteLockWithTrackingTest.java
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.IgniteInternalException;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
@@ -38,9 +38,7 @@ import org.mockito.ArgumentCaptor;
/**
* For {@link ReentrantReadWriteLockWithTracking} testing.
*/
-public class ReentrantReadWriteLockWithTrackingTest {
- private final IgniteLogger log = Loggers.forClass(getClass());
-
+public class ReentrantReadWriteLockWithTrackingTest extends BaseIgniteAbstractTest {
@Test
void testIsWriteLockedByCurrentThread() throws Exception {
ReentrantReadWriteLockWithTracking lock0 = new ReentrantReadWriteLockWithTracking();
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/compaction/CompactorTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/compaction/CompactorTest.java
index 0da1acac36..5f0dcce46c 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/compaction/CompactorTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/compaction/CompactorTest.java
@@ -43,8 +43,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.configuration.ConfigurationValue;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.pagememory.io.PageIo;
import org.apache.ignite.internal.pagememory.persistence.GroupPartitionId;
import org.apache.ignite.internal.pagememory.persistence.store.DeltaFilePageStoreIo;
@@ -52,16 +50,15 @@ import org.apache.ignite.internal.pagememory.persistence.store.FilePageStore;
import org.apache.ignite.internal.pagememory.persistence.store.FilePageStoreManager;
import org.apache.ignite.internal.pagememory.persistence.store.GroupPageStoresMap;
import org.apache.ignite.internal.pagememory.persistence.store.LongOperationAsyncExecutor;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* For {@link Compactor} testing.
*/
-public class CompactorTest {
+public class CompactorTest extends BaseIgniteAbstractTest {
private static final int PAGE_SIZE = 1024;
- private final IgniteLogger log = Loggers.forClass(CompactorTest.class);
-
@Test
void testStartAndStop() throws Exception {
Compactor compactor = new Compactor(log, "test", null, threadsConfig(1), mock(FilePageStoreManager.class), PAGE_SIZE);
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java
index 407c303f80..de7e63aaaa 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.fileio.FileIo;
import org.apache.ignite.internal.fileio.FileIoFactory;
import org.apache.ignite.internal.fileio.RandomAccessFileIoFactory;
import org.apache.ignite.internal.pagememory.io.PageIo;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.RepeatedTest;
@@ -51,7 +52,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Abstract class for testing descendants of {@link AbstractFilePageStoreIo}.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public abstract class AbstractFilePageStoreIoTest {
+public abstract class AbstractFilePageStoreIoTest extends BaseIgniteAbstractTest {
protected static final int PAGE_SIZE = 1024;
@WorkDirectory
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreManagerTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreManagerTest.java
index 3b9182c68b..005d9ca4c0 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreManagerTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreManagerTest.java
@@ -53,6 +53,7 @@ import java.util.stream.Stream;
import org.apache.ignite.internal.fileio.RandomAccessFileIoFactory;
import org.apache.ignite.internal.pagememory.persistence.GroupPartitionId;
import org.apache.ignite.internal.pagememory.persistence.store.GroupPageStoresMap.GroupPartitionPageStore;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.ArrayUtils;
@@ -69,7 +70,7 @@ import org.junit.jupiter.params.provider.ValueSource;
* For {@link FilePageStoreManager} testing.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class FilePageStoreManagerTest {
+public class FilePageStoreManagerTest extends BaseIgniteAbstractTest {
/** To be used in a loop. {@link RepeatedTest} cannot be combined with {@link ParameterizedTest}. */
private static final int REPEATS = 100;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreTest.java
index ffc3e8247c..0b5028b4a6 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/FilePageStoreTest.java
@@ -51,6 +51,7 @@ import java.util.function.IntFunction;
import java.util.function.Supplier;
import org.apache.ignite.internal.fileio.RandomAccessFileIoFactory;
import org.apache.ignite.internal.pagememory.io.PageIo;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.Test;
@@ -60,7 +61,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* For {@link FilePageStore} testing.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class FilePageStoreTest {
+public class FilePageStoreTest extends BaseIgniteAbstractTest {
private static final int PAGE_SIZE = 1024;
@WorkDirectory
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/GroupPageStoresMapTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/GroupPageStoresMapTest.java
index 31768ed2cb..84fd1df75e 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/GroupPageStoresMapTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/GroupPageStoresMapTest.java
@@ -37,6 +37,7 @@ import java.util.Collection;
import java.util.function.Supplier;
import org.apache.ignite.internal.pagememory.persistence.GroupPartitionId;
import org.apache.ignite.internal.pagememory.persistence.store.GroupPageStoresMap.GroupPartitionPageStore;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tostring.IgniteToStringInclude;
import org.apache.ignite.internal.tostring.S;
import org.junit.jupiter.api.BeforeEach;
@@ -45,7 +46,7 @@ import org.junit.jupiter.api.Test;
/**
* For {@link GroupPageStoresMap} testing.
*/
-public class GroupPageStoresMapTest {
+public class GroupPageStoresMapTest extends BaseIgniteAbstractTest {
private LongOperationAsyncExecutor longOperationAsyncExecutor;
private GroupPageStoresMap<PageStore> groupPageStoresMap;
diff --git a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/util/GradualTaskExecutorTest.java b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/util/GradualTaskExecutorTest.java
index 69e7ffe7a2..079ed3e24e 100644
--- a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/util/GradualTaskExecutorTest.java
+++ b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/util/GradualTaskExecutorTest.java
@@ -37,6 +37,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.ExceptionUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -45,7 +46,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class GradualTaskExecutorTest {
+class GradualTaskExecutorTest extends BaseIgniteAbstractTest {
private final ExecutorService executorService = Executors.newSingleThreadExecutor();
private final GradualTaskExecutor executor = new GradualTaskExecutor(executorService);
diff --git a/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java b/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java
index d5293c87e3..4f2af2c7f6 100644
--- a/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java
+++ b/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.placementdriver.leases.Lease;
import org.apache.ignite.internal.placementdriver.leases.LeaseBatch;
import org.apache.ignite.internal.placementdriver.leases.LeaseTracker;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.apache.ignite.internal.vault.VaultManager;
@@ -52,7 +53,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/** Tests to verify {@link PlacementDriver} implemented by {@link LeaseTracker}. */
-public class PlacementDriverTest {
+public class PlacementDriverTest extends BaseIgniteAbstractTest {
private static final HybridTimestamp AWAIT_TIME_10_000 = new HybridTimestamp(10_000, 0);
private static final ByteArray FAKE_KEY = new ByteArray("foobar");
diff --git a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java
index 73f278dd85..7d5aed168d 100644
--- a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java
+++ b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import org.apache.ignite.internal.raft.service.RaftGroupListener;
import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.replicator.TestReplicationGroupId;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.network.ClusterNode;
@@ -59,7 +60,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class ItLozaTest {
+public class ItLozaTest extends BaseIgniteAbstractTest {
/** Server port offset. */
private static final int PORT = 20010;
diff --git a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
index 8626d2e22f..658d45fa4b 100644
--- a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
+++ b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
@@ -56,6 +56,7 @@ import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.raft.storage.LogStorageFactory;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.replicator.TestReplicationGroupId;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.lang.NodeStoppingException;
@@ -87,7 +88,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class ItTruncateSuffixAndRestartTest {
+public class ItTruncateSuffixAndRestartTest extends BaseIgniteAbstractTest {
private static final int NODES = 3;
private static final String GROUP_NAME = "foo";
diff --git a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItCliServiceTest.java b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItCliServiceTest.java
index 9aa7c98948..d5ad0580c2 100644
--- a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItCliServiceTest.java
+++ b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/ItCliServiceTest.java
@@ -47,6 +47,7 @@ import java.util.concurrent.TimeUnit;
import java.util.function.BooleanSupplier;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.network.ClusterService;
@@ -76,7 +77,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Jraft cli tests.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class ItCliServiceTest {
+public class ItCliServiceTest extends BaseIgniteAbstractTest {
/**
* The logger.
*/
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 6f253162d2..962d301265 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
@@ -76,6 +76,7 @@ import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.raft.JraftGroupEventsListener;
import org.apache.ignite.internal.raft.storage.impl.DefaultLogStorageFactory;
import org.apache.ignite.internal.raft.storage.impl.IgniteJraftServiceFactory;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.network.ClusterService;
@@ -140,9 +141,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Integration tests for raft cluster. TODO asch get rid of sleeps wherether possible IGNITE-14832
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class ItNodeTest {
- private static final IgniteLogger LOG = Loggers.forClass(ItNodeTest.class);
-
+public class ItNodeTest extends BaseIgniteAbstractTest {
private static DumpThread dumpThread;
private static class DumpThread extends Thread {
@@ -155,7 +154,7 @@ public class ItNodeTest {
while (!stopped) {
try {
Thread.sleep(DUMP_TIMEOUT_MS);
- LOG.info("Test hang too long, dump threads");
+ log.info("Test hang too long, dump threads");
TestUtils.dumpThreads();
}
catch (InterruptedException e) {
@@ -202,7 +201,7 @@ public class ItNodeTest {
@BeforeEach
public void setup(TestInfo testInfo, @WorkDirectory Path workDir) throws Exception {
- LOG.info(">>>>>>>>>>>>>>> Start test method: " + testInfo.getDisplayName());
+ log.info(">>>>>>>>>>>>>>> Start test method: " + testInfo.getDisplayName());
this.testInfo = testInfo;
dataPath = workDir.toString();
@@ -218,7 +217,7 @@ public class ItNodeTest {
service.shutdown();
}
catch (Exception e) {
- LOG.error("Error while closing a service", e);
+ log.error("Error while closing a service", e);
}
});
@@ -234,7 +233,7 @@ public class ItNodeTest {
TestUtils.assertAllJraftThreadsStopped();
- LOG.info(">>>>>>>>>>>>>>> End test method: " + testInfo.getDisplayName() + ", cost:"
+ log.info(">>>>>>>>>>>>>>> End test method: " + testInfo.getDisplayName() + ", cost:"
+ (Utils.monotonicMs() - testStartMs) + " ms.");
}
@@ -282,7 +281,7 @@ public class ItNodeTest {
ByteBuffer data = ByteBuffer.wrap(("hello" + i).getBytes(UTF_8));
int finalI = i;
Task task = new Task(data, new JoinableClosure(status -> {
- LOG.info("{} i={}", status, finalI);
+ log.info("{} i={}", status, finalI);
if (!status.isOk()) {
assertTrue(
status.getRaftError() == RaftError.EBUSY || status.getRaftError() == RaftError.EPERM);
@@ -542,18 +541,18 @@ public class ItNodeTest {
public void onCreated(PeerId peer) {
int val = startedCounter.incrementAndGet();
- LOG.info("Replicator has been created {} {}", peer, val);
+ log.info("Replicator has been created {} {}", peer, val);
}
@Override
public void stateChanged(final PeerId peer, final ReplicatorState newState) {
- LOG.info("Replicator {} state is changed into {}.", peer, newState);
+ log.info("Replicator {} state is changed into {}.", peer, newState);
}
/** {@inheritDoc} */
@Override
public void onError(PeerId peer, Status status) {
- LOG.info("Replicator has errors {} {}", peer, status);
+ log.info("Replicator has errors {} {}", peer, status);
}
/** {@inheritDoc} */
@@ -561,7 +560,7 @@ public class ItNodeTest {
public void onDestroyed(PeerId peer) {
int val = stoppedCounter.incrementAndGet();
- LOG.info("Replicator has been destroyed {} {}", peer, val);
+ log.info("Replicator has been destroyed {} {}", peer, val);
}
}
@@ -585,7 +584,7 @@ public class ItNodeTest {
assertTrue(waitForCondition(() -> startedCounter.get() == 2, 5_000), startedCounter.get() + "");
PeerId targetPeer = followers.get(0).getNodeId().getPeerId().copy();
- LOG.info("Transfer leadership from {} to {}", leader, targetPeer);
+ log.info("Transfer leadership from {} to {}", leader, targetPeer);
assertTrue(leader.transferLeadershipTo(targetPeer).isOk());
Thread.sleep(1000);
cluster.waitAndGetLeader();
@@ -1102,20 +1101,20 @@ public class ItNodeTest {
PeerId oldLeader = leader.getNodeId().getPeerId().copy();
// remove old leader
- LOG.info("Remove old leader {}", oldLeader);
+ log.info("Remove old leader {}", oldLeader);
CountDownLatch latch = new CountDownLatch(1);
leader.removePeer(oldLeader, new ExpectClosure(latch));
waitLatch(latch);
assertEquals(60, leader.getNodeTargetPriority());
// stop and clean old leader
- LOG.info("Stop and clean old leader {}", oldLeader);
+ log.info("Stop and clean old leader {}", oldLeader);
assertTrue(cluster.stop(oldLeader));
cluster.clean(oldLeader);
// elect new leader
leader = cluster.waitAndGetLeader();
- LOG.info("New leader is {}", leader);
+ log.info("New leader is {}", leader);
assertNotNull(leader);
assertNotEquals(leader.getNodeId().getPeerId(), oldLeader);
}
@@ -1456,7 +1455,7 @@ public class ItNodeTest {
//elect get leader
Node leader = cluster.waitAndGetLeader();
assertNotNull(leader);
- LOG.info("Current leader is {}", leader.getLeaderId());
+ log.info("Current leader is {}", leader.getLeaderId());
// apply tasks to leader
sendTestTaskAndWait(leader);
@@ -1473,7 +1472,7 @@ public class ItNodeTest {
});
// stop leader
- LOG.warn("Stop leader {}", leader.getNodeId().getPeerId());
+ log.warn("Stop leader {}", leader.getNodeId().getPeerId());
PeerId oldLeader = leader.getNodeId().getPeerId();
assertTrue(cluster.stop(leader.getNodeId().getPeerId()));
@@ -1484,7 +1483,7 @@ public class ItNodeTest {
// elect new leader
leader = cluster.waitAndGetLeader();
- LOG.info("Elect new leader is {}", leader.getLeaderId());
+ log.info("Elect new leader is {}", leader.getLeaderId());
// apply tasks to new leader
CountDownLatch latch = new CountDownLatch(10);
for (int i = 10; i < 20; i++) {
@@ -1495,7 +1494,7 @@ public class ItNodeTest {
waitLatch(latch);
// restart old leader
- LOG.info("restart old leader {}", oldLeader);
+ log.info("restart old leader {}", oldLeader);
assertTrue(cluster.start(findById(peers, oldLeader)));
// apply something
@@ -1512,7 +1511,7 @@ public class ItNodeTest {
cluster.clean(oldLeader);
// restart old leader
- LOG.info("Restart old leader with cleanup {}", oldLeader);
+ log.info("Restart old leader with cleanup {}", oldLeader);
assertTrue(cluster.start(findById(peers, oldLeader)));
cluster.ensureSame();
@@ -1611,12 +1610,12 @@ public class ItNodeTest {
TestPeer followerPeer = findById(peers, followers.get(0).getNodeId().getPeerId());
// stop and clean follower
- LOG.info("Stop and clean follower {}", followerPeer);
+ log.info("Stop and clean follower {}", followerPeer);
assertTrue(cluster.stop(followerPeer.getPeerId()));
cluster.clean(followerPeer.getPeerId());
// remove follower
- LOG.info("Remove follower {}", followerPeer);
+ log.info("Remove follower {}", followerPeer);
CountDownLatch latch = new CountDownLatch(1);
leader.removePeer(followerPeer.getPeerId(), new ExpectClosure(latch));
waitLatch(latch);
@@ -1629,7 +1628,7 @@ public class ItNodeTest {
assertTrue(peers.remove(followerPeer));
// start follower
- LOG.info("Start and add follower {}", followerPeer);
+ log.info("Start and add follower {}", followerPeer);
assertTrue(cluster.start(followerPeer));
// re-add follower
latch = new CountDownLatch(1);
@@ -1671,25 +1670,25 @@ public class ItNodeTest {
TestPeer oldLeader = findById(peers, leaderId);
// remove old leader
- LOG.info("Remove old leader {}", oldLeader);
+ log.info("Remove old leader {}", oldLeader);
CountDownLatch latch = new CountDownLatch(1);
leader.removePeer(oldLeader.getPeerId(), new ExpectClosure(latch));
waitLatch(latch);
// elect new leader
leader = cluster.waitAndGetLeader();
- LOG.info("New leader is {}", leader);
+ log.info("New leader is {}", leader);
assertNotNull(leader);
// apply tasks to new leader
sendTestTaskAndWait(leader, 10, RaftError.SUCCESS);
// stop and clean old leader
- LOG.info("Stop and clean old leader {}", oldLeader);
+ log.info("Stop and clean old leader {}", oldLeader);
assertTrue(cluster.stop(oldLeader.getPeerId()));
cluster.clean(oldLeader.getPeerId());
// Add and start old leader
- LOG.info("Start and add old leader {}", oldLeader);
+ log.info("Start and add old leader {}", oldLeader);
assertTrue(cluster.start(oldLeader));
peers = TestUtils.generatePeers(testInfo, 3);
@@ -1731,7 +1730,7 @@ public class ItNodeTest {
TestPeer followerPeer = findById(peers, followerPeerId);
// remove follower
- LOG.info("Remove follower {}", followerPeer);
+ log.info("Remove follower {}", followerPeer);
CountDownLatch latch = new CountDownLatch(1);
leader.removePeer(followerPeer.getPeerId(), new ExpectClosure(latch));
waitLatch(latch);
@@ -1741,7 +1740,7 @@ public class ItNodeTest {
Thread.sleep(2000);
// add follower
- LOG.info("Add follower {}", followerPeer);
+ log.info("Add follower {}", followerPeer);
peers = TestUtils.generatePeers(testInfo, 3);
assertTrue(peers.remove(followerPeer));
latch = new CountDownLatch(1);
@@ -1793,7 +1792,7 @@ public class ItNodeTest {
PeerId followerPeer1 = followers.get(0).getNodeId().getPeerId();
PeerId followerPeer2 = followers.get(1).getNodeId().getPeerId();
- LOG.info("Stop and clean follower {}", followerPeer1);
+ log.info("Stop and clean follower {}", followerPeer1);
assertTrue(cluster.stop(followerPeer1));
cluster.clean(followerPeer1);
@@ -1801,9 +1800,9 @@ public class ItNodeTest {
sendTestTaskAndWait(leader, 10, RaftError.SUCCESS);
// set peer when no quorum die
PeerId leaderId = leader.getLeaderId().copy();
- LOG.info("Set peers to {}", leaderId);
+ log.info("Set peers to {}", leaderId);
- LOG.info("Stop and clean follower {}", followerPeer2);
+ log.info("Stop and clean follower {}", followerPeer2);
assertTrue(cluster.stop(followerPeer2));
cluster.clean(followerPeer2);
@@ -1817,28 +1816,28 @@ public class ItNodeTest {
// new peers equal to current conf
assertTrue(leader.resetPeers(new Configuration(peers.stream().map(TestPeer::getPeerId).collect(toList()))).isOk());
// set peer when quorum die
- LOG.warn("Set peers to {}", leaderId);
+ log.warn("Set peers to {}", leaderId);
assertTrue(leader.resetPeers(new Configuration(newPeers)).isOk());
leader = cluster.waitAndGetLeader();
assertNotNull(leader);
assertEquals(leaderId, leader.getNodeId().getPeerId());
- LOG.info("start follower {}", followerPeer1);
+ log.info("start follower {}", followerPeer1);
assertTrue(cluster.start(findById(peers, followerPeer1), true, 300));
- LOG.info("start follower {}", followerPeer2);
+ log.info("start follower {}", followerPeer2);
assertTrue(cluster.start(findById(peers, followerPeer2), true, 300));
assertTrue(waitForTopology(cluster, followerPeer1, 3, 10_000));
assertTrue(waitForTopology(cluster, followerPeer2, 3, 10_000));
CountDownLatch latch = new CountDownLatch(1);
- LOG.info("Add old follower {}", followerPeer1);
+ log.info("Add old follower {}", followerPeer1);
leader.addPeer(followerPeer1, new ExpectClosure(latch));
waitLatch(latch);
latch = new CountDownLatch(1);
- LOG.info("Add old follower {}", followerPeer2);
+ log.info("Add old follower {}", followerPeer2);
leader.addPeer(followerPeer2, new ExpectClosure(latch));
waitLatch(latch);
@@ -1866,7 +1865,7 @@ public class ItNodeTest {
// get leader
Node leader = cluster.waitAndGetLeader();
- LOG.info("Leader: " + leader);
+ log.info("Leader: " + leader);
assertNotNull(leader);
// apply tasks to leader
@@ -1902,7 +1901,7 @@ public class ItNodeTest {
// get leader
Node leader = cluster.waitAndGetLeader();
- LOG.info("Leader: " + leader);
+ log.info("Leader: " + leader);
assertNotNull(leader);
// apply tasks to leader
@@ -2214,11 +2213,11 @@ public class ItNodeTest {
Node leader0 = cluster.waitAndGetLeader();
assertNotNull(leader0);
long savedTerm = ((NodeImpl) leader0).getCurrentTerm();
- LOG.info("Current leader is {}, term is {}", leader0, savedTerm);
+ log.info("Current leader is {}, term is {}", leader0, savedTerm);
Thread.sleep(5000);
Node leader1 = cluster.waitAndGetLeader();
assertNotNull(leader1);
- LOG.info("Current leader is {}", leader1);
+ log.info("Current leader is {}", leader1);
assertEquals(savedTerm, ((NodeImpl) leader1).getCurrentTerm());
}
@@ -2277,7 +2276,7 @@ public class ItNodeTest {
assertEquals(2, followers.size());
PeerId targetPeer = followers.get(0).getNodeId().getPeerId().copy();
- LOG.info("Transfer leadership from {} to {}", leader, targetPeer);
+ log.info("Transfer leadership from {} to {}", leader, targetPeer);
assertTrue(leader.transferLeadershipTo(targetPeer).isOk());
leader = cluster.waitAndGetLeader();
assertEquals(leader.getNodeId().getPeerId(), targetPeer);
@@ -2303,7 +2302,7 @@ public class ItNodeTest {
assertTrue(cluster.stop(targetPeer));
sendTestTaskAndWait(leader);
- LOG.info("Transfer leadership from {} to {}", leader, targetPeer);
+ log.info("Transfer leadership from {} to {}", leader, targetPeer);
assertTrue(leader.transferLeadershipTo(targetPeer).isOk());
CountDownLatch latch = new CountDownLatch(1);
@@ -2444,7 +2443,7 @@ public class ItNodeTest {
assertNotNull(leader);
Node oldLeader = leader;
- LOG.info("Shutdown leader {}", leader);
+ log.info("Shutdown leader {}", leader);
leader.shutdown();
leader.join();
@@ -2544,7 +2543,7 @@ public class ItNodeTest {
assertEquals(4, followers.size());
Node errorNode = followers.get(0);
PeerId errorPeer = errorNode.getNodeId().getPeerId().copy();
- LOG.info("Set follower {} into error state", errorNode);
+ log.info("Set follower {} into error state", errorNode);
((NodeImpl) errorNode).onError(new RaftException(EnumOutter.ErrorType.ERROR_TYPE_STATE_MACHINE, new Status(-1,
"Follower has something wrong.")));
@@ -2553,16 +2552,16 @@ public class ItNodeTest {
assertTrue(cluster.stop(oldLeaderAddr));
Node leader = cluster.waitAndGetLeader();
assertNotNull(leader);
- LOG.info("Elect a new leader {}", leader);
+ log.info("Elect a new leader {}", leader);
// apply something again
sendTestTaskAndWait(leader, 10, RaftError.SUCCESS);
// stop error follower
Thread.sleep(20);
- LOG.info("Stop error follower {}", errorNode);
+ log.info("Stop error follower {}", errorNode);
assertTrue(cluster.stop(errorPeer));
// restart error and old leader
- LOG.info("Restart error follower {} and old leader {}", errorPeer, oldLeaderAddr);
+ log.info("Restart error follower {} and old leader {}", errorPeer, oldLeaderAddr);
assertTrue(cluster.start(findById(peers, errorPeer)));
assertTrue(cluster.start(findById(peers, oldLeaderAddr)));
@@ -2759,7 +2758,7 @@ public class ItNodeTest {
catch (LogIndexOutOfBoundsException e) {
assertEquals("Request index is invalid: 0", e.getMessage());
}
- LOG.info("Trigger leader snapshot");
+ log.info("Trigger leader snapshot");
CountDownLatch latch = new CountDownLatch(1);
leader.snapshot(new ExpectClosure(latch));
waitLatch(latch);
@@ -2778,7 +2777,7 @@ public class ItNodeTest {
sendTestTaskAndWait(leader, amount, RaftError.SUCCESS);
// trigger leader snapshot for the second time, after this the log of index 1~11 will be deleted.
- LOG.info("Trigger leader snapshot");
+ log.info("Trigger leader snapshot");
latch = new CountDownLatch(1);
leader.snapshot(new ExpectClosure(latch));
waitLatch(latch);
@@ -3264,7 +3263,7 @@ public class ItNodeTest {
done.reset();
leader.changePeers(conf, done);
assertEquals(RaftError.EPERM, done.await().getRaftError());
- LOG.info(done.getStatus().toString());
+ log.info(done.getStatus().toString());
assertFalse(((NodeImpl) leader).getConf().isStable());
@@ -3322,7 +3321,7 @@ public class ItNodeTest {
conf.addPeer(arg.peers.get(i));
}
if (conf.isEmpty()) {
- LOG.warn("No peer has been selected");
+ log.warn("No peer has been selected");
continue;
}
SynchronizedClosure done = new SynchronizedClosure();
@@ -3332,7 +3331,7 @@ public class ItNodeTest {
}
}
catch (InterruptedException e) {
- LOG.error("ChangePeersThread is interrupted", e);
+ log.error("ChangePeersThread is interrupted", e);
}
});
}
@@ -3476,7 +3475,7 @@ public class ItNodeTest {
}
}
catch (Exception e) {
- LOG.error("Failed to run tasks", e);
+ log.error("Failed to run tasks", e);
}
finally {
latch.countDown();
@@ -3513,7 +3512,7 @@ public class ItNodeTest {
Node leader = cluster.waitAndGetLeader();
- LOG.warn("Current leader {}, electTimeout={}", leader.getNodeId().getPeerId(), leader.getOptions().getElectionTimeoutMs());
+ log.warn("Current leader {}, electTimeout={}", leader.getNodeId().getPeerId(), leader.getOptions().getElectionTimeoutMs());
List<Node> followers = cluster.getFollowers();
@@ -3527,7 +3526,7 @@ public class ItNodeTest {
return false;
});
- LOG.warn("Stop leader {}, curTerm={}", leader.getNodeId().getPeerId(), ((NodeImpl) leader).getCurrentTerm());
+ log.warn("Stop leader {}, curTerm={}", leader.getNodeId().getPeerId(), ((NodeImpl) leader).getCurrentTerm());
assertTrue(cluster.stop(leader.getNodeId().getPeerId()));
@@ -3541,7 +3540,7 @@ public class ItNodeTest {
// elect new leader
leader = cluster.waitAndGetLeader();
- LOG.info("Elect new leader is {}, curTerm={}", leader.getLeaderId(), ((NodeImpl) leader).getCurrentTerm());
+ log.info("Elect new leader is {}, curTerm={}", leader.getLeaderId(), ((NodeImpl) leader).getCurrentTerm());
}
@Test
@@ -3578,7 +3577,7 @@ public class ItNodeTest {
int initElectionTimeout = leader.getOptions().getElectionTimeoutMs();
- LOG.warn("Current leader {}, electTimeout={}", leader.getNodeId().getPeerId(), leader.getOptions().getElectionTimeoutMs());
+ log.warn("Current leader {}, electTimeout={}", leader.getNodeId().getPeerId(), leader.getOptions().getElectionTimeoutMs());
List<Node> followers = cluster.getFollowers();
@@ -3590,7 +3589,7 @@ public class ItNodeTest {
blockMessagesOnFollowers(followers, blockingPredicate);
- LOG.warn("Stop leader {}, curTerm={}", leader.getNodeId().getPeerId(), ((NodeImpl) leader).getCurrentTerm());
+ log.warn("Stop leader {}, curTerm={}", leader.getNodeId().getPeerId(), ((NodeImpl) leader).getCurrentTerm());
assertTrue(cluster.stop(leader.getNodeId().getPeerId()));
@@ -3606,7 +3605,7 @@ public class ItNodeTest {
// elect new leader
leader = cluster.waitAndGetLeader();
- LOG.info("Elected new leader is {}, curTerm={}", leader.getLeaderId(), ((NodeImpl) leader).getCurrentTerm());
+ log.info("Elected new leader is {}, curTerm={}", leader.getLeaderId(), ((NodeImpl) leader).getCurrentTerm());
assertTrue(
waitForCondition(() -> followers.stream().allMatch(f -> f.getOptions().getElectionTimeoutMs() == initElectionTimeout),
@@ -3646,7 +3645,7 @@ public class ItNodeTest {
if (cnt.get() >= 2)
return true;
- LOG.info("Send heartbeat: " + msg + " to " + nodeId);
+ log.info("Send heartbeat: " + msg + " to " + nodeId);
cnt.incrementAndGet();
@@ -3771,7 +3770,7 @@ public class ItNodeTest {
RaftGroupService grp = cluster.getServer(peerId);
if (grp == null) {
- LOG.warn("Node has not been found {}", peerId);
+ log.warn("Node has not been found {}", peerId);
return false;
}
diff --git a/modules/raft/src/test/java/org/apache/ignite/internal/raft/JraftGroupEventsListenerTest.java b/modules/raft/src/test/java/org/apache/ignite/internal/raft/JraftGroupEventsListenerTest.java
index 03ace36be4..842b0120a5 100644
--- a/modules/raft/src/test/java/org/apache/ignite/internal/raft/JraftGroupEventsListenerTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/internal/raft/JraftGroupEventsListenerTest.java
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.when;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.apache.ignite.internal.testframework.util.DirectExecutor;
import org.apache.ignite.raft.jraft.Closure;
@@ -40,7 +41,7 @@ import org.apache.ignite.raft.jraft.core.NodeImpl;
import org.apache.ignite.raft.jraft.option.NodeOptions;
import org.junit.jupiter.api.Test;
-class JraftGroupEventsListenerTest {
+class JraftGroupEventsListenerTest extends BaseIgniteAbstractTest {
/**
* Tests that {@link JraftGroupEventsListener} handles correctly a situation when
* ConfigurationCtx#reset is called with null status.
diff --git a/modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/impl/RocksDbSharedLogStorageAdvancedTest.java b/modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/impl/RocksDbSharedLogStorageAdvancedTest.java
index 6fa84c4f49..e9ccb9034d 100644
--- a/modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/impl/RocksDbSharedLogStorageAdvancedTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/impl/RocksDbSharedLogStorageAdvancedTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.nio.file.Path;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.raft.jraft.conf.ConfigurationManager;
@@ -41,7 +42,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* Tests for implementation specifics of the shared storage.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class RocksDbSharedLogStorageAdvancedTest {
+public class RocksDbSharedLogStorageAdvancedTest extends BaseIgniteAbstractTest {
@WorkDirectory
private Path path;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationEntryTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationEntryTest.java
index 3ab0b00fb1..67538cf5af 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationEntryTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationEntryTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.ignite.raft.jraft.conf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Arrays;
import java.util.HashSet;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.entity.PeerId;
import org.apache.ignite.raft.jraft.test.TestUtils;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class ConfigurationEntryTest {
+public class ConfigurationEntryTest extends BaseIgniteAbstractTest {
@Test
public void testStuffMethods() {
ConfigurationEntry entry = TestUtils.getConfEntry("localhost-8081,localhost-8082,localhost-8083", null);
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationManagerTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationManagerTest.java
index d4c338c762..363ac3095f 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationManagerTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/conf/ConfigurationManagerTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.ignite.raft.jraft.conf;
-import org.apache.ignite.raft.jraft.entity.LogId;
-import org.apache.ignite.raft.jraft.test.TestUtils;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class ConfigurationManagerTest {
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
+import org.apache.ignite.raft.jraft.entity.LogId;
+import org.apache.ignite.raft.jraft.test.TestUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ConfigurationManagerTest extends BaseIgniteAbstractTest {
private ConfigurationManager confManager;
@BeforeEach
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/BallotBoxTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/BallotBoxTest.java
index 2dba5af569..d8ddd4b130 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/BallotBoxTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/BallotBoxTest.java
@@ -16,7 +16,14 @@
*/
package org.apache.ignite.raft.jraft.core;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.concurrent.ExecutorService;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.Closure;
import org.apache.ignite.raft.jraft.FSMCaller;
import org.apache.ignite.raft.jraft.JRaftUtils;
@@ -35,14 +42,8 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
@ExtendWith(MockitoExtension.class)
-public class BallotBoxTest {
+public class BallotBoxTest extends BaseIgniteAbstractTest {
private BallotBox box;
@Mock
private FSMCaller waiter;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/FSMCallerTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/FSMCallerTest.java
index a1bd084ef6..52f0a164cc 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/FSMCallerTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/FSMCallerTest.java
@@ -16,9 +16,14 @@
*/
package org.apache.ignite.raft.jraft.core;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.apache.ignite.raft.jraft.Iterator;
import org.apache.ignite.raft.jraft.JRaftUtils;
@@ -56,12 +61,8 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@ExtendWith(MockitoExtension.class)
-public class FSMCallerTest {
+public class FSMCallerTest extends BaseIgniteAbstractTest {
private FSMCallerImpl fsmCaller;
private FSMCallerOptions opts;
@Mock
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorImplTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorImplTest.java
index 16103a9660..22a6b65253 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorImplTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorImplTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.ignite.raft.jraft.core;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.Closure;
import org.apache.ignite.raft.jraft.JRaftUtils;
import org.apache.ignite.raft.jraft.StateMachine;
@@ -41,16 +49,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-public class IteratorImplTest {
+public class IteratorImplTest extends BaseIgniteAbstractTest {
private IteratorImpl iter;
@Mock
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorTest.java
index d2140cd260..cf5059afb9 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/IteratorTest.java
@@ -16,10 +16,17 @@
*/
package org.apache.ignite.raft.jraft.core;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.Closure;
import org.apache.ignite.raft.jraft.Iterator;
import org.apache.ignite.raft.jraft.StateMachine;
@@ -38,15 +45,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-public class IteratorTest {
+public class IteratorTest extends BaseIgniteAbstractTest {
private IteratorImpl iterImpl;
private Iterator iter;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReadOnlyServiceTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReadOnlyServiceTest.java
index eeac58d3f5..b228de5433 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReadOnlyServiceTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReadOnlyServiceTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.FSMCaller;
import org.apache.ignite.raft.jraft.JRaftUtils;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
@@ -60,7 +61,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-public class ReadOnlyServiceTest {
+public class ReadOnlyServiceTest extends BaseIgniteAbstractTest {
private ReadOnlyServiceImpl readOnlyServiceImpl;
private RaftMessagesFactory msgFactory;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorGroupTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorGroupTest.java
index 2dd1055375..c82bdda64f 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorGroupTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorGroupTest.java
@@ -26,8 +26,7 @@ import static org.mockito.ArgumentMatchers.eq;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.Status;
import org.apache.ignite.raft.jraft.conf.Configuration;
import org.apache.ignite.raft.jraft.conf.ConfigurationEntry;
@@ -55,10 +54,7 @@ import org.mockito.stubbing.Answer;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-public class ReplicatorGroupTest {
-
- static final IgniteLogger LOG = Loggers.forClass(ReplicatorGroupTest.class);
-
+public class ReplicatorGroupTest extends BaseIgniteAbstractTest {
private TimerManager timerManager;
private ReplicatorGroupImpl replicatorGroup;
@Mock
@@ -175,19 +171,19 @@ public class ReplicatorGroupTest {
class UserReplicatorStateListener implements Replicator.ReplicatorStateListener {
@Override
public void onCreated(final PeerId peer) {
- LOG.info("Replicator has created");
+ log.info("Replicator has created");
ReplicatorGroupTest.this.startedCounter.incrementAndGet();
}
@Override
public void onError(final PeerId peer, final Status status) {
- LOG.info("Replicator has errors");
+ log.info("Replicator has errors");
ReplicatorGroupTest.this.errorCounter.incrementAndGet();
}
@Override
public void onDestroyed(final PeerId peer) {
- LOG.info("Replicator has been destroyed");
+ log.info("Replicator has been destroyed");
ReplicatorGroupTest.this.stoppedCounter.incrementAndGet();
}
}
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorTest.java
index 5399bfda20..6bd0409592 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/core/ReplicatorTest.java
@@ -16,6 +16,15 @@
*/
package org.apache.ignite.raft.jraft.core;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
+
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
@@ -25,6 +34,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.JRaftUtils;
import org.apache.ignite.raft.jraft.Status;
import org.apache.ignite.raft.jraft.closure.CatchUpClosure;
@@ -64,18 +74,9 @@ import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.mockito.stubbing.Answer;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.same;
-
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-public class ReplicatorTest {
+public class ReplicatorTest extends BaseIgniteAbstractTest {
private ThreadId id;
private final RaftOptions raftOptions = new RaftOptions();
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/AbstractClientServiceTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/AbstractClientServiceTest.java
index 63dd7b5617..05edfd7d8b 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/AbstractClientServiceTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/AbstractClientServiceTest.java
@@ -16,10 +16,21 @@
*/
package org.apache.ignite.raft.jraft.rpc;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.JRaftUtils;
import org.apache.ignite.raft.jraft.Status;
import org.apache.ignite.raft.jraft.entity.PeerId;
@@ -43,19 +54,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-public class AbstractClientServiceTest {
+public class AbstractClientServiceTest extends BaseIgniteAbstractTest {
private RpcOptions rpcOptions;
private MockClientService clientService;
@Mock
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/PingRequestProcessorTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/PingRequestProcessorTest.java
index 78df093c56..e90f81464c 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/PingRequestProcessorTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/PingRequestProcessorTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.ignite.raft.jraft.rpc.impl;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
import org.apache.ignite.raft.jraft.rpc.RpcRequests.ErrorResponse;
import org.apache.ignite.raft.jraft.test.MockAsyncContext;
import org.apache.ignite.raft.jraft.test.TestUtils;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class PingRequestProcessorTest {
+public class PingRequestProcessorTest extends BaseIgniteAbstractTest {
@Test
public void testHandlePing() throws Exception {
PingRequestProcessor processor = new PingRequestProcessor(null, new RaftMessagesFactory());
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/AbstractCliRequestProcessorTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/AbstractCliRequestProcessorTest.java
index f91e8cda47..26c43e2eb8 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/AbstractCliRequestProcessorTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/AbstractCliRequestProcessorTest.java
@@ -18,6 +18,7 @@ package org.apache.ignite.raft.jraft.rpc.impl.cli;
import java.util.ArrayList;
import java.util.List;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
import org.apache.ignite.raft.jraft.Closure;
import org.apache.ignite.raft.jraft.JRaftUtils;
@@ -38,7 +39,7 @@ import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-public abstract class AbstractCliRequestProcessorTest<T extends Message> {
+public abstract class AbstractCliRequestProcessorTest<T extends Message> extends BaseIgniteAbstractTest {
@Mock
private Node node;
private final String groupId = "test";
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/BaseCliRequestProcessorTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/BaseCliRequestProcessorTest.java
index 4197dfd652..fb29c144a1 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/BaseCliRequestProcessorTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/cli/BaseCliRequestProcessorTest.java
@@ -16,9 +16,14 @@
*/
package org.apache.ignite.raft.jraft.rpc.impl.cli;
-import org.apache.ignite.raft.jraft.RaftMessagesFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.JRaftUtils;
import org.apache.ignite.raft.jraft.Node;
+import org.apache.ignite.raft.jraft.RaftMessagesFactory;
import org.apache.ignite.raft.jraft.Status;
import org.apache.ignite.raft.jraft.entity.NodeId;
import org.apache.ignite.raft.jraft.entity.PeerId;
@@ -37,12 +42,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-
@ExtendWith(MockitoExtension.class)
-public class BaseCliRequestProcessorTest {
+public class BaseCliRequestProcessorTest extends BaseIgniteAbstractTest {
private static class MockCliRequestProcessor extends BaseCliRequestProcessor<PingRequest> {
private String peerId;
private String groupId;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/BaseNodeRequestProcessorTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/BaseNodeRequestProcessorTest.java
index 488c7a5d51..dbabfeafe6 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/BaseNodeRequestProcessorTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/BaseNodeRequestProcessorTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.raft.jraft.rpc.impl.core;
import java.util.concurrent.ExecutorService;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.JRaftUtils;
import org.apache.ignite.raft.jraft.Node;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
@@ -38,7 +39,7 @@ import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-public abstract class BaseNodeRequestProcessorTest<T extends Message> {
+public abstract class BaseNodeRequestProcessorTest<T extends Message> extends BaseIgniteAbstractTest {
@Mock(extraInterfaces = {RaftServerService.class})
private Node node;
protected final String groupId = "test";
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/NodeRequestProcessorTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/NodeRequestProcessorTest.java
index c38cb1bedd..809cc265a3 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/NodeRequestProcessorTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/rpc/impl/core/NodeRequestProcessorTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.ignite.raft.jraft.rpc.impl.core;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.withSettings;
+
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.Node;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
import org.apache.ignite.raft.jraft.Status;
@@ -35,11 +40,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.withSettings;
-
-public class NodeRequestProcessorTest {
+public class NodeRequestProcessorTest extends BaseIgniteAbstractTest {
private static class MockRequestProcessor extends NodeRequestProcessor<PingRequest> {
private String peerId;
private String groupId;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/BaseStorageTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/BaseStorageTest.java
index 5b335cb1d6..bcfb876d2a 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/BaseStorageTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/BaseStorageTest.java
@@ -19,12 +19,13 @@ package org.apache.ignite.raft.jraft.storage;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(WorkDirectoryExtension.class)
-public class BaseStorageTest {
+public class BaseStorageTest extends BaseIgniteAbstractTest {
@WorkDirectory
protected Path path;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/FileServiceTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/FileServiceTest.java
index 149402acd5..3655f36cb6 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/FileServiceTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/FileServiceTest.java
@@ -26,8 +26,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
@@ -44,9 +43,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
@ExtendWith(WorkDirectoryExtension.class)
-public class FileServiceTest {
- private static final IgniteLogger LOG = Loggers.forClass(FileServiceTest.class);
-
+public class FileServiceTest extends BaseIgniteAbstractTest {
@WorkDirectory
private Path path;
@@ -169,7 +166,7 @@ public class FileServiceTest {
assertArrayEquals(sourceArray, respArray, "Offset: " + fileOffset);
}
catch (AssertionError e) {
- LOG.error("arrayComparisonFailure", e);
+ log.error("arrayComparisonFailure", e);
}
offset += length;
}
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/VolatileLogStorageSpecificsTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/VolatileLogStorageSpecificsTest.java
index 4a1dc78420..9ea79be049 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/VolatileLogStorageSpecificsTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/VolatileLogStorageSpecificsTest.java
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.conf.ConfigurationManager;
import org.apache.ignite.raft.jraft.entity.LogEntry;
import org.apache.ignite.raft.jraft.entity.codec.v1.LogEntryV1CodecFactory;
@@ -42,7 +43,7 @@ import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class VolatileLogStorageSpecificsTest {
+class VolatileLogStorageSpecificsTest extends BaseIgniteAbstractTest {
private static final int TERM = 1;
private VolatileLogStorage logStorage;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/CopySessionTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/CopySessionTest.java
index 2edf1ee224..69bba78292 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/CopySessionTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/CopySessionTest.java
@@ -16,10 +16,16 @@
*/
package org.apache.ignite.raft.jraft.storage.snapshot.remote;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.Status;
import org.apache.ignite.raft.jraft.core.TimerManager;
import org.apache.ignite.raft.jraft.entity.PeerId;
@@ -43,13 +49,8 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-
@ExtendWith(MockitoExtension.class)
-public class CopySessionTest {
+public class CopySessionTest extends BaseIgniteAbstractTest {
private CopySession session;
@Mock
private RaftClientService rpcService;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/RemoteFileCopierTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/RemoteFileCopierTest.java
index 4268de16d8..3b2644235e 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/RemoteFileCopierTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/snapshot/remote/RemoteFileCopierTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.ignite.raft.jraft.storage.snapshot.remote;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.core.TimerManager;
import org.apache.ignite.raft.jraft.entity.PeerId;
import org.apache.ignite.raft.jraft.option.NodeOptions;
@@ -29,12 +34,8 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@ExtendWith(MockitoExtension.class)
-public class RemoteFileCopierTest {
+public class RemoteFileCopierTest extends BaseIgniteAbstractTest {
private RemoteFileCopier copier;
@Mock
private RaftClientService rpcService;
diff --git a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/util/ThreadIdTest.java b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/util/ThreadIdTest.java
index 856942d4d8..0f5a4d07ea 100644
--- a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/util/ThreadIdTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/util/ThreadIdTest.java
@@ -16,19 +16,20 @@
*/
package org.apache.ignite.raft.jraft.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.test.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-
-public class ThreadIdTest implements ThreadId.OnError {
+public class ThreadIdTest extends BaseIgniteAbstractTest implements ThreadId.OnError {
private ThreadId id;
private volatile int errorCode = -1;
diff --git a/modules/rest-api/build.gradle b/modules/rest-api/build.gradle
index 989ffd9b7a..c771a5abeb 100644
--- a/modules/rest-api/build.gradle
+++ b/modules/rest-api/build.gradle
@@ -39,6 +39,7 @@ dependencies {
implementation libs.micronaut.security
implementation libs.micronaut.security.annotations
+ testImplementation testFixtures(project(':ignite-core'))
testImplementation libs.junit5.api
testImplementation libs.mockito.core
testImplementation libs.junit5.params
diff --git a/modules/rest-api/src/test/java/org/apache/ignite/internal/rest/exception/handler/IgniteExceptionHandlerTest.java b/modules/rest-api/src/test/java/org/apache/ignite/internal/rest/exception/handler/IgniteExceptionHandlerTest.java
index d7d8f7a4d6..22e9483bd5 100644
--- a/modules/rest-api/src/test/java/org/apache/ignite/internal/rest/exception/handler/IgniteExceptionHandlerTest.java
+++ b/modules/rest-api/src/test/java/org/apache/ignite/internal/rest/exception/handler/IgniteExceptionHandlerTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.configuration.validation.ValidationIssue;
import org.apache.ignite.internal.rest.api.InvalidParam;
import org.apache.ignite.internal.rest.api.Problem;
import org.apache.ignite.internal.rest.api.Problem.ProblemBuilder;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.lang.ErrorGroup;
import org.apache.ignite.lang.IgniteException;
import org.junit.jupiter.api.BeforeEach;
@@ -40,7 +41,7 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-class IgniteExceptionHandlerTest {
+class IgniteExceptionHandlerTest extends BaseIgniteAbstractTest {
private HttpRequest<?> request;
private IgniteExceptionHandler exceptionHandler;
diff --git a/modules/rocksdb-common/build.gradle b/modules/rocksdb-common/build.gradle
index fa00cda017..1690c13a96 100644
--- a/modules/rocksdb-common/build.gradle
+++ b/modules/rocksdb-common/build.gradle
@@ -24,6 +24,7 @@ dependencies {
implementation libs.jetbrains.annotations
api libs.rocksdb.jni
+ testImplementation testFixtures(project(':ignite-core'))
testImplementation libs.hamcrest.core
testImplementation libs.mockito.junit
}
diff --git a/modules/rocksdb-common/src/test/java/org/apache/ignite/internal/rocksdb/RocksUtilsTest.java b/modules/rocksdb-common/src/test/java/org/apache/ignite/internal/rocksdb/RocksUtilsTest.java
index a131dbc256..f57d05fc24 100644
--- a/modules/rocksdb-common/src/test/java/org/apache/ignite/internal/rocksdb/RocksUtilsTest.java
+++ b/modules/rocksdb-common/src/test/java/org/apache/ignite/internal/rocksdb/RocksUtilsTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
import java.util.Arrays;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -36,7 +37,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.rocksdb.AbstractNativeReference;
@ExtendWith(MockitoExtension.class)
-class RocksUtilsTest {
+class RocksUtilsTest extends BaseIgniteAbstractTest {
@Mock
private AbstractNativeReference ref1;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
index 96566d4e18..9e3590df0c 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
@@ -58,6 +58,7 @@ import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStora
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.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -79,7 +80,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class ItDistributedConfigurationPropertiesTest {
+public class ItDistributedConfigurationPropertiesTest extends BaseIgniteAbstractTest {
/** Test distributed configuration schema. */
@ConfigurationRoot(rootName = "root", type = ConfigurationType.DISTRIBUTED)
public static class DistributedConfigurationSchema {
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItDistributedConfigurationStorageTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItDistributedConfigurationStorageTest.java
index fdae43dc90..f0e8f63a39 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItDistributedConfigurationStorageTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItDistributedConfigurationStorageTest.java
@@ -51,6 +51,7 @@ import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStora
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.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.vault.VaultManager;
@@ -69,7 +70,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class ItDistributedConfigurationStorageTest {
+public class ItDistributedConfigurationStorageTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private static RaftConfiguration raftConfiguration;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java
index 7afd8a309e..038a54d992 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java
@@ -41,6 +41,7 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.IntStream;
import org.apache.ignite.internal.rest.RestNode;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.AfterEach;
@@ -52,7 +53,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
/** Tests for the REST authentication configuration. */
@ExtendWith(WorkDirectoryExtension.class)
-public class ItAuthenticationTest {
+public class ItAuthenticationTest extends BaseIgniteAbstractTest {
/** HTTP client that is expected to be defined in subclasses. */
private HttpClient client;
diff --git a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/CompoundModuleTest.java b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/CompoundModuleTest.java
index 402d0520b1..42491c5833 100644
--- a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/CompoundModuleTest.java
+++ b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/CompoundModuleTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.configuration.ConfigurationModule;
import org.apache.ignite.configuration.RootKey;
import org.apache.ignite.configuration.annotation.ConfigurationType;
import org.apache.ignite.configuration.validation.Validator;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,7 +39,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class CompoundModuleTest {
+class CompoundModuleTest extends BaseIgniteAbstractTest {
@Mock
private RootKey<?, ?> rootKeyA;
@Mock
diff --git a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/ConfigurationModulesTest.java b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/ConfigurationModulesTest.java
index 946b8af66f..f0622589d1 100644
--- a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/ConfigurationModulesTest.java
+++ b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/ConfigurationModulesTest.java
@@ -27,13 +27,14 @@ import java.util.List;
import java.util.Set;
import org.apache.ignite.configuration.ConfigurationModule;
import org.apache.ignite.configuration.RootKey;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class ConfigurationModulesTest {
+class ConfigurationModulesTest extends BaseIgniteAbstractTest {
@Mock
private RootKey<?, ?> rootKeyA;
@Mock
diff --git a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/DistributedConfigurationUpdaterTest.java b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/DistributedConfigurationUpdaterTest.java
index 79542d897c..46bc5d588a 100644
--- a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/DistributedConfigurationUpdaterTest.java
+++ b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/DistributedConfigurationUpdaterTest.java
@@ -32,13 +32,14 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
import org.apache.ignite.internal.cluster.management.UpdateDistributedConfigurationAction;
import org.apache.ignite.internal.configuration.presentation.ConfigurationPresentation;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class DistributedConfigurationUpdaterTest {
+class DistributedConfigurationUpdaterTest extends BaseIgniteAbstractTest {
@Mock
public ConfigurationPresentation<String> presentation;
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/AbstractSchemaConverterTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/AbstractSchemaConverterTest.java
index f405601fca..0135c76e79 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/AbstractSchemaConverterTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/AbstractSchemaConverterTest.java
@@ -37,12 +37,13 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.internal.catalog.commands.CatalogUtils;
import org.apache.ignite.internal.schema.testutils.definition.ColumnType.DecimalColumnType;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.ArrayUtils;
/**
* Abstract class for schema converter tests.
*/
-public class AbstractSchemaConverterTest {
+public class AbstractSchemaConverterTest extends BaseIgniteAbstractTest {
protected static final Map<NativeTypeSpec, List<Object>> DEFAULT_VALUES_TO_TEST;
static {
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/CatalogSchemaManagerTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/CatalogSchemaManagerTest.java
index f1404eb2b8..1d963a91ce 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/CatalogSchemaManagerTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/CatalogSchemaManagerTest.java
@@ -62,6 +62,7 @@ import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage;
import org.apache.ignite.internal.schema.marshaller.schema.SchemaSerializerImpl;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.subscription.ListAccumulator;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.internal.vault.inmemory.InMemoryVaultService;
@@ -78,7 +79,7 @@ import org.mockito.quality.Strictness;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class CatalogSchemaManagerTest {
+class CatalogSchemaManagerTest extends BaseIgniteAbstractTest {
private static final String SCHEMA_STORE_PREFIX = ".sch-hist.";
private static final String LATEST_SCHEMA_VERSION_STORE_SUFFIX = ".sch-hist-latest";
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/TableValidatorImplTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/TableValidatorImplTest.java
index d1bc77acee..8abc8e63c1 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/TableValidatorImplTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/TableValidatorImplTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.schema.configuration.index.HashIndexChange;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,7 +38,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859
*/
@ExtendWith(ConfigurationExtension.class)
-public class TableValidatorImplTest {
+public class TableValidatorImplTest extends BaseIgniteAbstractTest {
@InjectConfiguration(
"mock.tables.table {"
+ "columns.id {type.type: INT32}, "
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/index/IndexValidatorImplTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/index/IndexValidatorImplTest.java
index 731b4511cd..9d9dd10c52 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/index/IndexValidatorImplTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/index/IndexValidatorImplTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -39,7 +40,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* For {@link IndexValidatorImpl} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class IndexValidatorImplTest {
+public class IndexValidatorImplTest extends BaseIgniteAbstractTest {
private static final int TABLE_ID = 1;
@InjectConfiguration("mock.tables.fooTable {columns.column0 {type.type: STRING}}")
diff --git a/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationConfigurationValidatorTest.java b/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationConfigurationValidatorTest.java
index 03423bed10..35fe4d4e0f 100644
--- a/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationConfigurationValidatorTest.java
+++ b/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationConfigurationValidatorTest.java
@@ -28,12 +28,13 @@ import java.util.function.Consumer;
import org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ConfigurationExtension.class)
-class AuthenticationConfigurationValidatorTest {
+class AuthenticationConfigurationValidatorTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private AuthenticationConfiguration authenticationConfiguration;
diff --git a/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationProvidersValidatorTest.java b/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationProvidersValidatorTest.java
index cc168975bf..cf14c432a8 100644
--- a/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationProvidersValidatorTest.java
+++ b/modules/security/src/test/java/org/apache/ignite/internal/configuration/AuthenticationProvidersValidatorTest.java
@@ -30,12 +30,13 @@ import org.apache.ignite.configuration.NamedListView;
import org.apache.ignite.configuration.validation.ValidationContext;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ConfigurationExtension.class)
-class AuthenticationProvidersValidatorTest {
+class AuthenticationProvidersValidatorTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private AuthenticationConfiguration authenticationConfiguration;
diff --git a/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java b/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java
index c2e7daf3e8..c20d410f64 100644
--- a/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java
+++ b/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java
@@ -30,13 +30,14 @@ import org.apache.ignite.internal.configuration.AuthenticationView;
import org.apache.ignite.internal.configuration.BasicAuthenticationProviderChange;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.security.AuthenticationException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ConfigurationExtension.class)
-class AuthenticationManagerImplTest {
+class AuthenticationManagerImplTest extends BaseIgniteAbstractTest {
private final AuthenticationManagerImpl manager = new AuthenticationManagerImpl();
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java
index 84dce939ee..1fbf38976d 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java
@@ -50,8 +50,6 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.index.IndexManager;
import org.apache.ignite.internal.index.event.IndexEvent;
import org.apache.ignite.internal.index.event.IndexEventParameters;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.manager.EventListener;
import org.apache.ignite.internal.metrics.MetricManager;
import org.apache.ignite.internal.replicator.ReplicaService;
@@ -76,6 +74,7 @@ import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.table.distributed.TableManager;
import org.apache.ignite.internal.table.event.TableEvent;
import org.apache.ignite.internal.table.event.TableEventParameters;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.tx.impl.HeapLockManager;
@@ -99,10 +98,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Stop Calcite module test.
*/
@ExtendWith(MockitoExtension.class)
-public class StopCalciteModuleTest {
- /** The logger. */
- private static final IgniteLogger LOG = Loggers.forClass(StopCalciteModuleTest.class);
-
+public class StopCalciteModuleTest extends BaseIgniteAbstractTest {
private static final int ROWS = 5;
private static final String NODE_NAME = "mock-node-name";
@@ -228,8 +224,6 @@ public class StopCalciteModuleTest {
s.onComplete();
};
}).when(tbl).scan(anyInt(), any(), any());
-
- LOG.info(">>>> Starting test {}", testInfo.getTestMethod().orElseThrow().getName());
}
@Test
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java
index c98ee0c454..eceb2519e7 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.sql.engine.schema.TableDescriptor;
import org.apache.ignite.internal.table.InternalTable;
import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.table.distributed.TableManager;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.apache.ignite.internal.tx.impl.HeapLockManager;
import org.junit.jupiter.api.Test;
@@ -45,7 +46,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Tests for {@link ExecutableTableRegistryImpl}.
*/
@ExtendWith(MockitoExtension.class)
-public class ExecutableTableRegistrySelfTest {
+public class ExecutableTableRegistrySelfTest extends BaseIgniteAbstractTest {
@Mock
private ReplicaService replicaService;
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java
index 701dbeee6f..a316ddbebf 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java
@@ -58,8 +58,6 @@ import java.util.stream.Collectors;
import org.apache.calcite.jdbc.CalciteSchema;
import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.tools.Frameworks;
-import org.apache.ignite.internal.logger.IgniteLogger;
-import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.metrics.MetricManager;
import org.apache.ignite.internal.schema.NativeType;
import org.apache.ignite.internal.schema.NativeTypes;
@@ -102,6 +100,7 @@ import org.apache.ignite.internal.sql.engine.util.BaseQueryContext;
import org.apache.ignite.internal.sql.engine.util.EmptyCacheFactory;
import org.apache.ignite.internal.sql.engine.util.HashFunctionFactory;
import org.apache.ignite.internal.sql.engine.util.HashFunctionFactoryImpl;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils.RunnableX;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.internal.util.ArrayUtils;
@@ -120,9 +119,7 @@ import org.junit.jupiter.api.Test;
/**
* Test class to verify {@link ExecutionServiceImplTest}.
*/
-public class ExecutionServiceImplTest {
- private static final IgniteLogger LOG = Loggers.forClass(ExecutionServiceImpl.class);
-
+public class ExecutionServiceImplTest extends BaseIgniteAbstractTest {
/** Timeout in ms for async operations. */
private static final long TIMEOUT_IN_MS = 2_000;
@@ -180,7 +177,7 @@ public class ExecutionServiceImplTest {
try {
executer.stop();
} catch (Exception e) {
- LOG.error("Unable to stop executor", e);
+ log.error("Unable to stop executor", e);
}
});
@@ -639,7 +636,7 @@ public class ExecutionServiceImplTest {
.defaultSchema(wrap(schema))
.build()
)
- .logger(LOG)
+ .logger(log)
.build();
}
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java
index 05a99c330a..2d23497d71 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/ScannableTableSelfTest.java
@@ -78,6 +78,7 @@ import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions;
import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory;
import org.apache.ignite.internal.sql.engine.util.Commons;
import org.apache.ignite.internal.table.InternalTable;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.utils.PrimaryReplica;
import org.apache.ignite.network.ClusterNode;
import org.jetbrains.annotations.Nullable;
@@ -95,7 +96,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* of the underlying APIs with required arguments.
*/
@ExtendWith(MockitoExtension.class)
-public class ScannableTableSelfTest {
+public class ScannableTableSelfTest extends BaseIgniteAbstractTest {
private static final IgniteTypeFactory TYPE_FACTORY = Commons.typeFactory();
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestClusterTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestClusterTest.java
index 061958dc6e..31c7029518 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestClusterTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestClusterTest.java
@@ -30,13 +30,14 @@ import org.apache.ignite.internal.sql.engine.prepare.QueryPlan;
import org.apache.ignite.internal.sql.engine.rel.IgniteIndexScan;
import org.apache.ignite.internal.sql.engine.rel.IgniteTableScan;
import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
/**
* Tests for test execution runtime used in benchmarking.
*/
-public class TestClusterTest {
+public class TestClusterTest extends BaseIgniteAbstractTest {
private final DataProvider<Object[]> dataProvider = DataProvider.fromRow(
new Object[]{42, UUID.randomUUID().toString()}, 3_333
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/CatalogSqlSchemaManagerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/CatalogSqlSchemaManagerTest.java
index 5992794c9e..3df3faca3e 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/CatalogSqlSchemaManagerTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/CatalogSqlSchemaManagerTest.java
@@ -61,6 +61,7 @@ import org.apache.ignite.internal.sql.engine.schema.IgniteIndex.Type;
import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution;
import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions;
import org.apache.ignite.internal.sql.engine.util.TypeUtils;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.sql.ColumnType;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -73,7 +74,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Tests for {@link CatalogSqlSchemaManager}.
*/
@ExtendWith(MockitoExtension.class)
-public class CatalogSqlSchemaManagerTest {
+public class CatalogSqlSchemaManagerTest extends BaseIgniteAbstractTest {
private static final AtomicInteger ID = new AtomicInteger();
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/TypeUtilsTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/TypeUtilsTest.java
index 52997d5a0e..661943c34f 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/TypeUtilsTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/TypeUtilsTest.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.sql.engine.type.IgniteCustomType;
import org.apache.ignite.internal.sql.engine.type.IgniteCustomTypeSpec;
import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory;
import org.apache.ignite.internal.sql.engine.type.UuidType;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.sql.ColumnType;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
@@ -60,7 +61,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* Tests for {@link TypeUtils}.
*/
@ExtendWith(MockitoExtension.class)
-public class TypeUtilsTest {
+public class TypeUtilsTest extends BaseIgniteAbstractTest {
private static final IgniteTypeFactory TYPE_FACTORY = Commons.typeFactory();
diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageManagerTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageManagerTest.java
index b768d76baa..e243e3b90a 100644
--- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageManagerTest.java
+++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageManagerTest.java
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.schema.configuration.storage.DataStorageConfig
import org.apache.ignite.internal.schema.configuration.storage.DataStorageView;
import org.apache.ignite.internal.storage.DataStorageModulesTest.FirstDataStorageConfigurationSchema;
import org.apache.ignite.internal.storage.DataStorageModulesTest.SecondDataStorageConfigurationSchema;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.Test;
@@ -52,7 +53,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class DataStorageManagerTest {
+public class DataStorageManagerTest extends BaseIgniteAbstractTest {
@WorkDirectory
private Path workDir;
diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
index 57d98316d6..af1d451c6b 100644
--- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
+++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
@@ -38,6 +38,7 @@ import org.apache.ignite.configuration.annotation.Value;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
import org.apache.ignite.internal.schema.configuration.storage.DataStorageConfigurationSchema;
import org.apache.ignite.internal.storage.engine.StorageEngine;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.hamcrest.Matchers;
@@ -48,7 +49,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* For {@link DataStorageModules} testing.
*/
@ExtendWith(WorkDirectoryExtension.class)
-public class DataStorageModulesTest {
+public class DataStorageModulesTest extends BaseIgniteAbstractTest {
@WorkDirectory
private Path workDir;
diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/configuration/ExistingDataStorageValidatorTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/configuration/ExistingDataStorageValidatorTest.java
index a5501f5704..a9b0827a44 100644
--- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/configuration/ExistingDataStorageValidatorTest.java
+++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/configuration/ExistingDataStorageValidatorTest.java
@@ -26,12 +26,13 @@ import java.util.List;
import java.util.UUID;
import org.apache.ignite.internal.schema.configuration.storage.ExistingDataStorage;
import org.apache.ignite.internal.storage.DataStorageModule;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* For {@link ExistingDataStorageValidator} testing.
*/
-public class ExistingDataStorageValidatorTest {
+public class ExistingDataStorageValidatorTest extends BaseIgniteAbstractTest {
@Test
void testFailValidation() {
ExistingDataStorage annotation = mock(ExistingDataStorage.class);
diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/LockHolderTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/LockHolderTest.java
index 73782a5e5d..6d3eb72adf 100644
--- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/LockHolderTest.java
+++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/LockHolderTest.java
@@ -26,13 +26,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import java.util.concurrent.locks.Lock;
-import org.apache.ignite.internal.storage.util.LockHolder;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* Class for testing {@link LockHolder}.
*/
-public class LockHolderTest {
+public class LockHolderTest extends BaseIgniteAbstractTest {
@Test
void testSimple() {
LockHolder<Lock> lockHolder = createLockHolder();
diff --git a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/MvPartitionStoragesTest.java b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/MvPartitionStoragesTest.java
index 2a0641bb00..d5cf178ac7 100644
--- a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/MvPartitionStoragesTest.java
+++ b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/util/MvPartitionStoragesTest.java
@@ -41,6 +41,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.StorageRebalanceException;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.function.Executable;
@@ -48,7 +49,7 @@ import org.junit.jupiter.api.function.Executable;
/**
* Class for testing {@link MvPartitionStorages}.
*/
-public class MvPartitionStoragesTest {
+public class MvPartitionStoragesTest extends BaseIgniteAbstractTest {
private static final int PARTITIONS = 10;
private MvPartitionStorages<MvPartitionStorage> mvPartitionStorages;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvStoragesTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvStoragesTest.java
index c96a43c3cb..8339254ef4 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvStoragesTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvStoragesTest.java
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.index.IndexRow;
import org.apache.ignite.internal.storage.index.IndexRowImpl;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptor;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tostring.IgniteToStringInclude;
import org.apache.ignite.internal.tostring.S;
import org.apache.ignite.internal.util.Cursor;
@@ -51,7 +52,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Base test for MV storages, contains pojo classes, their descriptor and a marshaller instance.
*/
-public abstract class BaseMvStoragesTest {
+public abstract class BaseMvStoragesTest extends BaseIgniteAbstractTest {
/** Default reflection marshaller factory. */
private static final MarshallerFactory MARSHALLER_FACTORY = new ReflectionMarshallerFactory();
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
index 583cf08ad0..93a9e497c6 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
@@ -57,6 +57,7 @@ import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.index.impl.BinaryTupleRowSerializer;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.Cursor;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
@@ -69,7 +70,7 @@ import org.junit.jupiter.api.Test;
* @param <S> Type of specific index implementation.
* @param <D> Type of index descriptor for that specific implementation.
*/
-public abstract class AbstractIndexStorageTest<S extends IndexStorage, D extends StorageIndexDescriptor> {
+public abstract class AbstractIndexStorageTest<S extends IndexStorage, D extends StorageIndexDescriptor> extends BaseIgniteAbstractTest {
private static final IgniteLogger log = Loggers.forClass(AbstractIndexStorageTest.class);
/** Definitions of all supported column types. */
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataRegionTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataRegionTest.java
index c10f742692..0a30d6fa3a 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataRegionTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataRegionTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.configuration.testframework.ConfigurationExten
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.pagememory.configuration.schema.PersistentPageMemoryDataRegionConfiguration;
import org.apache.ignite.internal.pagememory.configuration.schema.PersistentPageMemoryDataRegionView;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,7 +38,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* For {@link PersistentPageMemoryDataRegion} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class PersistentPageMemoryDataRegionTest {
+public class PersistentPageMemoryDataRegionTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private PersistentPageMemoryDataRegionConfiguration dataRegionConfig;
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryDataRegionValidatorImplTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryDataRegionValidatorImplTest.java
index c1cb9e6eb6..45d605c957 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryDataRegionValidatorImplTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryDataRegionValidatorImplTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.storage.pagememory.configuration.schema.Persis
import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryDataStorageView;
import org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
@@ -47,7 +48,7 @@ import org.mockito.ArgumentCaptor;
* For {@link PageMemoryDataRegionValidatorImpl} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class PageMemoryDataRegionValidatorImplTest {
+public class PageMemoryDataRegionValidatorImplTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private VolatilePageMemoryStorageEngineConfiguration volatileEngineConfig;
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtilsTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtilsTest.java
index 18ba0e1783..e8ab89fd86 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtilsTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/InlineUtilsTest.java
@@ -43,12 +43,13 @@ import org.apache.ignite.internal.schema.NativeTypeSpec;
import org.apache.ignite.internal.schema.NativeTypes;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptor.StorageColumnDescriptor;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* For {@link InlineUtils} testing.
*/
-public class InlineUtilsTest {
+public class InlineUtilsTest extends BaseIgniteAbstractTest {
@Test
void testInlineSizeForNativeType() {
EnumSet<NativeTypeSpec> nativeTypeSpecs = EnumSet.allOf(NativeTypeSpec.class);
diff --git a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/BlobStorageTest.java b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/BlobStorageTest.java
index 7532c36178..a2c3bc2a14 100644
--- a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/BlobStorageTest.java
+++ b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/BlobStorageTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.pagememory.metric.IoStatisticsHolderNoOp;
import org.apache.ignite.internal.pagememory.reuse.ReuseBag;
import org.apache.ignite.internal.pagememory.reuse.ReuseList;
import org.apache.ignite.internal.storage.pagememory.mv.io.BlobFragmentIo;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -51,7 +52,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(ConfigurationExtension.class)
@ExtendWith(MockitoExtension.class)
-class BlobStorageTest {
+class BlobStorageTest extends BaseIgniteAbstractTest {
private static final int PAGE_SIZE = 1024;
@InjectConfiguration
diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java
index 46f2527008..f7f5e3e854 100644
--- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java
+++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngineTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -44,7 +45,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
*/
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class RocksDbStorageEngineTest {
+public class RocksDbStorageEngineTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private RocksDbStorageEngineConfiguration engineConfig;
diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbDataRegionValidatorImplTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbDataRegionValidatorImplTest.java
index b3d6d67d99..64553e579a 100644
--- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbDataRegionValidatorImplTest.java
+++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbDataRegionValidatorImplTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.internal.configuration.testframework.ConfigurationExten
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineView;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
@@ -43,7 +44,7 @@ import org.mockito.ArgumentCaptor;
* For {@link RocksDbDataRegionValidatorImpl} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class RocksDbDataRegionValidatorImplTest {
+public class RocksDbDataRegionValidatorImplTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private RocksDbStorageEngineConfiguration engineConfig;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/RepeatedFinishReadWriteTransactionTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/RepeatedFinishReadWriteTransactionTest.java
index 6a686db418..d78e90b329 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/RepeatedFinishReadWriteTransactionTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/RepeatedFinishReadWriteTransactionTest.java
@@ -37,6 +37,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.internal.tx.LockManager;
import org.apache.ignite.internal.tx.TxManager;
@@ -52,7 +53,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests repeated commit/rollback operations.
*/
-public class RepeatedFinishReadWriteTransactionTest {
+public class RepeatedFinishReadWriteTransactionTest extends BaseIgniteAbstractTest {
private final ClusterNode clusterNode = new ClusterNodeImpl("test", "test", new NetworkAddress("test", 1000));
@Test
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/ConfiguredTablesCacheTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/ConfiguredTablesCacheTest.java
index deda91133c..65e8d66f58 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/ConfiguredTablesCacheTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/ConfiguredTablesCacheTest.java
@@ -29,12 +29,13 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ConfigurationExtension.class)
-class ConfiguredTablesCacheTest {
+class ConfiguredTablesCacheTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private TablesConfiguration tablesConfig;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/LowWatermarkTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/LowWatermarkTest.java
index 99cb780814..5bd0e9d476 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/LowWatermarkTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/LowWatermarkTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.schema.configuration.LowWatermarkConfiguration;
import org.apache.ignite.internal.table.distributed.gc.MvGc;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.util.ByteUtils;
import org.apache.ignite.internal.vault.VaultEntry;
@@ -61,7 +62,7 @@ import org.mockito.InOrder;
* For {@link LowWatermark} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class LowWatermarkTest {
+public class LowWatermarkTest extends BaseIgniteAbstractTest {
@InjectConfiguration
private LowWatermarkConfiguration lowWatermarkConfig;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionMoverTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionMoverTest.java
index 4af21a2365..16bf3289a4 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionMoverTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/PartitionMoverTest.java
@@ -37,6 +37,7 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.raft.PeersAndLearners;
import org.apache.ignite.internal.raft.RaftGroupServiceImpl;
import org.apache.ignite.internal.raft.service.RaftGroupService;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.lang.NodeStoppingException;
import org.junit.jupiter.api.Test;
@@ -44,7 +45,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests for the {@link PartitionMover} class.
*/
-class PartitionMoverTest {
+class PartitionMoverTest extends BaseIgniteAbstractTest {
private static final long TERM = 123;
private static final PeersAndLearners PEERS_AND_LEARNERS = PeersAndLearners.fromConsistentIds(
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java
index 76308459c7..b26f27d59e 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/StorageUpdateHandlerTest.java
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage;
import org.apache.ignite.internal.table.distributed.gc.GcUpdateHandler;
import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
import org.apache.ignite.internal.table.distributed.raft.PartitionDataStorage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -46,7 +47,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* For {@link StorageUpdateHandler} testing.
*/
@ExtendWith(ConfigurationExtension.class)
-public class StorageUpdateHandlerTest {
+public class StorageUpdateHandlerTest extends BaseIgniteAbstractTest {
private static final int PARTITION_ID = 0;
@InjectConfiguration
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/MvGcTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/MvGcTest.java
index c4d2268229..825edf6317 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/MvGcTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/MvGcTest.java
@@ -45,6 +45,7 @@ import org.apache.ignite.internal.configuration.testframework.InjectConfiguratio
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.apache.ignite.lang.ErrorGroups.GarbageCollector;
import org.apache.ignite.lang.IgniteInternalException;
@@ -59,7 +60,7 @@ import org.junit.jupiter.api.function.Executable;
* For testing {@link MvGc}.
*/
@ExtendWith(ConfigurationExtension.class)
-public class MvGcTest {
+public class MvGcTest extends BaseIgniteAbstractTest {
private static final int PARTITION_ID = 0;
private MvGc gc;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java
index 7960b1f8b7..dfc6abbde1 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexUpdateHandlerTest.java
@@ -30,12 +30,13 @@ import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.IndexStorage;
import org.apache.ignite.internal.table.distributed.TableIndexStoragesSupplier;
import org.apache.ignite.internal.table.distributed.TableSchemaAwareIndexStorage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
/**
* For {@link IndexUpdateHandler} testing.
*/
-public class IndexUpdateHandlerTest {
+public class IndexUpdateHandlerTest extends BaseIgniteAbstractTest {
private static final int PARTITION_ID = 0;
@Test
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
index ee017753ff..1e428642a9 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
@@ -93,6 +93,7 @@ import org.apache.ignite.internal.table.distributed.gc.GcUpdateHandler;
import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
import org.apache.ignite.internal.table.distributed.replication.request.BinaryRowMessage;
import org.apache.ignite.internal.table.impl.DummyInternalTableImpl;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.tx.TxMeta;
@@ -118,7 +119,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(WorkDirectoryExtension.class)
@ExtendWith(MockitoExtension.class)
@ExtendWith(ConfigurationExtension.class)
-public class PartitionCommandListenerTest {
+public class PartitionCommandListenerTest extends BaseIgniteAbstractTest {
/** Key count. */
private static final int KEY_COUNT = 100;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java
index 0b23fd2c12..ce7a7218bd 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.storage.impl.TestMvTableStorage;
import org.apache.ignite.internal.table.distributed.gc.GcUpdateHandler;
import org.apache.ignite.internal.table.distributed.gc.MvGc;
import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.storage.state.TxStateStorage;
import org.apache.ignite.internal.tx.storage.state.test.TestTxStateTableStorage;
import org.junit.jupiter.api.Test;
@@ -45,7 +46,7 @@ import org.junit.jupiter.api.Test;
/**
* For {@link PartitionAccessImpl} testing.
*/
-public class PartitionAccessImplTest {
+public class PartitionAccessImplTest extends BaseIgniteAbstractTest {
private static final int TABLE_ID = 1;
private static final int TEST_PARTITION_ID = 0;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageFactoryTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageFactoryTest.java
index 81e8fd3337..57a9a037f7 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageFactoryTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageFactoryTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
import java.util.concurrent.Executor;
import org.apache.ignite.internal.table.distributed.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.table.distributed.raft.snapshot.outgoing.OutgoingSnapshotsManager;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.TopologyService;
import org.apache.ignite.raft.jraft.option.RaftOptions;
import org.junit.jupiter.api.Test;
@@ -38,7 +39,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
* For testing {@link PartitionSnapshotStorageFactory}.
*/
@ExtendWith(MockitoExtension.class)
-public class PartitionSnapshotStorageFactoryTest {
+public class PartitionSnapshotStorageFactoryTest extends BaseIgniteAbstractTest {
@Mock
private PartitionAccess partitionAccess;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageTest.java
index 49dbe08b85..ed83f131e0 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionSnapshotStorageTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.mock;
import java.util.concurrent.Executor;
import org.apache.ignite.internal.table.distributed.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import org.apache.ignite.internal.table.distributed.raft.snapshot.startup.StartupPartitionSnapshotReader;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.TopologyService;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
import org.apache.ignite.raft.jraft.entity.RaftOutter.SnapshotMeta;
@@ -33,7 +34,7 @@ import org.apache.ignite.raft.jraft.option.RaftOptions;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
-class PartitionSnapshotStorageTest {
+class PartitionSnapshotStorageTest extends BaseIgniteAbstractTest {
@Test
void returnsNullWhenOpeningOnCleanStorage() {
var storage = storageForStartupMeta(null);
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
index fbae8d3e71..9bc08ce2cb 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
@@ -85,6 +85,7 @@ import org.apache.ignite.internal.table.distributed.raft.snapshot.message.Snapsh
import org.apache.ignite.internal.table.distributed.raft.snapshot.message.SnapshotTxDataRequest;
import org.apache.ignite.internal.table.distributed.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import org.apache.ignite.internal.table.distributed.replication.request.BinaryRowMessage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.TxMeta;
import org.apache.ignite.internal.tx.TxState;
import org.apache.ignite.internal.tx.storage.state.TxStateStorage;
@@ -109,7 +110,7 @@ import org.mockito.Answers;
/**
* For {@link IncomingSnapshotCopier} testing.
*/
-public class IncomingSnapshotCopierTest {
+public class IncomingSnapshotCopierTest extends BaseIgniteAbstractTest {
private static final int TABLE_ID = 1;
private static final String NODE_NAME = "node";
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotReaderTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotReaderTest.java
index 9551f4025e..d2ac482370 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotReaderTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotReaderTest.java
@@ -21,10 +21,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.mock;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.entity.RaftOutter.SnapshotMeta;
import org.junit.jupiter.api.Test;
-class IncomingSnapshotReaderTest {
+class IncomingSnapshotReaderTest extends BaseIgniteAbstractTest {
@Test
void returnsEmptyPath() {
try (var reader = new IncomingSnapshotReader(mock(SnapshotMeta.class))) {
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
index 502ee53141..c4bf8a1b5a 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionAcces
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionKey;
import org.apache.ignite.internal.table.distributed.raft.snapshot.message.SnapshotMetaRequest;
import org.apache.ignite.internal.table.distributed.raft.snapshot.message.SnapshotMetaResponse;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -39,7 +40,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class OutgoingSnapshotCommonTest {
+class OutgoingSnapshotCommonTest extends BaseIgniteAbstractTest {
@Mock
private PartitionAccess partitionAccess;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
index 56afb037c2..1e868a3190 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
@@ -45,6 +45,7 @@ import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionAcces
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionKey;
import org.apache.ignite.internal.table.distributed.raft.snapshot.message.SnapshotMvDataRequest;
import org.apache.ignite.internal.table.distributed.raft.snapshot.message.SnapshotMvDataResponse;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -53,7 +54,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class OutgoingSnapshotMvDataStreamingTest {
+class OutgoingSnapshotMvDataStreamingTest extends BaseIgniteAbstractTest {
private static final BinaryRow ROW_1 = new BinaryRowImpl(0, ByteBuffer.wrap(new byte[]{1}));
private static final BinaryRow ROW_2 = new BinaryRowImpl(0, ByteBuffer.wrap(new byte[]{2}));
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java
index cb6353a4a4..82a598f4ca 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotReaderTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.table.distributed.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionAccess;
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionKey;
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionSnapshotStorage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.network.TopologyService;
import org.apache.ignite.raft.jraft.entity.RaftOutter.SnapshotMeta;
import org.apache.ignite.raft.jraft.option.RaftOptions;
@@ -36,7 +37,7 @@ import org.junit.jupiter.api.Test;
/**
* For {@link OutgoingSnapshotReader} testing.
*/
-public class OutgoingSnapshotReaderTest {
+public class OutgoingSnapshotReaderTest extends BaseIgniteAbstractTest {
@Test
void testForChoosingMaximumAppliedIndexForMeta() {
PartitionAccess partitionAccess = mock(PartitionAccess.class);
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
index 744f358491..3e25c9b1e1 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionAcces
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionKey;
import org.apache.ignite.internal.table.distributed.raft.snapshot.message.SnapshotTxDataRequest;
import org.apache.ignite.internal.table.distributed.raft.snapshot.message.SnapshotTxDataResponse;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.TxMeta;
import org.apache.ignite.internal.tx.TxState;
import org.apache.ignite.internal.util.Cursor;
@@ -54,7 +55,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class OutgoingSnapshotTxDataStreamingTest {
+class OutgoingSnapshotTxDataStreamingTest extends BaseIgniteAbstractTest {
@Mock
private PartitionAccess partitionAccess;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java
index c40c6baac9..e01f7c9a25 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotsManagerTest.java
@@ -29,6 +29,7 @@ import java.util.UUID;
import org.apache.ignite.internal.table.distributed.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionAccess;
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionKey;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
@@ -36,7 +37,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class OutgoingSnapshotsManagerTest {
+class OutgoingSnapshotsManagerTest extends BaseIgniteAbstractTest {
@InjectMocks
private OutgoingSnapshotsManager manager;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java
index 12a98c9eff..87b75fba1c 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotAwarePartitionDataStorageTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.table.distributed.raft.RaftGroupConfiguration;
import org.apache.ignite.internal.table.distributed.raft.RaftGroupConfigurationConverter;
import org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionKey;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -52,7 +53,7 @@ import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class SnapshotAwarePartitionDataStorageTest {
+class SnapshotAwarePartitionDataStorageTest extends BaseIgniteAbstractTest {
private static final int PARTITION_ID = 1;
@Mock
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java
index e9ff6007fd..f29cae8d0a 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java
@@ -23,13 +23,14 @@ import static org.hamcrest.Matchers.nullValue;
import java.util.List;
import org.apache.ignite.internal.table.distributed.raft.RaftGroupConfiguration;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.raft.jraft.entity.RaftOutter.SnapshotMeta;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class SnapshotMetaUtilsTest {
+class SnapshotMetaUtilsTest extends BaseIgniteAbstractTest {
@Test
void buildsSnapshotMeta() {
RaftGroupConfiguration config = new RaftGroupConfiguration(
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/schema/SchemaSyncServiceImplTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/schema/SchemaSyncServiceImplTest.java
index 0cfc5472d6..f117488601 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/schema/SchemaSyncServiceImplTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/schema/SchemaSyncServiceImplTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.metastorage.server.time.ClusterTime;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,7 +39,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class SchemaSyncServiceImplTest {
+class SchemaSyncServiceImplTest extends BaseIgniteAbstractTest {
private static final long DELAY_DURATION = 500;
@Mock
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
index 5aed2c8c28..3a6bdd2772 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.schema.BinaryRowEx;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.tx.storage.state.TxStateTableStorage;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
@@ -50,7 +51,7 @@ import org.junit.jupiter.api.Test;
/**
* For {@link InternalTableImpl} testing.
*/
-public class InternalTableImplTest {
+public class InternalTableImplTest extends BaseIgniteAbstractTest {
@Test
void testUpdatePartitionTrackers() {
InternalTableImpl internalTable = new InternalTableImpl(
diff --git a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadOnlyTransactionImplTest.java b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadOnlyTransactionImplTest.java
index b48cc43eaf..cf314addee 100644
--- a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadOnlyTransactionImplTest.java
+++ b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadOnlyTransactionImplTest.java
@@ -23,6 +23,7 @@ import static org.hamcrest.Matchers.is;
import java.util.UUID;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.test.TestTransactionIds;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -30,7 +31,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class ReadOnlyTransactionImplTest {
+class ReadOnlyTransactionImplTest extends BaseIgniteAbstractTest {
@Mock
private TxManagerImpl txManager;
diff --git a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadWriteTransactionImplTest.java b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadWriteTransactionImplTest.java
index fd3fef4c73..5000cd15be 100644
--- a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadWriteTransactionImplTest.java
+++ b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/ReadWriteTransactionImplTest.java
@@ -24,6 +24,7 @@ import java.util.UUID;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.tx.test.TestTransactionIds;
import org.junit.jupiter.api.Test;
@@ -32,7 +33,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-class ReadWriteTransactionImplTest {
+class ReadWriteTransactionImplTest extends BaseIgniteAbstractTest {
@Mock
private TxManager txManager;
[ignite-3] 01/02: Implement ArchUnit rule to detect wrong test classes hierarchy.
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apolovtsev pushed a commit to branch ignite-20086
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 0beda7a18a8c8db934a4476a7b5fe5cf11edc601
Author: amashenkov <an...@gmail.com>
AuthorDate: Fri Jul 28 19:45:17 2023 +0300
Implement ArchUnit rule to detect wrong test classes hierarchy.
---
.../internal/TestClassHierarchyArchTest.java | 65 ++++++++++++++++++++++
.../ignite/lang/TestsWithFixturesImportOption.java | 38 +++++++++++++
2 files changed, 103 insertions(+)
diff --git a/modules/arch-test/src/test/java/org/apache/ignite/internal/TestClassHierarchyArchTest.java b/modules/arch-test/src/test/java/org/apache/ignite/internal/TestClassHierarchyArchTest.java
new file mode 100644
index 0000000000..915cb1b01f
--- /dev/null
+++ b/modules/arch-test/src/test/java/org/apache/ignite/internal/TestClassHierarchyArchTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import static com.tngtech.archunit.core.domain.properties.CanBeAnnotated.Predicates.annotatedWith;
+
+import com.tngtech.archunit.base.DescribedPredicate;
+import com.tngtech.archunit.core.domain.AccessTarget;
+import com.tngtech.archunit.core.domain.JavaCall;
+import com.tngtech.archunit.core.domain.JavaClass.Functions;
+import com.tngtech.archunit.core.domain.JavaClass.Predicates;
+import com.tngtech.archunit.core.domain.properties.HasName;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.lang.ArchRule;
+import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
+import org.apache.ignite.lang.LocationProvider.RootLocationProvider;
+import org.apache.ignite.lang.TestsWithFixturesImportOption;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+
+/**
+ * Tests that tests classes, which uses Mockito spies, extends BaseIgniteAbstractTest. Using BaseIgniteAbstractTest guarantees the Mockito
+ * resources will be released after tests finishes.
+ */
+@SuppressWarnings("JUnitTestCaseWithNoTests")
+@AnalyzeClasses(
+ packages = "org.apache.ignite",
+ importOptions = TestsWithFixturesImportOption.class,
+ locations = RootLocationProvider.class)
+public class TestClassHierarchyArchTest {
+ private static final String BASE_IGNITE_ABSTRACT_TEST_CLASSNAME = "org.apache.ignite.internal.testframework.BaseIgniteAbstractTest";
+
+ @ArchTest
+ public static final ArchRule TEST_CLASS_WITH_MOCKS_EXTENDS_BASE_TEST_CLASS = ArchRuleDefinition
+ .classes()
+ // are classes with tests
+ .that(Predicates.containAnyMethodsThat(annotatedWith(Test.class).or(annotatedWith(ParameterizedTest.class))))
+ // uses Mockito framework
+ .and(Functions.GET_METHOD_CALLS_FROM_SELF.is(DescribedPredicate.anyElementThat(
+ JavaCall.Predicates.target(
+ AccessTarget.Predicates.declaredIn("org.mockito.Mockito")
+ .and(HasName.Predicates.name("spy"))
+ )
+ )))
+ .should()
+ .beAssignableTo(BASE_IGNITE_ABSTRACT_TEST_CLASSNAME)
+ .as("Test classes, which use Mockito spies, must extends BaseIgniteAbstractTest")
+ .allowEmptyShould(true);
+}
diff --git a/modules/arch-test/src/test/java/org/apache/ignite/lang/TestsWithFixturesImportOption.java b/modules/arch-test/src/test/java/org/apache/ignite/lang/TestsWithFixturesImportOption.java
new file mode 100644
index 0000000000..4954fde668
--- /dev/null
+++ b/modules/arch-test/src/test/java/org/apache/ignite/lang/TestsWithFixturesImportOption.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.lang;
+
+import com.tngtech.archunit.core.importer.ImportOption;
+import com.tngtech.archunit.core.importer.Location;
+import java.util.regex.Pattern;
+
+/**
+ * Provide the ability to evaluate every class location, to determine if the class should be treated as a test fixture class.
+ */
+public class TestsWithFixturesImportOption implements ImportOption {
+ private static final Pattern fixturesTestPattern = Pattern.compile(".*/build/classes/([^/]+/)testFixtures/.*");
+ private static final Pattern integrationTestPattern = Pattern.compile(".*/build/classes/([^/]+/)integrationTest/.*");
+
+ /** {@inheritDoc} */
+ @Override
+ public boolean includes(Location location) {
+ return Predefined.ONLY_INCLUDE_TESTS.includes(location)
+ || location.matches(integrationTestPattern)
+ || location.matches(fixturesTestPattern);
+ }
+}