ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [35/53] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 05:02:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
index 15845ed..39dd43b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PSameClassLoaderSelfTest.java
@@ -20,11 +20,10 @@ package org.gridgain.grid.p2p;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.tcp.*;
-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 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/GridP2PTestTaskExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java
index 58665f9..d057a03 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTaskExecutionTest.java
@@ -20,7 +20,7 @@ package org.gridgain.grid.p2p;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.internal.util.typedef.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.*;
 /**
  * Test executes GridP2PTestTask on the remote node.
  * Before running of test you MUST start at least one remote node.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java
index fbc2d99..fbc2aa1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java
@@ -21,10 +21,9 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-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/GridP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PUndeploySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PUndeploySelfTest.java
index 8d1e8ef..393a24d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PUndeploySelfTest.java
@@ -21,10 +21,10 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.deployment.local.*;
-import org.gridgain.testframework.*;
-import org.gridgain.testframework.config.*;
-import org.gridgain.testframework.junits.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.config.*;
+import org.apache.ignite.testframework.junits.*;
+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/product/GridProductVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
index 119c383..2dc2743 100644
--- a/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.product;
 
 import org.apache.ignite.product.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.*;
 
 import static org.junit.Assert.*;
 import static org.apache.ignite.internal.GridProductImpl.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
index dad2a4f..2630689 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
index 51de02f..b013e25 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
@@ -25,8 +25,8 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
index 4dc675d..9cd7cbf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
@@ -25,8 +25,8 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
index 8c29323..92b299b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.checkpoint.*;
 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.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
index 4f252c7..e0ef18f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.checkpoint.cache.*;
 import org.apache.ignite.spi.checkpoint.jdbc.*;
 import org.apache.ignite.spi.checkpoint.sharedfs.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.*;
 import org.hsqldb.jdbc.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
index f507ba1..6a8edbf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.collision.*;
 import org.apache.ignite.spi.collision.fifoqueue.*;
 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.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
index 38f9f84..3162cfa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
index 45e02d5..a570afc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java
index e826b12..62d0fd8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.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.apache.ignite.spi.failover.always.*;
-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/session/GridSessionJobWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
index c1264aa..80be9da 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
index a6453f6..49c7a72 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
@@ -23,8 +23,8 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
index 92705cf..7f67a3c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
index 51f65e2..28af3be 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 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 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/session/GridSessionSetJobAttribute2SelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java
index b04acdc..913d43b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java
@@ -21,8 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
-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/session/GridSessionSetJobAttributeOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
index 7feb74d..5a23872 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
@@ -21,8 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
-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/session/GridSessionSetJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
index 13b5e3d..2f0a6fc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
index 8e014f4..dadd88b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 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 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/session/GridSessionSetTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
index c0e42bc..4b654d3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
index 6f9d8d4..754a1a4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
index 5b020d2..8098efa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 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 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/spi/GridSpiLocalHostInjectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiLocalHostInjectionTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiLocalHostInjectionTest.java
index f980ba1..5186239 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiLocalHostInjectionTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiLocalHostInjectionTest.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.spi.communication.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.internal.processors.resource.*;
-import org.gridgain.testframework.junits.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.*;
+import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiStartStopAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiStartStopAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiStartStopAbstractTest.java
index 8080330..03829e3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiStartStopAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridSpiStartStopAbstractTest.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.spi;
 
 import org.apache.ignite.spi.*;
-import org.gridgain.testframework.junits.spi.*;
+import org.apache.ignite.testframework.junits.spi.*;
 
 /**
  * Base SPI start-stop test class.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
index 7506f7b..fd756fd 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.ignite.spi.discovery.tcp.internal.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.*;
-import org.gridgain.testframework.junits.common.*;
+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/startup/servlet/GridServletLoaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/startup/servlet/GridServletLoaderTest.java b/modules/core/src/test/java/org/gridgain/grid/startup/servlet/GridServletLoaderTest.java
index 77d27ad..04b7139 100644
--- a/modules/core/src/test/java/org/gridgain/grid/startup/servlet/GridServletLoaderTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/startup/servlet/GridServletLoaderTest.java
@@ -17,8 +17,8 @@
 
 package org.gridgain.grid.startup.servlet;
 
-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 javax.management.*;
 import javax.management.remote.*;
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java
index 35ac058..aa81c51 100644
--- a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.thread;
 
 import org.apache.ignite.thread.*;
-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/thread/GridThreadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java
index 509acd9..cea3d86 100644
--- a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.thread;
 
 import org.apache.ignite.thread.*;
-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/util/GridConcurrentLinkedDequeMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java
index a5c3d05..f25b78f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeMultiThreadedTest.java
@@ -20,7 +20,7 @@ package org.gridgain.grid.util;
 import org.apache.ignite.lang.*;
 import org.jdk8.backport.*;
 import org.jdk8.backport.ConcurrentLinkedDeque8.*;
-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/util/GridConcurrentLinkedDequeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeSelfTest.java
index c4955e9..43cdf05 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedDequeSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.gridgain.grid.util;
 
-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/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java
index 9a6073b..8d3d152 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java
@@ -19,7 +19,7 @@ package org.gridgain.grid.util;
 
 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 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/util/GridIndexFillTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java
index 15afb43..eb4b919 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridIndexFillTest.java
@@ -20,7 +20,7 @@ package org.gridgain.grid.util;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.internal.util.snaptree.*;
-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/util/GridLogThrottleTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridLogThrottleTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridLogThrottleTest.java
index 15fd8de..8296d16 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridLogThrottleTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridLogThrottleTest.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.util;
 
 import org.apache.ignite.internal.util.typedef.internal.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.*;
 
 /**
  * Grid log throttle test. To verify correctness, you need to run this test

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/util/GridQueueSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridQueueSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridQueueSelfTest.java
index d1a9e4e..3f8b6cc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridQueueSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridQueueSelfTest.java
@@ -19,7 +19,7 @@ package org.gridgain.grid.util;
 
 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.*;
 
 /**
  * Grid utils tests.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java
index 145df9a..f18ea95 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridSnapshotLockSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java
index beae034..4653f04 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridSpinReadWriteLockSelfTest.java
@@ -20,7 +20,7 @@ package org.gridgain.grid.util;
 import org.apache.ignite.internal.util.*;
 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.concurrent.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/util/GridStringBuilderFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridStringBuilderFactorySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridStringBuilderFactorySelfTest.java
index 0b1f43c..f29d4d3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridStringBuilderFactorySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridStringBuilderFactorySelfTest.java
@@ -19,7 +19,7 @@ package org.gridgain.grid.util;
 
 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.*;
 
 /**
  * String builder factory test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java
index 5417ba5..73189e2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.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 java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/util/GridTransientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridTransientTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridTransientTest.java
index 24c3a5c..025398d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/GridTransientTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/GridTransientTest.java
@@ -17,7 +17,7 @@
 
 package org.gridgain.grid.util;
 
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.*;
 import java.io.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/grid/util/mbeans/GridMBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/mbeans/GridMBeanSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/mbeans/GridMBeanSelfTest.java
index 9357861..7eefa48 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/mbeans/GridMBeanSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/mbeans/GridMBeanSelfTest.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.util.mbeans;
 
 import org.apache.ignite.mbean.*;
-import org.gridgain.testframework.junits.common.*;
+import org.apache.ignite.testframework.junits.common.*;
 import javax.management.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/BlockingQueueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/BlockingQueueTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/BlockingQueueTest.java
deleted file mode 100644
index b0eaab4..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/BlockingQueueTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.gridgain.testframework.*;
-import org.jdk8.backport.*;
-
-import java.util.concurrent.*;
-
-/**
- * Blocking queue performance benchmark.
- */
-public class BlockingQueueTest {
-    /** Number of retries. */
-    private static final int RETRIES = 3;
-
-    /** Number of attempts. */
-    private static final int CNT = 1000000;
-
-    /** Number of threads. */
-    private static final int THREAD_CNT = Runtime.getRuntime().availableProcessors();
-
-    /**
-     * Main method.
-     *
-     * @param args Parameters.
-     * @throws Exception If failed.
-     */
-    public static void main(String[] args) throws Exception {
-        for (int i = 0; i < RETRIES; i++) {
-            X.println(">>>");
-            X.println(">>> Executing single threaded attempt: " + i);
-            X.println(">>>");
-
-            testBlockingQueue("single-threaded-linked-queue", new LinkedBlockingQueue<>());
-            testBlockingQueue("single-threaded-linked-deque", new LinkedBlockingDeque<>());
-            testBlockingQueue("single-threaded-array-queue", new ArrayBlockingQueue<>(CNT + 10));
-        }
-
-        for (int i = 0; i < RETRIES; i++) {
-            X.println(">>>");
-            X.println(">>> Executing multi-threaded attempt: " + i);
-            X.println(">>>");
-
-            testBlockingQueueMultithreaded("multi-threaded-linked-queue", new LinkedBlockingQueue<>());
-            testBlockingQueueMultithreaded("multi-threaded-linked-deque", new LinkedBlockingDeque<>());
-            testBlockingQueueMultithreaded("multi-threaded-array-queue", new ArrayBlockingQueue<>(
-                THREAD_CNT * CNT + 100));
-        }
-    }
-
-    /**
-     * @throws InterruptedException If interrupted.
-     */
-    private static void waitGc() throws InterruptedException {
-        System.gc();
-        System.gc();
-
-        X.println(">>> Waiting for GC to complete...");
-
-        Thread.sleep(1000);
-    }
-
-    /**
-     * @param testName Test name.
-     * @param q Queue to test.
-     * @throws InterruptedException If interrupted.
-     */
-    private static void testBlockingQueue(String testName, BlockingQueue<Object> q) throws InterruptedException {
-        waitGc();
-
-        X.println(">>> Starting test for: " + testName);
-
-        long dur = testBlockingQueue(q);
-
-        X.println(">>> Tested queue [testName=" + testName + ", dur=" + dur + "ms]");
-
-        assert q.isEmpty();
-    }
-
-    /**
-     * @param testName Test name.
-     * @param q Queue.
-     * @throws Exception If failed.
-     */
-    private static void testBlockingQueueMultithreaded(String testName, final BlockingQueue<Object> q)
-        throws Exception {
-        waitGc();
-
-        X.println(">>> Starting test for: " + testName);
-
-        final LongAdder adder = new LongAdder();
-
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
-                adder.add(testBlockingQueue(q));
-
-                return null;
-            }
-        }, THREAD_CNT, "queue-test-worker");
-
-        X.println(">>> Tested queue [testName=" + testName + ", dur=" + adder.sum() + "ms]");
-
-        assert q.isEmpty();
-    }
-
-    /**
-     * @param q Queue to test.
-     * @throws InterruptedException If interrupted.
-     */
-    private static long testBlockingQueue(BlockingQueue<Object> q) throws InterruptedException {
-        GridTimer timer = new GridTimer("blocking-queue");
-
-        for (int i = 0; i < CNT; i++)
-            q.put(new Object());
-
-        for (int i = 0; i < CNT; i++) {
-            Object o = q.take();
-
-            assert o != null;
-        }
-
-        timer.stop();
-
-        return timer.duration();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java
deleted file mode 100644
index 7498543..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/ConcurrentMapTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.gridgain.testframework.*;
-import org.jdk8.backport.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-/**
- *
- */
-public class ConcurrentMapTest {
-    /** */
-    private static Random rnd = new Random();
-
-    /**
-     *
-     */
-    private ConcurrentMapTest() {
-        // No-op.
-    }
-
-    /**
-     * @param args Args.
-     * @throws Exception If failed.
-     */
-    public static void main(String args[]) throws Exception {
-        Thread.sleep(5000);
-
-        Collection<IgnitePair<Integer>> ress = new LinkedList<>();
-
-        for (int lvl = 16; lvl <= 16384; lvl *= 2) {
-            System.gc();
-
-            X.println("Testing map with concurrency level: " + lvl);
-
-            int writes = testMap(100000, GridConcurrentFactory.<String, Integer>newMap(256, lvl));
-
-            ress.add(F.pair(lvl, writes));
-        }
-
-        X.println("Test summary.");
-
-        for (IgnitePair<Integer> p : ress)
-            X.println("Performance [lvl=" + p.get1() + ", writes=" + p.get2() + ']');
-
-        testPut();
-
-        testOpsSpeed();
-
-        testCreationTime();
-    }
-
-    /**
-     * @param keyRange Key range.
-     * @param map Map.
-     * @return Writes count.
-     * @throws Exception If failed.
-     */
-    public static int testMap(final int keyRange, final ConcurrentMap<String, Integer> map) throws Exception {
-        final AtomicBoolean done = new AtomicBoolean();
-
-        final AtomicInteger writes = new AtomicInteger();
-
-        IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync(
-                new Runnable() {
-                    @Override public void run() {
-                        while (!done.get()) {
-                            map.put(rnd.nextInt(keyRange) + "very.long.string.for.key", 1);
-
-                            writes.incrementAndGet();
-                        }
-                    }
-                },
-                40,
-                "thread"
-        );
-
-        long duration = 20 * 1000;
-
-        for (long time = 0; time < duration;) {
-            Thread.sleep(5000);
-
-            time += 5000;
-
-            X.println(">>> Stats [duration=" + time + ", writes=" + writes.get() + ']');
-        }
-
-        done.set(true);
-
-        fut1.get();
-
-        X.println(">>> Test finished [duration=" + duration + ", writes=" + writes.get() + ']');
-
-        return writes.get();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public static void testPut() throws Exception {
-        Map<Integer, Integer> map = new ConcurrentHashMap8<>();
-
-        map.put(0, 0);
-        map.put(0, 0);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public static void testOpsSpeed() throws Exception {
-        for (int i = 0; i < 4; i++) {
-            X.println("New map ops time: " + runOps(new ConcurrentHashMap8<Integer, Integer>(), 1000000, 100));
-
-            X.println("Jdk6 map ops time: " + runOps(new ConcurrentHashMap<Integer, Integer>(), 1000000, 100));
-        }
-    }
-
-    /**
-     * @param iterCnt Iterations count.
-     * @param threadCnt Threads count.
-     * @return Time taken.
-     */
-    private static long runOps(final Map<Integer,Integer> map, final int iterCnt, int threadCnt) throws Exception {
-        long start = System.currentTimeMillis();
-
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
-                ThreadLocalRandom8 rnd = ThreadLocalRandom8.current();
-
-                for (int i = 0; i < iterCnt; i++) {
-                    // Put random.
-                    map.put(rnd.nextInt(0, 10000), 0);
-
-                    // Read random.
-                    map.get(rnd.nextInt(0, 10000));
-
-                    // Remove random.
-                    map.remove(rnd.nextInt(0, 10000));
-                }
-
-                return null;
-            }
-        }, threadCnt, "thread");
-
-        return System.currentTimeMillis() - start;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings("ResultOfObjectAllocationIgnored")
-    public static void testCreationTime() throws Exception {
-        for (int i = 0; i < 5; i++) {
-            long now = System.currentTimeMillis();
-
-            for (int j = 0; j < 1000000; j++)
-                new ConcurrentHashMap8<Integer, Integer>();
-
-            X.println("New map creation time: " + (System.currentTimeMillis() - now));
-
-            now = System.currentTimeMillis();
-
-            for (int j = 0; j < 1000000; j++)
-                new ConcurrentHashMap<Integer, Integer>();
-
-            X.println("Jdk6 map creation time: " + (System.currentTimeMillis() - now));
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/FileIOTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/FileIOTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/FileIOTest.java
deleted file mode 100644
index 853f03b..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/FileIOTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import junit.framework.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Java file IO test.
- */
-public class FileIOTest extends TestCase {
-    /** File path. */
-    private static final String FILE_PATH = "/test-java-file.tmp";
-
-    /** Temp dir. */
-    private static final String TMP_DIR = System.getProperty("java.io.tmpdir");
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testReadLineFromBinaryFile() throws Exception {
-        File file = new File(FILE_PATH);
-
-        file.deleteOnExit();
-
-        RandomAccessFile raf = new RandomAccessFile(file, "rw");
-
-        byte[] b = new byte[100];
-
-        Arrays.fill(b, (byte)10);
-
-        raf.write(b);
-
-        raf.writeBytes("swap-spaces/space1/b53b3a3d6ab90ce0268229151c9bde11|" +
-            "b53b3a3d6ab90ce0268229151c9bde11|1315392441288" + U.nl());
-
-        raf.writeBytes("swap-spaces/space1/b53b3a3d6ab90ce0268229151c9bde11|" +
-            "b53b3a3d6ab90ce0268229151c9bde11|1315392441288" + U.nl());
-
-        raf.write(b);
-
-        raf.writeBytes("test" + U.nl());
-
-        raf.getFD().sync();
-
-        raf.seek(0);
-
-        while (raf.getFilePointer() < raf.length()) {
-            String s = raf.readLine();
-
-            X.println("String: " + s + ";");
-
-            X.println("String length: " + s.length());
-
-            X.println("File pointer: " + raf.getFilePointer());
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testMultipleFilesCreation() throws Exception {
-        File parent = new File(TMP_DIR, "testMultipleFilesCreation");
-
-        U.delete(parent);
-
-        U.mkdirs(parent);
-
-        int childCnt = 4;
-        int subChildCnt = 4;
-
-        for (int i = 0; i < childCnt; i++) {
-            File f = new File(parent, String.valueOf(i));
-
-            U.mkdirs(f);
-
-            for (int j = 0; j < subChildCnt; j++)
-                U.mkdirs(new File(f, String.valueOf(j)));
-        }
-
-        X.println("Parent: " + parent.getAbsolutePath());
-        X.println("Test started: " + U.format(System.currentTimeMillis()));
-
-        long start = System.currentTimeMillis();
-
-        byte[] data = new byte[4096];
-
-        for (int i = 0; i < 50000; i++) {
-            int idx1 = i % childCnt;
-            int idx2 = (i / childCnt) % subChildCnt;
-
-            RandomAccessFile f = null;
-
-            try {
-                f = new RandomAccessFile(new File(parent, idx1 + File.separator + idx2 + File.separatorChar + i), "rw");
-
-                f.write(data);
-            }
-            finally {
-                U.closeQuiet(f);
-            }
-        }
-
-        X.println("Test time: " + (System.currentTimeMillis() - start));
-    }
-
-    /**
-     *
-     */
-    public void testGetAbsolutePath() {
-        for (int i = 0; i < 1000000; i++) {
-            new File("/" + UUID.randomUUID().toString()).getAbsolutePath();
-
-            new File(UUID.randomUUID().toString()).getAbsolutePath();
-
-            new File("/Users").getAbsolutePath();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/FileLocksTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/FileLocksTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/FileLocksTest.java
deleted file mode 100644
index 087e9af..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/FileLocksTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import junit.framework.*;
-
-import javax.swing.*;
-import java.io.*;
-import java.nio.channels.*;
-
-/**
- * Java file locks test.
- */
-public class FileLocksTest extends TestCase {
-    /** File path (on Windows file will be created under the root directory of the current drive). */
-    private static final String LOCK_FILE_PATH = "/test-java-file-lock-tmp.bin";
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testWriteLocks() throws Exception {
-        final File file = new File(LOCK_FILE_PATH);
-
-        file.createNewFile();
-
-        RandomAccessFile raf = new RandomAccessFile(file, "rw");
-
-        System.out.println("Getting lock...");
-
-        FileLock lock = raf.getChannel().lock();
-
-        System.out.println("Obtained lock: " + lock);
-
-        Thread thread = new Thread(new Runnable() {
-            @Override public void run() {
-                try {
-                    RandomAccessFile raf = new RandomAccessFile(file, "rw");
-
-                    System.out.println("Getting lock (parallel thread)...");
-
-                    FileLock lock = raf.getChannel().lock();
-
-                    System.out.println("Obtained lock (parallel tread): " + lock);
-
-                    lock.release();
-                }
-                catch (Throwable e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-
-        thread.start();
-
-        JOptionPane.showMessageDialog(null, "Press OK to release lock.");
-
-        lock.release();
-
-        thread.join();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testReadLocks() throws Exception {
-        final File file = new File(LOCK_FILE_PATH);
-
-        file.createNewFile();
-
-        RandomAccessFile raf = new RandomAccessFile(file, "r");
-
-        System.out.println("Getting lock...");
-
-        FileLock lock = raf.getChannel().lock(0, Long.MAX_VALUE, true);
-
-        System.out.println("Obtained lock: " + lock);
-
-        Thread thread = new Thread(new Runnable() {
-            @Override public void run() {
-                try {
-                    RandomAccessFile raf = new RandomAccessFile(file, "r");
-
-                    System.out.println("Getting lock (parallel thread)...");
-
-                    FileLock lock = raf.getChannel().lock(0, Long.MAX_VALUE, true);
-
-                    System.out.println("Obtained lock (parallel thread): " + lock);
-
-                    lock.release();
-
-                }
-                catch (Throwable e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-
-        thread.start();
-
-        JOptionPane.showMessageDialog(null, "Press OK to release lock.");
-
-        lock.release();
-
-        thread.join();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/LinkedHashMapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/LinkedHashMapTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/LinkedHashMapTest.java
deleted file mode 100644
index 322dd66..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/LinkedHashMapTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import junit.framework.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.util.*;
-
-/**
- * Test for {@link LinkedHashMap}.
- */
-public class LinkedHashMapTest extends TestCase {
-    /** @throws Exception If failed. */
-    public void testAccessOrder1() throws Exception {
-        X.println(">>> testAccessOrder1 <<<");
-
-        Map<String, String> map = new LinkedHashMap<>(3, 0.75f, true);
-
-        for (int i = 1; i <= 3; i++)
-            map.put("k" + i, "v" + i);
-
-        X.println("Initial state: " + map);
-
-        int i = 0;
-
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            X.println("Entry: " + entry);
-
-            if (i > 1)
-                break;
-
-            i++;
-        }
-
-        X.println("State after loop: " + map);
-    }
-
-    /** @throws Exception If failed. */
-    public void testAccessOrder2() throws Exception {
-        X.println(">>> testAccessOrder2 <<<");
-
-        Map<String, String> map = new LinkedHashMap<>(3, 0.75f, true);
-
-        for (int i = 1; i <= 3; i++)
-            map.put("k" + i, "v" + i);
-
-        X.println("Initial state: " + map);
-
-        // Accessing second entry.
-        map.get("k2");
-
-        X.println("State after get: " + map);
-    }
-
-    /** @throws Exception If failed. */
-    public void testAccessOrder3() throws Exception {
-        X.println(">>> testAccessOrder3 <<<");
-
-        Map<String, String> map = new LinkedHashMap<>(3, 0.75f, true);
-
-        map.put("k1", "v1");
-        map.put("k2", "v2");
-
-        X.println("Initial state: " + map);
-
-        // Accessing first entry.
-        map.get("k1");
-
-        X.println("State after get: " + map);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/MultipleFileIOTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/MultipleFileIOTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/MultipleFileIOTest.java
deleted file mode 100644
index 3d2f2ee..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/MultipleFileIOTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import org.apache.ignite.internal.util.typedef.F;
-
-import java.io.*;
-import java.util.*;
-
-/**
- *
- */
-public class MultipleFileIOTest {
-    /** Temp dir. */
-    private static final String TMP_DIR = System.getProperty("java.io.tmpdir");
-
-    /**
-     *
-     */
-    private MultipleFileIOTest() {
-        // No-op.
-    }
-
-    /**
-     * @param args Args.
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TooBroadScope"})
-    public static void main(String args[]) throws Exception {
-        File parent = new File(TMP_DIR, "testMultipleFilesCreation");
-
-        System.out.println("Deleting: " + new Date());
-
-        delete(parent);
-        parent.mkdirs();
-
-        int childCnt = 10;
-        int subChildCnt = 10;
-        boolean useRaf = true;
-
-        if (args.length > 0) {
-            childCnt = Integer.parseInt(args[0]);
-            subChildCnt = Integer.parseInt(args[1]);
-        }
-
-        if (args.length > 3)
-            useRaf = Boolean.parseBoolean(args[2]);
-
-        for (int i = 0; i < childCnt; i++) {
-            File f = new File(parent, String.valueOf(i));
-
-            f.mkdirs();
-
-            for (int j = 0; j < subChildCnt; j++)
-                new File(f, String.valueOf(j)).mkdirs();
-        }
-
-        System.out.println("Test started: " + new Date());
-        System.out.println("Parent: " + parent.getAbsolutePath());
-
-        long start = System.currentTimeMillis();
-
-        byte[] data = new byte[4096];
-
-        for (int i = 0; i < 50000; i++) {
-            int idx1 = i % childCnt;
-            int idx2 = (i / childCnt) % subChildCnt;
-
-            File f = new File(parent, idx1 + File.separator + idx2 + File.separatorChar + i);
-
-            if (useRaf) {
-                RandomAccessFile raf = null;
-
-                try {
-                    raf = new RandomAccessFile(f, "rw");
-
-                    raf.write(data);
-                }
-                finally {
-                    if (raf != null)
-                        raf.close();
-                }
-            }
-            else {
-                FileOutputStream fos = null;
-
-                try {
-                    fos = new FileOutputStream(f);
-
-                    fos.write(data);
-                }
-                finally {
-                    if (fos != null)
-                        fos.close();
-                }
-            }
-        }
-
-        System.out.println("Test time: " + (System.currentTimeMillis() - start));
-    }
-
-    /**
-     * @param f File to delete.
-     */
-    private static void delete(File f) {
-        assert f != null;
-
-        if (f.isDirectory()) {
-            File[] files = f.listFiles();
-
-            if (!F.isEmpty(files)) {
-                for (File f0 : files)
-                    delete(f0);
-            }
-        }
-
-        f.delete();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java
deleted file mode 100644
index 4abcbfe..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/NetworkFailureTest.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import junit.framework.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.gridgain.testframework.*;
-import org.jetbrains.annotations.*;
-
-import javax.swing.*;
-import java.io.*;
-import java.net.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-/**
- *
- */
-public class NetworkFailureTest extends TestCase {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNetworkFailure() throws Exception {
-        final AtomicBoolean done = new AtomicBoolean();
-
-        final InetAddress addr = InetAddress.getByName("192.168.0.100");
-
-        IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    ServerSocket srvSock = null;
-                    Socket sock = null;
-
-                    try {
-                        srvSock = new ServerSocket(60000, 0, addr);
-
-                        sock = srvSock.accept();
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() + ']');
-
-                        sock.setKeepAlive(true);
-
-                        sock.setSoTimeout(2000);
-
-                        sock.setSendBufferSize(256 * 1024);
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", rcvBuf=" + sock.getReceiveBufferSize() + ']');
-
-                        while (!done.get())
-                            X.println("Read from socket: " + sock.getInputStream().read());
-
-                        return null;
-                    }
-                    finally {
-                        U.closeQuiet(srvSock);
-                        U.closeQuiet(sock);
-                    }
-                }
-            },
-            1,
-            "server"
-        );
-
-        IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    Socket sock = null;
-
-                    try {
-                        sock = new Socket(addr, 60000);
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() + ']');
-
-                        sock.setKeepAlive(true);
-
-                        sock.setSoTimeout(2000);
-
-                        sock.setSendBufferSize(256 * 1024);
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() + ']');
-
-                        int i = 0;
-
-                        while (!done.get()) {
-                            sock.getOutputStream().write(++i);
-
-                            sock.getOutputStream().flush();
-
-                            X.println("Wrote to socket: " + i);
-
-                            X.println("Socket connected: " + sock.isConnected());
-                            X.println("Socket keep alive: " + sock.getKeepAlive());
-
-                            U.sleep(1000);
-                        }
-
-                        return null;
-                    }
-                    finally {
-                        U.closeQuiet(sock);
-                    }
-                }
-            },
-            1,
-            "client"
-        );
-
-        JOptionPane.showMessageDialog(null, "Unplug network cable." + U.nl() +
-            "Press OK to finish.");
-
-        done.set(true);
-
-        fut1.get();
-        fut2.get();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testReadTimeout() throws Exception {
-        final InetAddress addr = InetAddress.getByName("192.168.3.10");
-
-        IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    ServerSocket srvSock = null;
-                    Socket sock = null;
-
-                    try {
-                        srvSock = new ServerSocket(60000, 0, addr);
-
-                        sock = srvSock.accept();
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() +
-                            ", NODELAY=" + sock.getTcpNoDelay() + ']');
-
-                        sock.setSoTimeout(2000);
-                        sock.setTcpNoDelay(true);
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() +
-                            ", NODELAY=" + sock.getTcpNoDelay() + ']');
-
-                        sock.getInputStream().read();
-                    }
-                    catch (IOException e) {
-                        X.println("Caught expected exception: " + e);
-
-                        e.printStackTrace();
-                    }
-                    finally {
-                        U.closeQuiet(srvSock);
-                        U.closeQuiet(sock);
-                    }
-
-                    return null;
-                }
-            },
-            1,
-            "server"
-        );
-
-        IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    Socket sock = null;
-
-                    try {
-                        sock = new Socket(addr, 60000);
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() +
-                            ", NODELAY=" + sock.getTcpNoDelay() + ']');
-
-                        sock.setTcpNoDelay(true);
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() +
-                            ", NODELAY=" + sock.getTcpNoDelay() + ']');
-
-                        Thread.sleep(10000);
-
-                        return null;
-                    }
-                    finally {
-                        U.closeQuiet(sock);
-                    }
-                }
-            },
-            1,
-            "client"
-        );
-
-        fut1.get();
-        fut2.get();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSocketCloseOnTimeout() throws Exception {
-        final AtomicBoolean done = new AtomicBoolean();
-
-        final InetAddress addr = InetAddress.getByName("192.168.0.100");
-
-        IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    ServerSocket srvSock = null;
-                    Socket sock = null;
-
-                    try {
-                        srvSock = new ServerSocket(60000, 0, addr);
-
-                        sock = srvSock.accept();
-
-                        while (!done.get())
-                            U.sleep(1000);
-
-                        return null;
-                    }
-                    finally {
-                        U.closeQuiet(srvSock);
-                        U.closeQuiet(sock);
-                    }
-                }
-            },
-            1,
-            "server"
-        );
-
-        final AtomicReference<Socket> sockRef = new AtomicReference<>();
-
-        IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    Socket sock = null;
-
-                    try {
-                        sock = new Socket(addr, 60000);
-
-                        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-                            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() + ']');
-
-                        sockRef.set(sock);
-
-                        sock.getOutputStream().write(
-                            new byte[(sock.getSendBufferSize() + sock.getReceiveBufferSize()) * 2]);
-
-                        assert false : "Message has been written.";
-                    }
-                    catch (IOException e) {
-                        X.println("Caught expected exception: " + e);
-
-                        e.printStackTrace();
-                    }
-                    finally {
-                        U.closeQuiet(sock);
-                    }
-
-                    return null;
-                }
-            },
-            1,
-            "client"
-        );
-
-        IgniteFuture<?> fut3 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
-                    while (true) {
-                        U.sleep(1000);
-
-                        Socket sock = sockRef.get();
-
-                        if (sock != null) {
-                            U.sleep(1000);
-
-                            U.closeQuiet(sock);
-
-                            return null;
-                        }
-                    }
-                }
-            },
-            1,
-            "client"
-        );
-
-        fut2.get();
-        fut3.get();
-
-        done.set(true);
-
-        fut1.get();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testConnectionTime() throws Exception {
-        X.println("Unexistent host.");
-        checkConnection(InetAddress.getByName("192.168.0.222"));
-
-        X.println("Unlistened port.");
-        checkConnection(InetAddress.getByName("192.168.0.1"));
-    }
-
-    /**
-     * @param addr Address to check connection to.
-     */
-    private void checkConnection(InetAddress addr) {
-        long start = System.currentTimeMillis();
-
-        Socket sock = null;
-
-        try {
-            sock = openSocket(addr, 80);
-        }
-        catch (Exception e) {
-            X.println("Caught exception: " + e.getClass().getSimpleName() + " - " + e.getMessage());
-        }
-        finally {
-            X.println("Time taken: " + (System.currentTimeMillis() - start));
-
-            U.closeQuiet(sock);
-        }
-    }
-
-    /**
-     * @param addr Remote address.
-     * @param port Remote port.
-     * @return Opened socket.
-     * @throws IOException If failed.
-     */
-    private Socket openSocket(InetAddress addr, int port) throws IOException {
-        Socket sock = new Socket();
-
-        sock.bind(new InetSocketAddress(InetAddress.getByName("192.168.0.100"), 0));
-
-        sock.connect(new InetSocketAddress(addr, port), 1);
-
-        X.println("Socket [timeout=" + sock.getSoTimeout() + ", linger=" + sock.getSoLinger() +
-            ", sndBuf=" + sock.getSendBufferSize() + ", sndBuf=" + sock.getSendBufferSize() + ']');
-
-        return sock;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd28003b/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java
deleted file mode 100644
index 8396c27..0000000
--- a/modules/core/src/test/java/org/gridgain/jvmtest/QueueSizeCounterMultiThreadedTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.jvmtest;
-
-import junit.framework.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.gridgain.testframework.*;
-import org.jetbrains.annotations.*;
-
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Test to check strange assertion in eviction manager.
- */
-public class QueueSizeCounterMultiThreadedTest extends TestCase {
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"LockAcquiredButNotSafelyReleased"})
-    public void testQueueSizeCounter() throws Exception {
-        final ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<>();
-
-        final AtomicInteger sizeCnt = new AtomicInteger();
-
-        final AtomicBoolean done = new AtomicBoolean();
-
-        final AtomicBoolean guard = new AtomicBoolean();
-
-        final ReadWriteLock lock = new ReentrantReadWriteLock();
-
-        IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync(
-            new Callable<Object>() {
-                @SuppressWarnings( {"BusyWait"})
-                @Nullable @Override public Object call() throws Exception {
-                    int cleanUps = 0;
-
-                    while (!done.get()) {
-                        lock.readLock().lock();
-
-                        try {
-                            q.add(1);
-
-                            sizeCnt.incrementAndGet();
-                        }
-                        finally {
-                            lock.readLock().unlock();
-                        }
-
-                        if (sizeCnt.get() > 100 && guard.compareAndSet(false, true)) {
-                            lock.writeLock().lock();
-
-                            try {
-                                for (Integer i = q.poll(); i != null; i = q.poll())
-                                    sizeCnt.decrementAndGet();
-
-                                cleanUps++;
-
-                                assert sizeCnt.get() == 0 : "Invalid count [cnt=" + sizeCnt.get() +
-                                    ", size=" + q.size() + ", entries=" + q + ']';
-                            }
-                            finally {
-                                lock.writeLock().unlock();
-
-                                guard.set(false);
-                            }
-                        }
-                    }
-
-                    X.println("Cleanups count (per thread): " + cleanUps);
-
-                    return null;
-                }
-            },
-            100,
-            "test-thread"
-        );
-
-        Thread.sleep(3 * 60 * 1000);
-
-        done.set(true);
-
-        fut1.get();
-    }
-}


Mime
View raw message