You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/02/05 11:38:53 UTC
[ignite] 01/06: IGNITE-10927 Relieve JUnit3TestLegacySupport from
inheriting deprecated junit.framework.Assert - Fixes #5866.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11191
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 13e461349a716b8ec388c9c72974146dcaf6656f
Author: Oleg Ignatenko <oi...@gridgain.com>
AuthorDate: Mon Feb 4 22:26:51 2019 +0300
IGNITE-10927 Relieve JUnit3TestLegacySupport from inheriting deprecated junit.framework.Assert - Fixes #5866.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
.../apache/ignite/tests/CassandraConfigTest.java | 2 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 2 +-
.../client/integration/ClientAbstractSelfTest.java | 2 +-
.../apache/ignite/internal/jdbc2/JdbcBlobTest.java | 10 +-
.../rest/RestMemcacheProtocolSelfTest.java | 2 +-
.../processors/compress/FileSystemUtilsTest.java | 4 +-
.../java/org/apache/ignite/GridTestIoUtils.java | 8 +-
.../internal/ClusterNodeMetricsUpdateTest.java | 3 +-
.../internal/IgniteClientReconnectCacheTest.java | 3 +-
.../internal/IgniteReflectionFactorySelfTest.java | 12 +-
.../internal/binary/BinaryMarshallerSelfTest.java | 2 +-
.../optimized/OptimizedObjectStreamSelfTest.java | 4 +-
.../affinity/GridAffinityAssignmentV2Test.java | 8 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 5 +-
.../IgniteCacheConfigVariationsFullApiTest.java | 5 +-
.../GridCacheSetAbstractSelfTest.java | 7 +-
.../distributed/IgniteCacheManyClientsTest.java | 3 +-
.../IgniteCachePartitionLossPolicySelfTest.java | 3 +-
.../IgniteNoParrallelClusterIsAllowedTest.java | 3 +-
...IoStatisticsMetricsLocalMXBeanImplSelfTest.java | 2 +-
.../junits/JUnit3TestLegacyAssert.java | 208 +++++++++++++++++++++
.../junits/JUnit3TestLegacySupport.java | 7 +-
.../cache/index/SchemaExchangeSelfTest.java | 11 +-
.../logger/log4j/GridLog4jConfigUpdateTest.java | 4 +-
.../logger/log4j/GridLog4jInitializedTest.java | 2 +-
.../logger/log4j/GridLog4jNotInitializedTest.java | 2 +-
.../logger/log4j2/Log4j2ConfigUpdateTest.java | 4 +-
.../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 2 +-
.../ignite/mesos/IgniteSchedulerSelfTest.java | 18 +-
.../ignite/logger/slf4j/Slf4jLoggerMarkerTest.java | 6 +-
.../internal/ZookeeperDiscoverySpiTestHelper.java | 2 +-
31 files changed, 274 insertions(+), 82 deletions(-)
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java
index 63ec90b..48ac180 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraConfigTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.store.cassandra.persistence.KeyPersistenceSetting
import org.apache.ignite.cache.store.cassandra.persistence.KeyValuePersistenceSettings;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
/**
* Simple test for DDL generator.
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 8d7b4b5..540f3f9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.client.GridClientCacheFlag;
import org.apache.ignite.internal.util.typedef.F;
import org.junit.Test;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
/**
* Tests conversions between GridClientCacheFlag.
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index a4dc399..4dc4a38 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -37,7 +37,6 @@ import javax.cache.Cache;
import javax.cache.configuration.Factory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import junit.framework.Assert;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.CacheStoreAdapter;
@@ -69,6 +68,7 @@ import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
import org.junit.Test;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java
index a8267aa..25786dd 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBlobTest.java
@@ -23,13 +23,11 @@ import java.sql.SQLException;
import java.util.Arrays;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-/**
- *
- */
+/** */
public class JdbcBlobTest {
/**
* @throws Exception If failed.
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index 0b3beea..8dec047 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -18,13 +18,13 @@
package org.apache.ignite.internal.processors.rest;
import java.util.Map;
-import junit.framework.Assert;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.LOCAL;
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java
index de8ec5c..4c52f5f 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java
@@ -30,8 +30,8 @@ import org.junit.Test;
import static java.nio.file.StandardOpenOption.READ;
import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
import static java.nio.file.StandardOpenOption.WRITE;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.apache.ignite.internal.processors.compress.CompressionProcessorImpl.allocateDirectBuffer;
import static org.apache.ignite.internal.processors.compress.FileSystemUtils.getFileSystemBlockSize;
import static org.apache.ignite.internal.processors.compress.FileSystemUtils.getSparseFileSize;
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
index 61d0aa0..8792879 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java
@@ -32,9 +32,9 @@ import org.apache.commons.io.IOUtils;
import org.apache.ignite.marshaller.Marshaller;
import org.jetbrains.annotations.Nullable;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* IO test utilities.
@@ -317,4 +317,4 @@ public final class GridTestIoUtils {
private GridTestIoUtils() {
// No-op.
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsUpdateTest.java
index 68eab8a..c44b606 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsUpdateTest.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCompute;
import org.apache.ignite.Ignition;
@@ -127,7 +126,7 @@ public class ClusterNodeMetricsUpdateTest extends GridCommonAbstractTest {
try {
checkMetrics0(expNodes, expJobs);
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
return false;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 5ceca8c..e39a769 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.cache.CacheException;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteClientDisconnectedException;
@@ -575,7 +574,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
return true;
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
throw e;
}
catch (Throwable e) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
index b9207c6..43c56d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
@@ -23,17 +23,15 @@ import java.util.Map;
import org.apache.ignite.configuration.IgniteReflectionFactory;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
/**
* Tests for {@link IgniteReflectionFactory} class.
*/
public class IgniteReflectionFactorySelfTest {
- /**
- * @throws Exception If failed.
- */
+ /** */
@Test
- public void testByteMethod() throws Exception {
+ public void testByteMethod() {
byte expByteVal = 42;
short expShortVal = 42;
int expIntVal = 42;
@@ -64,8 +62,8 @@ public class IgniteReflectionFactorySelfTest {
assertEquals(expShortVal, instance.getShortField());
assertEquals(expIntVal, instance.getIntField());
assertEquals(expLongVal, instance.getLongField());
- assertEquals(expFloatVal, instance.getFloatField());
- assertEquals(expDoubleVal, instance.getDoubleField());
+ assertEquals(expFloatVal, instance.getFloatField(), 0);
+ assertEquals(expDoubleVal, instance.getDoubleField(), 0);
assertEquals(expCharVal, instance.getCharField());
assertEquals(expBooleanVal, instance.getBooleanField());
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 658c440..aabd2c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -53,7 +53,6 @@ import java.util.TreeSet;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
-import junit.framework.Assert;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
@@ -96,6 +95,7 @@ import org.apache.ignite.testframework.junits.GridTestKernalContext;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
import org.junit.Test;
import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
index 221da98..ce64122 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
@@ -137,7 +137,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
public void testFloat() throws Exception {
float val = 10.0f;
- assertEquals(val, marshalUnmarshal(val));
+ assertEquals(val, marshalUnmarshal(val), 0);
}
/**
@@ -147,7 +147,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
public void testDouble() throws Exception {
double val = 100.0d;
- assertEquals(val, marshalUnmarshal(val));
+ assertEquals(val, marshalUnmarshal(val), 0);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
index 98a6ff7..6ef81dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
@@ -36,10 +36,10 @@ import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
import org.junit.Test;
import org.mockito.internal.util.reflection.Whitebox;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertSame;
-import static junit.framework.TestCase.assertTrue;
-import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.fail;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 3c2e38b..a1ddcf8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -49,7 +49,6 @@ import javax.cache.processor.EntryProcessor;
import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.EntryProcessorResult;
import javax.cache.processor.MutableEntry;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
@@ -5165,8 +5164,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
checkIteratorsCleared();
}
catch (Throwable t) {
- // If AssertionFailedError is in the chain, assume we need to wait and retry.
- if (!X.hasCause(t, AssertionFailedError.class))
+ // If AssertionError is in the chain, assume we need to wait and retry.
+ if (!X.hasCause(t, AssertionError.class))
throw t;
if (i == 9) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 80e79e5..e75c9ff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -49,7 +49,6 @@ import javax.cache.processor.EntryProcessorResult;
import javax.cache.processor.MutableEntry;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
@@ -4333,7 +4332,7 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
checkTtl0(inTx, oldEntry, ttlVals[i]);
break;
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
if (i < ttlVals.length - 1)
info("Ttl test failed, try execute with increased ttl");
else
@@ -5208,7 +5207,7 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
checkIteratorsCleared();
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
if (i == 9)
throw e;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 8607a87..edc6fb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
@@ -112,7 +111,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr
return;
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
if (i == MAX_CHECK - 1)
throw e;
@@ -549,7 +548,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr
assertSetIteratorsCleared();
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
if (i == 9)
throw e;
@@ -571,7 +570,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr
try {
assertSetIteratorsCleared();
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
if (i == 9)
throw e;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
index 3358f6c..88cc0df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -189,7 +188,7 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest {
return true;
}
- catch (AssertionFailedError e) {
+ catch (AssertionError e) {
log.info("Check failed, will retry: " + e);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
index 9f26d6a..e3930f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
@@ -29,7 +29,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.cache.CacheException;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
@@ -717,7 +716,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends GridCommonAbstractTe
Collection<Integer> lostParts = cache.lostPartitions();
- int part = cache.lostPartitions().stream().findFirst().orElseThrow(AssertionFailedError::new);
+ int part = cache.lostPartitions().stream().findFirst().orElseThrow(AssertionError::new);
Integer remainingPart = null;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java
index a432e26..4ccaa27 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteNoParrallelClusterIsAllowedTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache.persistence.standbycluster;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.junit.Test;
@@ -66,7 +65,7 @@ public class IgniteNoParrallelClusterIsAllowedTest extends IgniteChangeGlobalSta
fail();
}
- catch (AssertionFailedError er) {
+ catch (AssertionError er) {
throw er;
}
catch (Throwable e) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java
index 76150e4..7d59bc8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/stat/IoStatisticsMetricsLocalMXBeanImplSelfTest.java
@@ -23,13 +23,13 @@ import java.time.format.DateTimeFormatter;
import javax.management.MBeanServer;
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
-import junit.framework.Assert;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.mxbean.IoStatisticsMetricsMXBean;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assert;
import org.junit.Test;
import static org.apache.ignite.internal.stat.IoStatisticsHolderIndex.HASH_PK_IDX_NAME;
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java
new file mode 100644
index 0000000..9943a01
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java
@@ -0,0 +1,208 @@
+/*
+ * 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.testframework.junits;
+
+import org.junit.Assert;
+
+/**
+ * Supports compatibility with legacy tests that expect inherited assertions by delegating these to respective methods
+ * in {@link Assert} in org.junit package.
+ * Deprecation notice: instead of invoking inherited methods, directly refer to respective static methods of
+ * {@link Assert} class.
+ */
+class JUnit3TestLegacyAssert {
+ /** See class javadocs. */
+ protected static void assertTrue(String msg, boolean cond) {
+ Assert.assertTrue(msg, cond);
+ }
+
+ /** See class javadocs. */
+ protected static void assertTrue(boolean cond) {
+ Assert.assertTrue(cond);
+ }
+
+ /** See class javadocs. */
+ protected static void assertFalse(String msg, boolean cond) {
+ Assert.assertFalse(msg, cond);
+ }
+
+ /** See class javadocs. */
+ protected static void assertFalse(boolean cond) {
+ Assert.assertFalse(cond);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, Object exp, Object actual) {
+ Assert.assertEquals(msg, exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(Object exp, Object actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, String exp, String actual) {
+ Assert.assertEquals(msg, exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String exp, String actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, long exp, long actual) {
+ Assert.assertEquals(msg, exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(long exp, long actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(boolean exp, boolean actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, int exp, int actual) {
+ Assert.assertEquals(msg, exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(int exp, int actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertNotNull(Object obj) {
+ Assert.assertNotNull(obj);
+ }
+
+ /** See class javadocs. */
+ protected static void assertNotNull(String msg, Object obj) {
+ Assert.assertNotNull(msg, obj);
+ }
+
+ /** See class javadocs. */
+ protected static void assertNull(Object obj) {
+ Assert.assertNull(obj);
+ }
+
+ /** See class javadocs. */
+ protected static void assertNull(String msg, Object obj) {
+ Assert.assertNull(msg, obj);
+ }
+
+ /** See class javadocs. */
+ protected static void fail(String msg) {
+ Assert.fail(msg);
+ }
+
+ /** See class javadocs. */
+ protected static void fail() {
+ Assert.fail();
+ }
+
+ /** See class javadocs. */
+ protected static void assertSame(Object exp, Object actual) {
+ Assert.assertSame(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertNotSame(Object unexpected, Object actual) {
+ Assert.assertNotSame(unexpected, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, double exp, double actual) {
+ Assert.assertEquals(msg, exp, actual, 0);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(double exp, Double actual) {
+ Assert.assertEquals(exp, actual, 0);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(Double exp, double actual) {
+ Assert.assertEquals(exp, actual, 0);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(double exp, double actual) {
+ Assert.assertEquals(exp, actual, 0);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(float exp, float actual) {
+ Assert.assertEquals(exp, actual, 0);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(float exp, Float actual) {
+ Assert.assertEquals(exp, actual, 0);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, double exp, double actual, double delta) {
+ Assert.assertEquals(msg, exp, actual, delta);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(double exp, double actual, double delta) {
+ Assert.assertEquals(exp, actual, delta);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(float exp, float actual, float delta) {
+ Assert.assertEquals(exp, actual, delta);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, boolean exp, boolean actual) {
+ Assert.assertEquals(msg, exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(String msg, byte exp, byte actual) {
+ Assert.assertEquals(msg, exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(byte exp, byte actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(char exp, char actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertEquals(short exp, short actual) {
+ Assert.assertEquals(exp, actual);
+ }
+
+ /** See class javadocs. */
+ protected static void assertNotSame(String msg, Object exp, Object actual) {
+ Assert.assertNotSame(msg, exp, actual);
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java
index 0b9eb09..f18c20c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java
@@ -17,17 +17,16 @@
package org.apache.ignite.testframework.junits;
-import junit.framework.Assert; // IMPL NOTE some old tests expect inherited deprecated assertions.
import org.junit.Rule;
import org.junit.rules.TestName;
import org.junit.runners.model.Statement;
/**
* Supports compatibility with old tests that expect specific threading behavior of JUnit 3 TestCase class,
- * inherited deprecated assertions and specific old interface for GridTestUtils.
+ * inherited assertions and specific old interface for GridTestUtils.
*/
-@SuppressWarnings({"TransientFieldInNonSerializableClass", "ExtendsUtilityClass", "deprecation"})
-public abstract class JUnit3TestLegacySupport extends Assert {
+@SuppressWarnings({"TransientFieldInNonSerializableClass", "ExtendsUtilityClass"})
+public abstract class JUnit3TestLegacySupport extends JUnit3TestLegacyAssert {
/**
* Supports obtaining test name for JUnit4 framework in a way that makes it available for legacy methods invoked
* from {@code runTest(Statement)}.
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
index 155d9a2..eeb187b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.index;
import java.util.Collections;
import java.util.Map;
-import junit.framework.AssertionFailedError;
import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.Ignition;
@@ -41,7 +40,6 @@ import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
-import static org.apache.ignite.internal.IgniteClientReconnectAbstractTest.TestTcpDiscoverySpi;
import static org.apache.ignite.internal.IgniteClientReconnectAbstractTest.reconnectClientNode;
/**
@@ -487,7 +485,6 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest {
*
* @throws Exception If failed.
*/
- @SuppressWarnings("unchecked")
@Test
public void testClientReconnect() throws Exception {
final IgniteEx node1 = start(1, KeyClass.class, ValueClass.class);
@@ -539,9 +536,9 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest {
*
* @param nodes Node to check cache.
* @param cacheName Cache name.
- * @throws AssertionFailedError If failed.
+ * @throws AssertionError If failed.
*/
- private void assertCacheStarted(String cacheName, IgniteEx... nodes) throws AssertionFailedError {
+ private void assertCacheStarted(String cacheName, IgniteEx... nodes) throws AssertionError {
for (IgniteEx node : nodes) {
assertTrue(isCacheStarted(cacheName, node));
}
@@ -552,9 +549,9 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest {
*
* @param nodes Node to check cache.
* @param cacheName Cache name.
- * @throws AssertionFailedError If failed.
+ * @throws AssertionError If failed.
*/
- private void assertCacheNotStarted(String cacheName, IgniteEx... nodes) throws AssertionFailedError {
+ private void assertCacheNotStarted(String cacheName, IgniteEx... nodes) throws AssertionError {
for (IgniteEx node : nodes) {
assertFalse(isCacheStarted(cacheName, node));
}
diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java
index e2dc02b..64e09a9 100644
--- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java
+++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jConfigUpdateTest.java
@@ -25,8 +25,8 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.log4j.helpers.FileWatchdog;
import org.junit.Test;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Checking that Log4j configuration is updated when its source file is changed.
diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java
index a8bb4fe..5b138b0 100644
--- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java
+++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jInitializedTest.java
@@ -23,7 +23,7 @@ import org.apache.log4j.BasicConfigurator;
import org.junit.Before;
import org.junit.Test;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
/**
* Log4j initialized test.
diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java
index c230e7e..eefebbb 100644
--- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java
+++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jNotInitializedTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
import org.junit.Test;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
/**
* Log4j not initialized test.
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java
index ae09b73..43367e4 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2ConfigUpdateTest.java
@@ -24,8 +24,8 @@ import java.util.Date;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.junit.Test;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Checking that Log4j2 configuration is updated when its source file is changed.
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
index 5c43908..2cfea53 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.Level;
import org.junit.Before;
import org.junit.Test;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
/**
* Grid Log4j2 SPI test.
diff --git a/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java
index 64117f0..8fc4da2 100644
--- a/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java
+++ b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java
@@ -28,7 +28,7 @@ import org.apache.mesos.SchedulerDriver;
import org.junit.Before;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -80,8 +80,8 @@ public class IgniteSchedulerSelfTest {
Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next();
- assertEquals(4.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU));
- assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM));
+ assertEquals(4.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU), 0);
+ assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM), 0);
}
/**
@@ -105,8 +105,8 @@ public class IgniteSchedulerSelfTest {
Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next();
- assertEquals(2.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU));
- assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM));
+ assertEquals(2.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU), 0);
+ assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM), 0);
mock.clear();
@@ -140,8 +140,8 @@ public class IgniteSchedulerSelfTest {
Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next();
- assertEquals(4.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU));
- assertEquals(512.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM));
+ assertEquals(4.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU), 0);
+ assertEquals(512.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM), 0);
mock.clear();
@@ -288,8 +288,8 @@ public class IgniteSchedulerSelfTest {
Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next();
- assertEquals(2.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU));
- assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM));
+ assertEquals(2.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU), 0);
+ assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM), 0);
mock.clear();
diff --git a/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java b/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java
index 70b5206..3407b81 100644
--- a/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java
+++ b/modules/slf4j/src/test/java/org/apache/ignite/logger/slf4j/Slf4jLoggerMarkerTest.java
@@ -24,9 +24,9 @@ import org.junit.Before;
import org.junit.Test;
import org.slf4j.LoggerFactory;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
* Testing that markers are supported by log4j2 implementation.
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestHelper.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestHelper.java
index 88703b1..dd1a818 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestHelper.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestHelper.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
-import junit.framework.Assert;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.events.DiscoveryEvent;
@@ -37,6 +36,7 @@ import org.apache.ignite.spi.discovery.DiscoverySpi;
import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.zookeeper.ZooKeeper;
+import org.junit.Assert;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryImpl.IGNITE_ZOOKEEPER_DISCOVERY_SPI_ACK_THRESHOLD;