http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java index a255584..fb46f3d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java @@ -19,13 +19,12 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import javax.cache.*; import javax.cache.configuration.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java index 0b187e5..9d4f590 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.direct.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java index 6546e1c..b3fe8dc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -19,10 +19,9 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import javax.cache.processor.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java index e3734f3..9eaf035 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.GridCacheMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java index 0ffd25a..62dce19 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java @@ -19,14 +19,13 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.transactions.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java index 46fc198..cee7684 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java @@ -18,7 +18,6 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -26,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.transactions.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import javax.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java index 19bcee6..ce2e47f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java index 262642a..50a5b98 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java @@ -18,13 +18,12 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java index 4ee7974..db21e0b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import javax.cache.*; import javax.cache.configuration.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java index e329815..b99435f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java @@ -25,8 +25,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import javax.cache.expiry.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java index 750cad7..00b7c62 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java @@ -19,8 +19,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java index 28cd854..38db71d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java @@ -18,9 +18,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.IgniteConfiguration; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java index 97c2669..60e413d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -26,8 +26,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersionSelfTest.java index 3179e6c..78a1c08 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersionSelfTest.java @@ -18,8 +18,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.internal.processors.cache.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java index a7c03f3..97135aa 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractSelfTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index 5e4c9aa..bd2d0b6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import javax.cache.configuration.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index 3b98079..5087fc1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import javax.cache.configuration.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java index 4fe18bb..94f1b24 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxAbstractTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java index a81f676..16cb9fb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxConcurrentGetAbstractTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 7f51692..65c76ec 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.spi.*; import org.apache.ignite.spi.indexing.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.gridgain.testframework.*; +import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; import javax.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 8c99c1b..33ed99b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -36,7 +36,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index 7d97624..8b6db16 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; -import org.gridgain.testframework.*; +import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java index bddb1e4..3faf42b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxReentryAbstractSelfTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.direct.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index 5eb2570..6c441b6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.gridgain.testframework.*; +import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; import javax.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index c2cc1d4..2e6de1a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index 54991a3..d5b97c2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.processors.cache.eviction; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.eviction.lru.*; @@ -28,7 +27,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 9bb2b90..d7e72fc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index 694ded1..900dd30 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.U; -import org.gridgain.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import javax.cache.*; import javax.cache.configuration.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index 9ea2a65..217b662 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java index a6cb71b..bd12d0b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java index 062cd4f..6890358 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.processors.cache.eviction; import org.apache.ignite.cache.*; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -27,7 +26,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index 3badab1..7eab6f7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import javax.cache.configuration.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java index 2d5cf13..4114aaf 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.*; +import org.apache.ignite.testframework.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java index bd8ca27..e8f3084 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java @@ -19,13 +19,12 @@ package org.gridgain.grid.kernal.processors.cache.eviction.lru; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java index 0b4089f..c4b37b9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java @@ -19,13 +19,12 @@ package org.gridgain.grid.kernal.processors.cache.eviction.lru; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.GridCacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java index e5c81b8..246a535 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridBasicPerformanceTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.*; +import org.apache.ignite.testframework.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; import sun.misc.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridByteArrayListSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridByteArrayListSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridByteArrayListSelfTest.java index 2dc6d09..21aabdd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridByteArrayListSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridByteArrayListSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.nio.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncPerformanceTest.java index 85ea514..c9bd335 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncPerformanceTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.lang; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.lang.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java index bfbae64..74657a5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java @@ -30,8 +30,8 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.lang.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridMetadataAwareAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridMetadataAwareAdapterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridMetadataAwareAdapterSelfTest.java index b7ad6ef..95011f6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridMetadataAwareAdapterSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridMetadataAwareAdapterSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.lang.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridSetWrapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridSetWrapperSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridSetWrapperSelfTest.java index 18b36f7..c3544d2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridSetWrapperSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridSetWrapperSelfTest.java @@ -18,7 +18,7 @@ package org.gridgain.grid.lang; import org.apache.ignite.internal.util.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridTupleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridTupleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridTupleSelfTest.java index 586dcbc..a50a432 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridTupleSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridTupleSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.lang.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/GridXSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridXSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridXSelfTest.java index 70563fe..fbfb9a0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridXSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridXSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang; import org.apache.ignite.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.net.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java index d71acf3..310f99e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentLinkedHashMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentLinkedHashMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentLinkedHashMapSelfTest.java index 0256673..0daa403 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentLinkedHashMapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentLinkedHashMapSelfTest.java @@ -18,7 +18,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java index 9869d6d..d71ef52 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridBoundedConcurrentOrderedMapSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferPerformanceTest.java index 55eeeb4..871674a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferPerformanceTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferSelfTest.java index 36ad5c4..3175e0b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridCircularBufferSelfTest.java @@ -18,7 +18,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentHashMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentHashMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentHashMapSelfTest.java index 5168033..413f4eb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentHashMapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentHashMapSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.lang.utils; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentLinkedHashMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentLinkedHashMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentLinkedHashMapSelfTest.java index 55d654d..c1555bc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentLinkedHashMapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentLinkedHashMapSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.lang.utils; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentWeakHashSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentWeakHashSetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentWeakHashSetSelfTest.java index c64c605..c1888f1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentWeakHashSetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConcurrentWeakHashSetSelfTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConsistentHashSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConsistentHashSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConsistentHashSelfTest.java index c42220c..4cc68af 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConsistentHashSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridConsistentHashSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapPerformanceTest.java index a7fc929..304d48d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapPerformanceTest.java @@ -18,7 +18,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapSelfTest.java index 89b5865..6e15a72 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridLeanMapSelfTest.java @@ -18,7 +18,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.lang.reflect.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridListSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridListSetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridListSetSelfTest.java index 809d1f9..3f87cc4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridListSetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridListSetSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridPCollectionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridPCollectionsTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridPCollectionsTest.java index 015eadf..f347784 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridPCollectionsTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridPCollectionsTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.lang.utils; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.pcollections.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridStripedLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridStripedLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridStripedLockSelfTest.java index e5e227f..13319e4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridStripedLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridStripedLockSelfTest.java @@ -18,8 +18,8 @@ package org.gridgain.grid.lang.utils; import org.apache.ignite.internal.util.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridTrieMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridTrieMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridTrieMapSelfTest.java index 19bb06d..9c5f6c3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridTrieMapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/utils/GridTrieMapSelfTest.java @@ -21,7 +21,7 @@ import com.romix.scala.collection.concurrent.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.lang.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java index aec5d53..32907ed 100644 --- a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java @@ -25,8 +25,8 @@ import org.apache.log4j.*; import org.apache.log4j.varia.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.logger.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.logger.*; import org.springframework.beans.*; import org.springframework.context.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java index 2746124..90fb6d8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java @@ -24,8 +24,8 @@ import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.loadtests.util.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java b/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java index 51e0fc9..2f7e5ca 100644 --- a/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.*; import org.apache.ignite.logger.*; import org.apache.ignite.logger.java.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java index a8ef11e..8e547d1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java @@ -41,8 +41,8 @@ import org.apache.ignite.internal.processors.cache.datastructures.*; import org.apache.ignite.internal.processors.service.*; import org.gridgain.grid.p2p.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java index 660b166..31086d5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.nio.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java index 1c6a92f..10155ac 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.marshaller.jdk; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.jdk.*; import org.gridgain.grid.marshaller.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; /** * JDK marshaller self test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingNoPeerClassLoadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingNoPeerClassLoadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingNoPeerClassLoadingSelfTest.java index 0929eda..0b25e5b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingNoPeerClassLoadingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingNoPeerClassLoadingSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.messaging; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.*; -import org.gridgain.testframework.config.*; +import org.apache.ignite.testframework.config.*; import java.net.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java index 38f99fd..92d073c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java @@ -28,9 +28,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.config.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.config.*; +import org.apache.ignite.testframework.junits.common.*; import org.junit.*; import java.io.*; @@ -39,7 +39,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.testframework.GridTestUtils.*; +import static org.apache.ignite.testframework.GridTestUtils.*; /** * Various tests for Messaging public API. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java index e8db7b7..6a8b7f0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java @@ -20,11 +20,10 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.failover.never.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.config.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.config.*; +import org.apache.ignite.testframework.junits.common.*; import java.net.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployContinuousModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployContinuousModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployContinuousModeSelfTest.java index 2ac0d24..c45c39b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployContinuousModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployContinuousModeSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.p2p; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java index 8acbdb3..e0cf449 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployIsolatedModeSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.p2p; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployPrivateModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployPrivateModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployPrivateModeSelfTest.java index 28aba22..dc301a5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployPrivateModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeployPrivateModeSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.p2p; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeploySharedModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeploySharedModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeploySharedModeSelfTest.java index 906b26d..b393708 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeploySharedModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridMultinodeRedeploySharedModeSelfTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.p2p; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java index a36dae6..f9740e2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.product.*; import org.gridgain.grid.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.lang.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java index ff33540..0413c35 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.cache.GridCacheMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java index 2bf5ef9..93fbb45 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDifferentClassLoaderSelfTest.java @@ -19,11 +19,10 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.config.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.config.*; +import org.apache.ignite.testframework.junits.common.*; import java.net.*; -import java.util.*; /** * Test P2P deployment tasks which loaded from different class loaders. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java index 2c80065..fe51842 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java @@ -23,8 +23,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PHotRedeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PHotRedeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PHotRedeploymentSelfTest.java index c3f2c68..deaea10 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PHotRedeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PHotRedeploymentSelfTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java index 169d400..bba4bfb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PJobClassLoaderSelfTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java index 04a4e26..facbbc7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java @@ -22,9 +22,8 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.testframework.config.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.config.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.net.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java index 26b6014..74fa87a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java @@ -22,13 +22,12 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.config.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.config.*; +import org.apache.ignite.testframework.junits.common.*; import java.net.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java index 8967652..e65eba9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PNodeLeftSelfTest.java @@ -19,10 +19,9 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.testframework.config.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.config.*; +import org.apache.ignite.testframework.junits.common.*; import java.net.*; -import java.util.*; /** * Test P2P class loading in SHARED_CLASSLOADER_UNDEPLOY mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRecursionTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRecursionTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRecursionTaskSelfTest.java index 0a5d1d6..4f5ccb3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRecursionTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRecursionTaskSelfTest.java @@ -22,8 +22,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java index 4be715c..3f10589 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java @@ -22,9 +22,8 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.testframework.*; -import org.gridgain.testframework.junits.common.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*;
