ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/13] incubator-ignite git commit: #IGNITE-106: Remove grid from tests
Date Tue, 03 Feb 2015 17:10:06 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
index 9274014..29fe7f8 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
@@ -373,8 +373,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         assertEquals(accessTime, files[0].getAccessTime());
         assertEquals(modificationTime, files[0].getModificationTime());
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.setTimes(new Path("/unknownFile"), 0, 0);
 
                 return null;
@@ -384,8 +385,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testCreateCheckParameters() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.create(null, EnumSet.noneOf(CreateFlag.class),
                     Options.CreateOpts.perms(FsPermission.getDefault()));
             }
@@ -434,8 +436,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         assertEquals(FsPermission.getDefault(), fs.getFileStatus(dir.getParent()).getPermission());
         assertEquals(FsPermission.getDefault(), fs.getFileStatus(dir.getParent().getParent()).getPermission());
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.create(file, EnumSet.noneOf(CreateFlag.class),
                     Options.CreateOpts.perms(FsPermission.getDefault()));
             }
@@ -480,8 +483,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         assert fs.delete(file, false);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.getFileStatus(file);
 
                 return null;
@@ -533,8 +537,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         final Path someDir2 = new Path(fsHome, "/someDir1/someDir2");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.delete(someDir2, false);
 
                 return null;
@@ -666,8 +671,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.setOwner(null, "aUser", "aGroup");
 
                 return null;
@@ -685,8 +691,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.setOwner(file, null, "aGroup");
 
                 return null;
@@ -704,7 +711,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
+        TestUtils.assertThrows(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 fs.setOwner(file, "aUser", null);
@@ -770,8 +777,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testOpenCheckParametersPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.open(null, 1024);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -782,8 +790,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         Path fsHome = new Path(primaryFsUri);
         final Path file = new Path(fsHome, "someFile");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.open(file, 1024);
             }
         }, FileNotFoundException.class, null);
@@ -840,8 +849,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.create(new Path(fsHome, dir), EnumSet.of(CreateFlag.APPEND),
                     Options.CreateOpts.perms(FsPermission.getDefault()));
             }
@@ -861,7 +871,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         FSDataOutputStream appendOs = fs.create(file, EnumSet.of(CreateFlag.APPEND),
             Options.CreateOpts.perms(FsPermission.getDefault()));
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
+        TestUtils.assertThrows(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 return fs.create(file, EnumSet.of(CreateFlag.APPEND),
@@ -908,8 +918,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         Path fsHome = new Path(primaryFsUri);
         final Path file = new Path(fsHome, "someFile");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.rename(null, file);
 
                 return null;
@@ -925,7 +936,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         fs.create(file, EnumSet.noneOf(CreateFlag.class),
             Options.CreateOpts.perms(FsPermission.getDefault())).close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
+        TestUtils.assertThrows(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 fs.rename(file, null);
@@ -943,8 +954,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         assertPathDoesNotExist(fs, srcFile);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.rename(srcFile, dstFile);
 
                 return null;
@@ -1006,8 +1018,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.rename(srcFile, dstFile);
 
                 return null;
@@ -1110,8 +1123,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testListStatusIfPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.listStatus(null);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -1119,8 +1133,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testListStatusIfPathDoesNotExist() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.listStatus(new Path("/someDir"));
             }
         }, FileNotFoundException.class, null);
@@ -1175,8 +1190,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testMkdirsIfPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.mkdir(null, FsPermission.getDefault(), true);
 
                 return null;
@@ -1212,8 +1228,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testGetFileStatusIfPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileStatus(null);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -1221,8 +1238,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testGetFileStatusIfPathDoesNotExist() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileStatus(new Path("someDir"));
             }
         }, FileNotFoundException.class, "File not found: someDir");
@@ -1230,8 +1248,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testGetFileBlockLocationsIfFileStatusIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 // Argument is checked by Hadoop.
                 return fs.getFileBlockLocations(null, 1, 2);
             }
@@ -1240,8 +1259,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
     /** @throws Exception If failed. */
     public void testGetFileBlockLocationsIfFileStatusReferenceNotExistingPath() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileBlockLocations(new Path("/someFile"), 1, 2);
             }
         }, FileNotFoundException.class, null);
@@ -1685,8 +1705,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         assert !err.get();
 
         // Ensure the directory was actually deleted.
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.getFileStatus(dir);
 
                 return null;
@@ -1737,8 +1758,10 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
             fs.mkdir(new Path("ggfs:///dir1/dir2"), FsPermission.getDefault(), true);
 
             // However, the streams, opened before disconnect, should not be valid.
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Nullable
+                @Override
+                public Object call() throws Exception {
                     s.write("test".getBytes());
 
                     s.flush();
@@ -1747,8 +1770,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
                 }
             }, IOException.class, null);
 
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     fs.getFileStatus(filePath);
 
                     return null;
@@ -1785,8 +1809,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
 
         startNodes(); // Start server again.
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 FileSystem fs = q.poll();
 
                 try {
@@ -1863,8 +1888,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
      * @param msg Expected exception message.
      */
     public void assertCloseFails(final FileSystem fs, String msg) {
-        GridTestUtils.assertThrows(log, new Callable() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable() {
+            @Override
+            public Object call() throws Exception {
                 fs.close();
 
                 return null;
@@ -1879,8 +1905,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
      * @param path Path to evaluate content summary for.
      */
     private void assertContentSummaryFails(final FileSystem fs, final Path path) {
-        GridTestUtils.assertThrows(log, new Callable<ContentSummary>() {
-            @Override public ContentSummary call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<ContentSummary>() {
+            @Override
+            public ContentSummary call() throws Exception {
                 return fs.getContentSummary(path);
             }
         }, FileNotFoundException.class, null);
@@ -1907,8 +1934,9 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
      * @param path Path to check.
      */
     private void assertPathDoesNotExist(final AbstractFileSystem fs, final Path path) {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileStatus(path);
             }
         }, FileNotFoundException.class, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
index 9a325ce..e548034 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
@@ -283,22 +283,23 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
         ggfsSecondary.delete(FILE, false);
 
         // Try reading the third block. Should fail.
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
-                IgniteFsInputStream in0 = ggfs.open(FILE);
+        TestUtils.assertThrows(log, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
+                    IgniteFsInputStream in0 = ggfs.open(FILE);
 
-                in0.seek(blockSize * 2);
+                    in0.seek(blockSize * 2);
 
-                try {
-                    in0.read(readBuf);
-                }
-                finally {
-                    U.closeQuiet(in0);
-                }
+                    try {
+                        in0.read(readBuf);
+                    }
+                    finally {
+                        U.closeQuiet(in0);
+                    }
 
-                return null;
-            }
-        }, IOException.class,
+                    return null;
+                }
+            }, IOException.class,
             "Failed to read data due to secondary file system exception: /dir/subdir/file");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
index 91197b9..825c1fc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java
@@ -349,8 +349,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testGetUriIfFSIsNotInitialized() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return new IgniteFsHadoopFileSystem().getUri();
             }
         }, IllegalStateException.class, "URI is null (was IgniteFsHadoopFileSystem properly initialized?).");
@@ -359,8 +360,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
     /** @throws Exception If failed. */
     @SuppressWarnings("NullableProblems")
     public void testInitializeCheckParametersNameIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 new IgniteFsHadoopFileSystem().initialize(null, new Configuration());
 
                 return null;
@@ -371,8 +373,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
     /** @throws Exception If failed. */
     @SuppressWarnings("NullableProblems")
     public void testInitializeCheckParametersCfgIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 new IgniteFsHadoopFileSystem().initialize(new URI(""), null);
 
                 return null;
@@ -409,7 +412,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
      * @throws Exception If failed.
      */
     public void testIpcCache() throws Exception {
-        GridGgfsHadoopEx hadoop = GridTestUtils.getFieldValue(fs, "rmtClient", "delegateRef", "value", "hadoop");
+        GridGgfsHadoopEx hadoop = TestUtils.getFieldValue(fs, "rmtClient", "delegateRef", "value", "hadoop");
 
         if (hadoop instanceof GridGgfsHadoopOutProc) {
             FileSystem fsOther = null;
@@ -488,80 +491,95 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
         // Check double close makes nothing harmful.
         fs.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
                 fs.initialize(primaryFsUri, primaryFsCfg);
 
                 return null;
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
-                fs.setPermission(path, FsPermission.createImmutable((short)777));
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
+                fs.setPermission(path, FsPermission.createImmutable((short) 777));
 
                 return null;
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Nullable @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Nullable
+            @Override
+            public Object call() throws Exception {
                 fs.setOwner(path, "user", "group");
 
                 return null;
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.open(path, 256);
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.create(path);
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.append(path);
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.rename(path, new Path("newDir"));
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.delete(path, true);
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.listStatus(path);
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.mkdirs(path);
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileStatus(path);
             }
         }, IOException.class, "File system is stopped.");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileBlockLocations(new FileStatus(1L, false, 1, 1L, 1L, new Path("path")), 0L, 256L);
             }
         }, IOException.class, "File system is stopped.");
@@ -569,8 +587,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testCreateCheckParameters() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.create(null);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -619,9 +638,10 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
         assertEquals(FsPermission.getDefault(), fs.getFileStatus(dir.getParent()).getPermission());
         assertEquals(FsPermission.getDefault(), fs.getFileStatus(dir.getParent().getParent()).getPermission());
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
-                return fs.create(file, FsPermission.getDefault(), false, 1024, (short)1, 2048, null);
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
+                return fs.create(file, FsPermission.getDefault(), false, 1024, (short) 1, 2048, null);
             }
         }, PathExistsException.class, null);
 
@@ -828,8 +848,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.setOwner(null, "aUser", "aGroup");
 
                 return null;
@@ -846,8 +867,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fs.setOwner(file, null, "aGroup");
 
                 return null;
@@ -864,7 +886,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
+        TestUtils.assertThrows(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 fs.setOwner(file, "aUser", null);
@@ -972,8 +994,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testOpenCheckParametersPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.open(null, 1024);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -984,8 +1007,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
         Path fsHome = new Path(primaryFsUri);
         final Path file = new Path(fsHome, "someFile");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.open(file, 1024);
             }
         }, FileNotFoundException.class, null);
@@ -1031,8 +1055,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testAppendCheckParametersPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.append(null);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -1048,8 +1073,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
         os.close();
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.append(new Path(fsHome, dir), 1024);
             }
         }, IOException.class, null);
@@ -1066,7 +1092,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
         FSDataOutputStream appendOs = fs.append(file);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
+        TestUtils.assertThrows(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 return fs.append(file);
@@ -1110,8 +1136,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
         Path fsHome = new Path(primaryFsUri);
         final Path file = new Path(fsHome, "someFile");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.rename(null, file);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: src");
@@ -1122,7 +1149,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
         Path fsHome = new Path(primaryFsUri);
         final Path file = new Path(fsHome, "someFile");
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
+        TestUtils.assertThrows(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 return fs.rename(file, null);
@@ -1284,20 +1311,22 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testListStatusIfPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
-                return fs.listStatus((Path)null);
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
+                return fs.listStatus((Path) null);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
     }
 
     /** @throws Exception If failed. */
     public void testListStatusIfPathDoesNotExist() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    return fs.listStatus(new Path("/tmp/some/dir"));
-                }
-            }, FileNotFoundException.class, null);
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
+                return fs.listStatus(new Path("/tmp/some/dir"));
+            }
+        }, FileNotFoundException.class, null);
     }
 
     /**
@@ -1405,8 +1434,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testMkdirsIfPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.mkdirs(null);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -1440,8 +1470,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testGetFileStatusIfPathIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileStatus(null);
             }
         }, NullPointerException.class, "Ouch! Argument cannot be null: f");
@@ -1449,8 +1480,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testGetFileStatusIfPathDoesNotExist() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileStatus(new Path("someDir"));
             }
         }, FileNotFoundException.class, "File not found: someDir");
@@ -1458,10 +1490,11 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
     /** @throws Exception If failed. */
     public void testGetFileBlockLocationsIfFileStatusIsNull() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 // Argument is checked by Hadoop.
-                return fs.getFileBlockLocations((Path)null, 1, 2);
+                return fs.getFileBlockLocations((Path) null, 1, 2);
             }
         }, NullPointerException.class, null);
     }
@@ -1935,8 +1968,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
         // Ensure the directory was actually deleted.
 
-        assert GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        assert TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 try {
                     return !fs.exists(dir);
                 }
@@ -1987,8 +2021,10 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
             assertTrue(fs.mkdirs(new Path(PRIMARY_URI, "dir1/dir2")));
 
             // However, the streams, opened before disconnect, should not be valid.
-            GridTestUtils.assertThrows(log, new Callable<Object>() {
-                @Nullable @Override public Object call() throws Exception {
+            TestUtils.assertThrows(log, new Callable<Object>() {
+                @Nullable
+                @Override
+                public Object call() throws Exception {
                     s.write("test".getBytes());
 
                     s.flush(); // Flush data to the broken output stream.
@@ -2029,8 +2065,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
 
         startNodes(); // Start server again.
 
-        GridTestUtils.runMultiThreaded(new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 FileSystem fs = q.poll();
 
                 try {
@@ -2234,8 +2271,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
      * @param msg Expected exception message.
      */
     public void assertCloseFails(final FileSystem fs, String msg) {
-        GridTestUtils.assertThrows(log, new Callable() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable() {
+            @Override
+            public Object call() throws Exception {
                 fs.close();
 
                 return null;
@@ -2250,8 +2288,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
      * @param path Path to evaluate content summary for.
      */
     private void assertContentSummaryFails(final FileSystem fs, final Path path) {
-        GridTestUtils.assertThrows(log, new Callable<ContentSummary>() {
-            @Override public ContentSummary call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<ContentSummary>() {
+            @Override
+            public ContentSummary call() throws Exception {
                 return fs.getContentSummary(path);
             }
         }, FileNotFoundException.class, null);
@@ -2278,8 +2317,9 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
      * @param path Path to check.
      */
     private void assertPathDoesNotExist(final FileSystem fs, final Path path) {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 return fs.getFileStatus(path);
             }
         }, FileNotFoundException.class, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
index 8082768..4bc68c4 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
@@ -143,8 +143,9 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra
             U.sleep(500);
 
             // This call should throw an IO exception.
-            GridTestUtils.assertThrows(null, new Callable<Object>() {
-                @Override public Object call() throws Exception {
+            TestUtils.assertThrows(null, new Callable<Object>() {
+                @Override
+                public Object call() throws Exception {
                     ggfsOut.write(data);
 
                     return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
index 4438dc7..3bdbcc6 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
@@ -268,8 +268,9 @@ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbs
      */
     @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     private void checkInvalid(final String authority) throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fileSystem(authority);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
index f62c1a4..fa8ae79 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
@@ -60,9 +60,10 @@ public abstract class GridGgfsHadoopFileSystemShmemAbstractSelfTest extends Grid
         final Collection<IpcEndpoint> eps = new LinkedList<>();
 
         try {
-            IgniteCheckedException e = (IgniteCheckedException)GridTestUtils.assertThrows(log, new Callable<Object>() {
+            IgniteCheckedException e = (IgniteCheckedException) TestUtils.assertThrows(log, new Callable<Object>() {
                 @SuppressWarnings("InfiniteLoopStatement")
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     while (true) {
                         IpcEndpoint ep = IpcEndpointFactory.connectEndpoint("shmem:10500", log);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 93f38bb..b77a323 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -90,12 +90,12 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
      *
      */
     static {
-        GridTestUtils.setFieldValue(PLANNER, "ignite", GRID);
+        TestUtils.setFieldValue(PLANNER, "ignite", GRID);
     }
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        GridTestUtils.setFieldValue(PLANNER, "log", log());
+        TestUtils.setFieldValue(PLANNER, "log", log());
 
         BLOCK_MAP.clear();
         PROXY_MAP.clear();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopFileSystemsTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopFileSystemsTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopFileSystemsTest.java
index ccc30a7..abbed0e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopFileSystemsTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopFileSystemsTest.java
@@ -82,8 +82,9 @@ public class GridHadoopFileSystemsTest extends GridHadoopAbstractSelfTest {
 
         final AtomicInteger threadNum = new AtomicInteger(0);
 
-        GridTestUtils.runMultiThreadedAsync(new Runnable() {
-            @Override public void run() {
+        TestUtils.runMultiThreadedAsync(new Runnable() {
+            @Override
+            public void run() {
                 try {
                     int curThreadNum = threadNum.getAndIncrement();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
index fd49d7b..b13cfe1 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
@@ -72,7 +72,7 @@ public class GridHadoopJobTrackerSelfTest extends GridHadoopAbstractSelfTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         super.afterTestsStopped();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
index c61f54d..df2760a 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java
@@ -183,8 +183,9 @@ public class GridHadoopMapReduceTest extends GridHadoopAbstractWordCountTest {
 
         final IgniteFsPath statPath = new IgniteFsPath("/xxx/yyy/zzz/" + jobId + "/performance");
 
-        GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 return ggfs.exists(statPath);
             }
         }, 10000);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java
index 0b15a2c..1a9b945 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java
@@ -55,8 +55,9 @@ public class GridHadoopSplitWrapperSelfTest extends GridHadoopAbstractSelfTest {
 
         assertEquals("/path/to/file:100+500", GridHadoopUtils.unwrapSplit(res).toString());
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 res.hosts();
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
index ddc165f..9294a61 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
@@ -94,7 +94,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         super.afterTestsStopped();
     }
@@ -231,8 +231,9 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
         final IgniteInternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 3),
                 createJobInfo(job.getConfiguration()));
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fut.get();
 
                 return null;
@@ -318,8 +319,9 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
 
         final IgniteInternalFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(cfg));
 
-        if (!GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        if (!TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 return splitsCount.get() > 0;
             }
         }, 20000)) {
@@ -328,8 +330,9 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
             assertTrue(false);
         }
 
-        if (!GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        if (!TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 return executedTasks.get() == splitsCount.get();
             }
         }, 20000)) {
@@ -341,8 +344,9 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
         // Fail mapper with id "1", cancels others
         failMapperId.set(1);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fut.get();
 
                 return null;
@@ -369,8 +373,9 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
 
         final IgniteInternalFuture<?> fut = hadoop.submit(jobId, createJobInfo(cfg));
 
-        if (!GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        if (!TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 return splitsCount.get() > 0;
             }
         }, 20000)) {
@@ -379,8 +384,9 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
             assertTrue(false);
         }
 
-        if (!GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
+        if (!TestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override
+            public boolean apply() {
                 X.println("___ executed tasks: " + executedTasks.get());
 
                 return executedTasks.get() == splitsCount.get();
@@ -396,8 +402,9 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
 
         assertTrue(killRes);
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 fut.get();
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
index 4093e0f..ee9eb87 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
@@ -51,7 +51,7 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
index 253c60a..1e04b6f 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsPerformanceBenchmark.java
@@ -87,8 +87,9 @@ public class GridGgfsPerformanceBenchmark {
 
         long start = System.currentTimeMillis();
 
-        IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Runnable() {
-            @Override public void run() {
+        IgniteInternalFuture<Long> fut = TestUtils.runMultiThreadedAsync(new Runnable() {
+            @Override
+            public void run() {
                 String fileIdx = op == OP_READ ? String.valueOf(idx.getAndIncrement()) : UUID.randomUUID().toString();
 
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
index 6a251cb..1e5002b 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
@@ -35,7 +35,7 @@ import java.net.*;
 import java.nio.file.*;
 import java.util.*;
 
-import static org.apache.ignite.testframework.GridTestUtils.*;
+import static org.apache.ignite.testframework.TestUtils.*;
 
 /**
  * Test suite for Hadoop Map Reduce engine.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
index c8a3659..049b01c 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java
@@ -71,7 +71,7 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
index 41dd654..d659b07 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java
@@ -45,8 +45,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.cache.hibernate.GridHibernateRegionFactory.*;
 import static org.hibernate.cfg.Environment.*;
 
-import org.apache.ignite.cache.hibernate.GridHibernateL2CacheSelfTest.Entity;
-
 /**
  *
  * Tests Hibernate L2 cache.
@@ -512,7 +510,7 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */
@@ -1851,12 +1849,13 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest {
             }
 
             for (final int id : absentIds) {
-                GridTestUtils.assertThrows(log, new Callable<Void>() {
-                    @Override public Void call() throws Exception {
+                TestUtils.assertThrows(log, new Callable<Void>() {
+                    @Override
+                    public Void call() throws Exception {
                         if (entity1)
-                            ((Entity)ses.load(Entity.class, id)).getName();
+                            ((Entity) ses.load(Entity.class, id)).getName();
                         else
-                            ((Entity2)ses.load(Entity2.class, id)).getName();
+                            ((Entity2) ses.load(Entity2.class, id)).getName();
 
                         return null;
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 96370bf..b6daf0f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -162,7 +162,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** @return cache mode. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index a7b98d1..13dc2b9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -163,7 +163,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         store.reset();
 
@@ -279,10 +279,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         // Not registered.
         final CacheQuery<List<?>> qry3 = ignite.cache(null).queries().createSqlFieldsQuery("select no()");
 
-        GridTestUtils.assertThrows(
+        TestUtils.assertThrows(
             log,
             new Callable<Object>() {
-                @Override public Object call() throws Exception {
+                @Override
+                public Object call() throws Exception {
                     qry3.execute().get();
 
                     return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 42d1bf7..766f7b7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -71,7 +71,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         ignite = null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
index 60281b7..5801dfa 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
@@ -161,7 +161,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         versions.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
index 0122336..c9a9ddc 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
@@ -50,7 +50,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 743abcd..3e3b086 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
@@ -168,7 +168,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         if (evictsEnabled()) {
             assertTrue(idxSwapCnt.get() > 0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
index 4681028..f75c035 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
@@ -77,7 +77,7 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();
 
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**
@@ -89,8 +89,9 @@ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTe
         for (int i = 0; i < 2000; i++)
             cache.put(i, new Person(i));
 
-        GridTestUtils.runMultiThreaded(new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.runMultiThreaded(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 for (int i = 0; i < 100; i++) {
                     CacheQuery<Map.Entry<Integer, Person>> qry =
                         cache.queries().createSqlQuery("Person", "age >= 0");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
index 7972eed..8851fa7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
@@ -117,7 +117,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
             assertTrue(swapSpi instanceof NoopSwapSpaceSpi);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -135,7 +135,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
             assertFalse(swapSpi instanceof NoopSwapSpaceSpi);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -208,7 +208,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
             assert success;
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -293,7 +293,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -358,7 +358,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
             }
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 
@@ -406,7 +406,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
             assert cache.isEmpty();
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index bfc0566..54a08c6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -87,7 +87,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
 
         ignite = null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index 166a0dd..c19b32d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@ -131,7 +131,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
             assertEquals(CNT / 2, misses);
         }
         finally {
-            stopAllGrids();
+            stopAllIgnites();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
index c068f43..3b8a3a9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
@@ -83,8 +83,9 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie
 
             // fut.nextX() does not guarantee the request has completed on remote node
             // (we could receive page from local one), so we need to wait.
-            assertTrue(GridTestUtils.waitForCondition(new PA() {
-                @Override public boolean apply() {
+            assertTrue(TestUtils.waitForCondition(new PA() {
+                @Override
+                public boolean apply() {
                     return map.size() == 1;
                 }
             }, getTestTimeout()));
@@ -141,8 +142,9 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie
 
         final CacheQueryFuture<List<?>> fut0 = fut;
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 int i = 0;
 
                 List<?> next;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
index 40ee56f..3396e47 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
@@ -403,14 +403,15 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
 
         final CacheQueryFuture<Map.Entry<Integer, Integer>> fut0 = fut;
 
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
                 int i = 0;
 
                 Map.Entry<Integer, Integer> e;
 
                 while ((e = fut0.next()) != null)
-                    assertEquals(++i, (int)e.getKey());
+                    assertEquals(++i, (int) e.getKey());
 
                 return null;
             }
@@ -446,8 +447,9 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
 
             // fut.nextX() does not guarantee the request has completed on remote node
             // (we could receive page from local one), so we need to wait.
-            assertTrue(GridTestUtils.waitForCondition(new PA() {
-                @Override public boolean apply() {
+            assertTrue(TestUtils.waitForCondition(new PA() {
+                @Override
+                public boolean apply() {
                     return map.size() == 1;
                 }
             }, getTestTimeout()));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
index 232ae2b..75bd693 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
@@ -225,7 +225,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest {
     private void checkCancel(final IgniteInternalFuture<?> fut) throws Exception {
         assertTrue(fut.cancel());
 
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
+        TestUtils.assertThrows(log, new Callable<Void>() {
             @Override
             public Void call() throws Exception {
                 fut.get();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index c1f5ece..82af3da 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -360,13 +360,13 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
 
         GridStringLogger log = new GridStringLogger(false, this.log);
 
-        IgniteLogger oldLog = GridTestUtils.getFieldValue(spi, "log");
+        IgniteLogger oldLog = TestUtils.getFieldValue(spi, "log");
 
         spi.configuration().setLongQueryExecutionTimeout(longQryExecTime);
         spi.configuration().setLongQueryExplain(true);
 
         try {
-            GridTestUtils.setFieldValue(spi, "log", log);
+            TestUtils.setFieldValue(spi, "log", log);
 
             String sql = "select sum(x) FROM SYSTEM_RANGE(?, ?)";
 
@@ -393,7 +393,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
             assert res.contains("/* PUBLIC.RANGE_INDEX */");
         }
         finally {
-            GridTestUtils.setFieldValue(spi, "log", oldLog);
+            TestUtils.setFieldValue(spi, "log", oldLog);
             spi.configuration().setLongQueryExecutionTimeout(3000);
         }
     }
@@ -421,12 +421,12 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
 
         GridStringLogger log = new GridStringLogger(false, this.log);
 
-        IgniteLogger oldLog = GridTestUtils.getFieldValue(spi, "log");
+        IgniteLogger oldLog = TestUtils.getFieldValue(spi, "log");
         spi.configuration().setLongQueryExecutionTimeout(longQryExecTime);
         spi.configuration().setLongQueryExplain(true);
 
         try {
-            GridTestUtils.setFieldValue(spi, "log", log);
+            TestUtils.setFieldValue(spi, "log", log);
 
             String sql = "SELECT * FROM MyNonExistingTable";
 
@@ -441,7 +441,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
             assertTrue(logStr.contains("Failed to explain plan because required table does not exist"));
         }
         finally {
-            GridTestUtils.setFieldValue(spi, "log", oldLog);
+            TestUtils.setFieldValue(spi, "log", oldLog);
             spi.configuration().setLongQueryExecutionTimeout(3000);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 9a415e8..08a4e10 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -90,7 +90,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        stopAllGrids();
+        stopAllIgnites();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
index 73552ad..8529bde 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
@@ -53,8 +53,9 @@ public class GridCacheJtaConfigurationValidationSelfTest extends GridCommonAbstr
      * @throws Exception If failed.
      */
     public void testAtomicWithTmLookup() throws Exception {
-        GridTestUtils.assertThrows(log, new Callable<Void>() {
-            @Override public Void call() throws Exception {
+        TestUtils.assertThrows(log, new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
                 startGrid(0);
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
index 0bb6abd..a92bf2f 100644
--- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
+++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
@@ -34,7 +34,7 @@ public class GridLog4jLoggingFileTest extends TestCase {
 
     /** {@inheritDoc} */
     @Override protected void setUp() throws Exception {
-        File xml = GridTestUtils.resolveGridGainPath("modules/core/src/test/config/log4j-test.xml");
+        File xml = TestUtils.resolveGridGainPath("modules/core/src/test/config/log4j-test.xml");
 
         assert xml != null;
         assert xml.exists() == true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0faf95/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java
index 748ded9..09187a2 100644
--- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java
+++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingUrlTest.java
@@ -34,7 +34,7 @@ public class GridLog4jLoggingUrlTest extends TestCase {
 
     /** {@inheritDoc} */
     @Override protected void setUp() throws Exception {
-        File xml = GridTestUtils.resolveGridGainPath("modules/core/src/test/config/log4j-test.xml");
+        File xml = TestUtils.resolveGridGainPath("modules/core/src/test/config/log4j-test.xml");
 
         assert xml != null;
         assert xml.exists();


Mime
View raw message