ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [6/7] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 10:11:25 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/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
new file mode 100644
index 0000000..6a251cb
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
@@ -0,0 +1,263 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.commons.compress.archivers.tar.*;
+import org.apache.commons.compress.compressors.gzip.*;
+import org.apache.ignite.*;
+import org.apache.ignite.client.hadoop.*;
+import org.apache.ignite.fs.*;
+import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.internal.processors.hadoop.shuffle.collections.*;
+import org.apache.ignite.internal.processors.hadoop.shuffle.streams.*;
+import org.apache.ignite.internal.processors.hadoop.taskexecutor.external.communication.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import java.io.*;
+import java.net.*;
+import java.nio.file.*;
+import java.util.*;
+
+import static org.apache.ignite.testframework.GridTestUtils.*;
+
+/**
+ * Test suite for Hadoop Map Reduce engine.
+ */
+public class IgniteHadoopTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        downloadHadoop();
+        downloadHive();
+
+        GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
+
+        TestSuite suite = new TestSuite("Ignite Hadoop MR Test Suite");
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemSecondaryModeSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemClientSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoggerStateSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoggerSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemHandshakeSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopDualSyncSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopDualAsyncSelfTest.class.getName())));
+
+        suite.addTest(IgniteFsEventsTestSuite.suiteNoarchOnly());
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopFileSystemsTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopValidationSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopDefaultMapReducePlannerSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopJobTrackerSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopHashMapSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopDataStreamSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopConcurrentHashMultimapSelftest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSkipListSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopTaskExecutionSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopV2JobSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSerializationWrapperSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSplitWrapperSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopTasksV1Test.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopTasksV2Test.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopMapReduceTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopMapReduceEmbeddedSelfTest.class.getName())));
+
+        //TODO: GG-8936 Fix and uncomment ExternalExecution tests
+        //suite.addTest(new TestSuite(ldr.loadClass(GridHadoopExternalTaskExecutionSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopExternalCommunicationSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSortingTest.class.getName())));
+
+        //TODO: GG-8936 Fix and uncomment ExternalExecution tests
+        //suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSortingExternalTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopGroupingTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopClientProtocolSelfTest.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopClientProtocolEmbeddedSelfTest.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopCommandLineTest.class.getName())));
+
+        return suite;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public static void downloadHive() throws Exception {
+        String ver = IgniteSystemProperties.getString("hive.version", "0.13.1");
+
+        X.println("Will use Hive version: " + ver);
+
+        String downloadPath = "hive/hive-" + ver + "/apache-hive-" + ver + "-bin.tar.gz";
+
+        download("Hive", "HIVE_HOME", downloadPath, "apache-hive-" + ver + "-bin");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public static void downloadHadoop() throws Exception {
+        String ver = IgniteSystemProperties.getString("hadoop.version", "2.4.1");
+
+        X.println("Will use Hadoop version: " + ver);
+
+        String downloadPath = "hadoop/common/hadoop-" + ver + "/hadoop-" + ver + ".tar.gz";
+
+        download("Hadoop", "HADOOP_HOME", downloadPath, "hadoop-" + ver);
+    }
+
+    /**
+     *  Downloads and extracts an Apache product.
+     *
+     * @param appName Name of application for log messages.
+     * @param homeVariable Pointer to home directory of the component.
+     * @param downloadPath Relative download path of tar package.
+     * @param destName Local directory name to install component.
+     * @throws Exception If failed.
+     */
+    private static void download(String appName, String homeVariable, String downloadPath, String destName)
+        throws Exception {
+        String homeVal = IgniteSystemProperties.getString(homeVariable);
+
+        if (!F.isEmpty(homeVal) && new File(homeVal).isDirectory()) {
+            X.println(homeVariable + " is set to: " + homeVal);
+
+            return;
+        }
+
+        List<String> urls = F.asList(
+            "http://apache-mirror.rbc.ru/pub/apache/",
+            "http://www.eu.apache.org/dist/",
+            "http://www.us.apache.org/dist/");
+
+        String tmpPath = System.getProperty("java.io.tmpdir");
+
+        X.println("tmp: " + tmpPath);
+
+        File install = new File(tmpPath + File.separatorChar + "__hadoop");
+
+        File home = new File(install, destName);
+
+        X.println("Setting " + homeVariable + " to " + home.getAbsolutePath());
+
+        System.setProperty(homeVariable, home.getAbsolutePath());
+
+        File successFile = new File(home, "__success");
+
+        if (home.exists()) {
+            if (successFile.exists()) {
+                X.println(appName + " distribution already exists.");
+
+                return;
+            }
+
+            X.println(appName + " distribution is invalid and it will be deleted.");
+
+            if (!U.delete(home))
+                throw new IOException("Failed to delete directory: " + install.getAbsolutePath());
+        }
+
+        for (String url : urls) {
+            if (!(install.exists() || install.mkdirs()))
+                throw new IOException("Failed to create directory: " + install.getAbsolutePath());
+
+            URL u = new URL(url + downloadPath);
+
+            X.println("Attempting to download from: " + u);
+
+            try {
+                URLConnection c = u.openConnection();
+
+                c.connect();
+
+                try (TarArchiveInputStream in = new TarArchiveInputStream(new GzipCompressorInputStream(
+                    new BufferedInputStream(c.getInputStream(), 32 * 1024)))) {
+
+                    TarArchiveEntry entry;
+
+                    while ((entry = in.getNextTarEntry()) != null) {
+                        File dest = new File(install, entry.getName());
+
+                        if (entry.isDirectory()) {
+                            if (!dest.mkdirs())
+                                throw new IllegalStateException();
+                        }
+                        else {
+                            File parent = dest.getParentFile();
+
+                            if (!(parent.exists() || parent.mkdirs()))
+                                throw new IllegalStateException();
+
+                            X.print(" [" + dest);
+
+                            try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(dest, false),
+                                    128 * 1024)) {
+                                U.copy(in, out);
+
+                                out.flush();
+                            }
+
+                            Files.setPosixFilePermissions(dest.toPath(), modeToPermissionSet(entry.getMode()));
+
+                            X.println("]");
+                        }
+                    }
+                }
+
+                if (successFile.createNewFile())
+                    return;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+
+                U.delete(install);
+            }
+        }
+
+        throw new IllegalStateException("Failed to install " + appName + ".");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java
deleted file mode 100644
index e4655f9..0000000
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.fs.*;
-import org.apache.ignite.internal.processors.fs.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-
-import static org.apache.ignite.testsuites.bamboo.GridHadoopTestSuite.*;
-
-/**
- * Test suite for Hadoop file system over GridGain cache.
- * Contains tests which works on Linux and Mac OS platform only.
- */
-public class GridGgfsLinuxAndMacOSTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        downloadHadoop();
-
-        GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
-
-        TestSuite suite = new TestSuite("Gridgain GGFS Test Suite For Linux And Mac OS");
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemExternalPrimarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemExternalSecondarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemExternalDualSyncSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemExternalDualAsyncSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemEmbeddedPrimarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemEmbeddedSecondarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemEmbeddedDualSyncSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemIpcCacheSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoop20FileSystemShmemPrimarySelfTest.class.getName())));
-
-        suite.addTest(GridGgfsEventsTestSuite.suite());
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridHadoopTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridHadoopTestSuite.java
deleted file mode 100644
index c52072c..0000000
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridHadoopTestSuite.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.commons.compress.archivers.tar.*;
-import org.apache.commons.compress.compressors.gzip.*;
-import org.apache.ignite.*;
-import org.apache.ignite.client.hadoop.*;
-import org.apache.ignite.fs.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.processors.hadoop.shuffle.collections.*;
-import org.apache.ignite.internal.processors.hadoop.shuffle.streams.*;
-import org.apache.ignite.internal.processors.hadoop.taskexecutor.external.communication.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
-import java.nio.file.*;
-import java.util.*;
-
-import static org.apache.ignite.testframework.GridTestUtils.*;
-
-/**
- * Test suite for Hadoop Map Reduce engine.
- */
-public class GridHadoopTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        downloadHadoop();
-        downloadHive();
-
-        GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
-
-        TestSuite suite = new TestSuite("Gridgain Hadoop MR Test Suite");
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemSecondaryModeSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemClientSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoggerStateSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemLoggerSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopFileSystemHandshakeSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopDualSyncSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridGgfsHadoopDualAsyncSelfTest.class.getName())));
-
-        suite.addTest(GridGgfsEventsTestSuite.suiteNoarchOnly());
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopFileSystemsTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopValidationSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopDefaultMapReducePlannerSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopJobTrackerSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopHashMapSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopDataStreamSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopConcurrentHashMultimapSelftest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSkipListSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopTaskExecutionSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopV2JobSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSerializationWrapperSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSplitWrapperSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopTasksV1Test.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopTasksV2Test.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopMapReduceTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopMapReduceEmbeddedSelfTest.class.getName())));
-
-        //TODO: GG-8936 Fix and uncomment ExternalExecution tests
-        //suite.addTest(new TestSuite(ldr.loadClass(GridHadoopExternalTaskExecutionSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopExternalCommunicationSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSortingTest.class.getName())));
-
-        //TODO: GG-8936 Fix and uncomment ExternalExecution tests
-        //suite.addTest(new TestSuite(ldr.loadClass(GridHadoopSortingExternalTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopGroupingTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopClientProtocolSelfTest.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopClientProtocolEmbeddedSelfTest.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(GridHadoopCommandLineTest.class.getName())));
-
-        return suite;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public static void downloadHive() throws Exception {
-        String ver = IgniteSystemProperties.getString("hive.version", "0.13.1");
-
-        X.println("Will use Hive version: " + ver);
-
-        String downloadPath = "hive/hive-" + ver + "/apache-hive-" + ver + "-bin.tar.gz";
-
-        download("Hive", "HIVE_HOME", downloadPath, "apache-hive-" + ver + "-bin");
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public static void downloadHadoop() throws Exception {
-        String ver = IgniteSystemProperties.getString("hadoop.version", "2.4.1");
-
-        X.println("Will use Hadoop version: " + ver);
-
-        String downloadPath = "hadoop/common/hadoop-" + ver + "/hadoop-" + ver + ".tar.gz";
-
-        download("Hadoop", "HADOOP_HOME", downloadPath, "hadoop-" + ver);
-    }
-
-    /**
-     *  Downloads and extracts an Apache product.
-     *
-     * @param appName Name of application for log messages.
-     * @param homeVariable Pointer to home directory of the component.
-     * @param downloadPath Relative download path of tar package.
-     * @param destName Local directory name to install component.
-     * @throws Exception If failed.
-     */
-    private static void download(String appName, String homeVariable, String downloadPath, String destName)
-        throws Exception {
-        String homeVal = IgniteSystemProperties.getString(homeVariable);
-
-        if (!F.isEmpty(homeVal) && new File(homeVal).isDirectory()) {
-            X.println(homeVariable + " is set to: " + homeVal);
-
-            return;
-        }
-
-        List<String> urls = F.asList(
-            "http://apache-mirror.rbc.ru/pub/apache/",
-            "http://www.eu.apache.org/dist/",
-            "http://www.us.apache.org/dist/");
-
-        String tmpPath = System.getProperty("java.io.tmpdir");
-
-        X.println("tmp: " + tmpPath);
-
-        File install = new File(tmpPath + File.separatorChar + "__hadoop");
-
-        File home = new File(install, destName);
-
-        X.println("Setting " + homeVariable + " to " + home.getAbsolutePath());
-
-        System.setProperty(homeVariable, home.getAbsolutePath());
-
-        File successFile = new File(home, "__success");
-
-        if (home.exists()) {
-            if (successFile.exists()) {
-                X.println(appName + " distribution already exists.");
-
-                return;
-            }
-
-            X.println(appName + " distribution is invalid and it will be deleted.");
-
-            if (!U.delete(home))
-                throw new IOException("Failed to delete directory: " + install.getAbsolutePath());
-        }
-
-        for (String url : urls) {
-            if (!(install.exists() || install.mkdirs()))
-                throw new IOException("Failed to create directory: " + install.getAbsolutePath());
-
-            URL u = new URL(url + downloadPath);
-
-            X.println("Attempting to download from: " + u);
-
-            try {
-                URLConnection c = u.openConnection();
-
-                c.connect();
-
-                try (TarArchiveInputStream in = new TarArchiveInputStream(new GzipCompressorInputStream(
-                    new BufferedInputStream(c.getInputStream(), 32 * 1024)))) {
-
-                    TarArchiveEntry entry;
-
-                    while ((entry = in.getNextTarEntry()) != null) {
-                        File dest = new File(install, entry.getName());
-
-                        if (entry.isDirectory()) {
-                            if (!dest.mkdirs())
-                                throw new IllegalStateException();
-                        }
-                        else {
-                            File parent = dest.getParentFile();
-
-                            if (!(parent.exists() || parent.mkdirs()))
-                                throw new IllegalStateException();
-
-                            X.print(" [" + dest);
-
-                            try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(dest, false),
-                                    128 * 1024)) {
-                                U.copy(in, out);
-
-                                out.flush();
-                            }
-
-                            Files.setPosixFilePermissions(dest.toPath(), modeToPermissionSet(entry.getMode()));
-
-                            X.println("]");
-                        }
-                    }
-                }
-
-                if (successFile.createNewFile())
-                    return;
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-
-                U.delete(install);
-            }
-        }
-
-        throw new IllegalStateException("Failed to install " + appName + ".");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java
deleted file mode 100644
index 846d565..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites;
-
-import junit.framework.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.local.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.cache.query.continuous.*;
-import org.apache.ignite.internal.processors.cache.query.reducefields.*;
-
-/**
- * Test suite for cache queries.
- */
-public class GridCacheQuerySelfTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception If failed.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Gridgain Cache Queries Test Suite");
-
-        // Queries tests.
-        suite.addTestSuite(GridCacheQueryLoadSelfTest.class);
-        suite.addTestSuite(GridCacheQueryMetricsSelfTest.class);
-        suite.addTestSuite(GridCacheLocalQuerySelfTest.class);
-        suite.addTestSuite(GridCacheLocalAtomicQuerySelfTest.class);
-        suite.addTestSuite(GridCacheReplicatedQuerySelfTest.class);
-        suite.addTestSuite(GridCacheReplicatedQueryP2PDisabledSelfTest.class);
-        suite.addTestSuite(GridCachePartitionedQuerySelfTest.class);
-        suite.addTestSuite(GridCacheAtomicQuerySelfTest.class);
-        suite.addTestSuite(GridCacheAtomicNearEnabledQuerySelfTest.class);
-        suite.addTestSuite(GridCachePartitionedQueryP2PDisabledSelfTest.class);
-        suite.addTestSuite(GridCachePartitionedQueryMultiThreadedSelfTest.class);
-        suite.addTestSuite(GridCacheQueryIndexSelfTest.class);
-        suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
-        suite.addTestSuite(GridCacheQueryMultiThreadedSelfTest.class);
-        suite.addTestSuite(GridCacheQueryEvictsMultiThreadedSelfTest.class);
-        suite.addTestSuite(GridCacheQueryOffheapMultiThreadedSelfTest.class);
-        suite.addTestSuite(GridCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
-        suite.addTestSuite(GridCacheQueryNodeRestartSelfTest.class);
-        suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
-        suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
-        suite.addTestSuite(GridCacheSqlQueryMultiThreadedSelfTest.class);
-
-        // Fields queries.
-        suite.addTestSuite(GridCacheLocalFieldsQuerySelfTest.class);
-        suite.addTestSuite(GridCacheReplicatedFieldsQuerySelfTest.class);
-        suite.addTestSuite(GridCacheReplicatedFieldsQueryP2PDisabledSelfTest.class);
-        suite.addTestSuite(GridCachePartitionedFieldsQuerySelfTest.class);
-        suite.addTestSuite(GridCacheAtomicFieldsQuerySelfTest.class);
-        suite.addTestSuite(GridCacheAtomicNearEnabledFieldsQuerySelfTest.class);
-        suite.addTestSuite(GridCachePartitionedFieldsQueryP2PDisabledSelfTest.class);
-        suite.addTestSuite(GridCacheFieldsQueryNoDataSelfTest.class);
-
-        // Continuous queries.
-        suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class);
-        suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class);
-
-        // Reduce fields queries.
-        suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class);
-        suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class);
-        suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class);
-        suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class);
-
-        suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
-
-        suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class);
-
-        suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
new file mode 100644
index 0000000..c570160
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
+import org.apache.ignite.spi.communication.tcp.*;
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
+import org.apache.ignite.internal.processors.cache.local.*;
+import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.processors.cache.query.continuous.*;
+import org.apache.ignite.internal.processors.cache.query.reducefields.*;
+
+/**
+ * Test suite for cache queries.
+ */
+public class IgniteCacheQuerySelfTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception If failed.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite");
+
+        // Queries tests.
+        suite.addTestSuite(GridCacheQueryLoadSelfTest.class);
+        suite.addTestSuite(GridCacheQueryMetricsSelfTest.class);
+        suite.addTestSuite(GridCacheLocalQuerySelfTest.class);
+        suite.addTestSuite(GridCacheLocalAtomicQuerySelfTest.class);
+        suite.addTestSuite(GridCacheReplicatedQuerySelfTest.class);
+        suite.addTestSuite(GridCacheReplicatedQueryP2PDisabledSelfTest.class);
+        suite.addTestSuite(GridCachePartitionedQuerySelfTest.class);
+        suite.addTestSuite(GridCacheAtomicQuerySelfTest.class);
+        suite.addTestSuite(GridCacheAtomicNearEnabledQuerySelfTest.class);
+        suite.addTestSuite(GridCachePartitionedQueryP2PDisabledSelfTest.class);
+        suite.addTestSuite(GridCachePartitionedQueryMultiThreadedSelfTest.class);
+        suite.addTestSuite(GridCacheQueryIndexSelfTest.class);
+        suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);
+        suite.addTestSuite(GridCacheQueryMultiThreadedSelfTest.class);
+        suite.addTestSuite(GridCacheQueryEvictsMultiThreadedSelfTest.class);
+        suite.addTestSuite(GridCacheQueryOffheapMultiThreadedSelfTest.class);
+        suite.addTestSuite(GridCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
+        suite.addTestSuite(GridCacheQueryNodeRestartSelfTest.class);
+        suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class);
+        suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);
+        suite.addTestSuite(GridCacheSqlQueryMultiThreadedSelfTest.class);
+
+        // Fields queries.
+        suite.addTestSuite(GridCacheLocalFieldsQuerySelfTest.class);
+        suite.addTestSuite(GridCacheReplicatedFieldsQuerySelfTest.class);
+        suite.addTestSuite(GridCacheReplicatedFieldsQueryP2PDisabledSelfTest.class);
+        suite.addTestSuite(GridCachePartitionedFieldsQuerySelfTest.class);
+        suite.addTestSuite(GridCacheAtomicFieldsQuerySelfTest.class);
+        suite.addTestSuite(GridCacheAtomicNearEnabledFieldsQuerySelfTest.class);
+        suite.addTestSuite(GridCachePartitionedFieldsQueryP2PDisabledSelfTest.class);
+        suite.addTestSuite(GridCacheFieldsQueryNoDataSelfTest.class);
+
+        // Continuous queries.
+        suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class);
+        suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class);
+
+        // Reduce fields queries.
+        suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class);
+        suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class);
+        suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class);
+        suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class);
+
+        suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
+
+        suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class);
+
+        suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java
new file mode 100644
index 0000000..2a3f50a
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteH2IndexingSpiTestSuite.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
+import org.apache.ignite.internal.processors.query.h2.*;
+import org.apache.ignite.internal.processors.query.h2.opt.*;
+
+/**
+ * H2 indexing SPI tests.
+ */
+public class IgniteH2IndexingSpiTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("H2 Indexing SPI Test Suite");
+
+        // H2 Optimized table test.
+        suite.addTest(new TestSuite(GridH2TableSelfTest.class));
+
+        // H2 Indexing in-memory.
+        suite.addTest(new TestSuite(GridH2IndexingInMemSelfTest.class));
+
+        // H2 Off-heap memory.
+        suite.addTest(new TestSuite(GridH2IndexingOffheapSelfTest.class));
+
+        // Index rebuilding.
+        suite.addTest(new TestSuite(GridH2IndexRebuildTest.class));
+
+        // Geo.
+        suite.addTestSuite(GridH2IndexingGeoSelfTest.class);
+
+        // Tests moved to this suite since they require GridH2IndexingSpi.
+        suite.addTestSuite(GridCacheOffHeapAndSwapSelfTest.class);
+        suite.addTestSuite(GridIndexingWithNoopSwapSelfTest.class);
+        suite.addTestSuite(GridCachePartitionedHitsAndMissesSelfTest.class);
+        suite.addTestSuite(GridCacheSwapSelfTest.class);
+        suite.addTestSuite(GridCacheOffHeapSelfTest.class);
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java
deleted file mode 100644
index f9e7764..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.query.h2.*;
-import org.apache.ignite.internal.processors.query.h2.opt.*;
-
-/**
- * H2 indexing SPI tests.
- */
-public class GridH2IndexingSpiTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("H2 Indexing SPI Test Suite");
-
-        // H2 Optimized table test.
-        suite.addTest(new TestSuite(GridH2TableSelfTest.class));
-
-        // H2 Indexing in-memory.
-        suite.addTest(new TestSuite(GridH2IndexingInMemSelfTest.class));
-
-        // H2 Off-heap memory.
-        suite.addTest(new TestSuite(GridH2IndexingOffheapSelfTest.class));
-
-        // Index rebuilding.
-        suite.addTest(new TestSuite(GridH2IndexRebuildTest.class));
-
-        // Geo.
-        suite.addTestSuite(GridH2IndexingGeoSelfTest.class);
-
-        // Tests moved to this suite since they require GridH2IndexingSpi.
-        suite.addTestSuite(GridCacheOffHeapAndSwapSelfTest.class);
-        suite.addTestSuite(GridIndexingWithNoopSwapSelfTest.class);
-        suite.addTestSuite(GridCachePartitionedHitsAndMissesSelfTest.class);
-        suite.addTestSuite(GridCacheSwapSelfTest.class);
-        suite.addTestSuite(GridCacheOffHeapSelfTest.class);
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java b/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java
new file mode 100644
index 0000000..96d24fe
--- /dev/null
+++ b/modules/jcl/src/test/java/org/apache/ignite/testsuites/IgniteJclTestSuite.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.logger.jcl.*;
+
+/**
+ * Commons logging test.
+ */
+public class IgniteJclTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Commons Logging Test Suite");
+
+        suite.addTest(new TestSuite(GridJclLoggerTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/jcl/src/test/java/org/apache/ignite/testsuites/bamboo/GridJclTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/jcl/src/test/java/org/apache/ignite/testsuites/bamboo/GridJclTestSuite.java b/modules/jcl/src/test/java/org/apache/ignite/testsuites/bamboo/GridJclTestSuite.java
deleted file mode 100644
index 6554142..0000000
--- a/modules/jcl/src/test/java/org/apache/ignite/testsuites/bamboo/GridJclTestSuite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.logger.jcl.*;
-
-/**
- * Commons logging test.
- */
-public class GridJclTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Commons Logging Test Suite");
-
-        suite.addTest(new TestSuite(GridJclLoggerTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
new file mode 100644
index 0000000..2febf66
--- /dev/null
+++ b/modules/jta/src/test/java/org/apache/ignite/testsuites/IgniteJtaTestSuite.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.cache.*;
+
+/**
+ * JTA integration tests.
+ */
+public class IgniteJtaTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("JTA Integration Test Suite");
+
+        suite.addTestSuite(GridCacheJtaSelfTest.class);
+        suite.addTestSuite(GridCacheReplicatedJtaSelfTest.class);
+        suite.addTestSuite(GridTmLookupLifecycleAwareSelfTest.class);
+        suite.addTestSuite(GridCacheJtaConfigurationValidationSelfTest.class);
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/jta/src/test/java/org/apache/ignite/testsuites/bamboo/GridJtaTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/testsuites/bamboo/GridJtaTestSuite.java b/modules/jta/src/test/java/org/apache/ignite/testsuites/bamboo/GridJtaTestSuite.java
deleted file mode 100644
index feec4fb..0000000
--- a/modules/jta/src/test/java/org/apache/ignite/testsuites/bamboo/GridJtaTestSuite.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.internal.processors.cache.*;
-
-/**
- * JTA integration tests.
- */
-public class GridJtaTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("JTA Integration Test Suite");
-
-        suite.addTestSuite(GridCacheJtaSelfTest.class);
-        suite.addTestSuite(GridCacheReplicatedJtaSelfTest.class);
-        suite.addTestSuite(GridTmLookupLifecycleAwareSelfTest.class);
-        suite.addTestSuite(GridCacheJtaConfigurationValidationSelfTest.class);
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/log4j/src/test/java/org/apache/ignite/testsuites/IgniteLog4jTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/apache/ignite/testsuites/IgniteLog4jTestSuite.java b/modules/log4j/src/test/java/org/apache/ignite/testsuites/IgniteLog4jTestSuite.java
new file mode 100644
index 0000000..ebb3735
--- /dev/null
+++ b/modules/log4j/src/test/java/org/apache/ignite/testsuites/IgniteLog4jTestSuite.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.logger.log4j.*;
+
+/**
+ * Log4j logging tests.
+ */
+public class IgniteLog4jTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Log4j Logging Test Suite");
+
+        suite.addTest(new TestSuite(GridLog4jInitializedTest.class));
+        suite.addTest(new TestSuite(GridLog4jNotInitializedTest.class));
+        suite.addTest(new TestSuite(GridLog4jCorrectFileNameTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/log4j/src/test/java/org/apache/ignite/testsuites/bamboo/GridLog4jTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/apache/ignite/testsuites/bamboo/GridLog4jTestSuite.java b/modules/log4j/src/test/java/org/apache/ignite/testsuites/bamboo/GridLog4jTestSuite.java
deleted file mode 100644
index f5b23c8..0000000
--- a/modules/log4j/src/test/java/org/apache/ignite/testsuites/bamboo/GridLog4jTestSuite.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.logger.log4j.*;
-
-/**
- * Log4j logging tests.
- */
-public class GridLog4jTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Log4j Logging Test Suite");
-
-        suite.addTest(new TestSuite(GridLog4jInitializedTest.class));
-        suite.addTest(new TestSuite(GridLog4jNotInitializedTest.class));
-        suite.addTest(new TestSuite(GridLog4jCorrectFileNameTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java b/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
new file mode 100644
index 0000000..fe9cbee
--- /dev/null
+++ b/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.schedule.*;
+
+/**
+ * Scheduler tests.
+ */
+public class IgniteSchedulerTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Grid Scheduler Test Suite");
+
+        suite.addTestSuite(GridScheduleSelfTest.class);
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/schedule/src/test/java/org/apache/ignite/testsuites/bamboo/GridSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/test/java/org/apache/ignite/testsuites/bamboo/GridSchedulerTestSuite.java b/modules/schedule/src/test/java/org/apache/ignite/testsuites/bamboo/GridSchedulerTestSuite.java
deleted file mode 100644
index 7a0e0b6..0000000
--- a/modules/schedule/src/test/java/org/apache/ignite/testsuites/bamboo/GridSchedulerTestSuite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.internal.processors.schedule.*;
-
-/**
- * Scheduler tests.
- */
-public class GridSchedulerTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Grid Scheduler Test Suite");
-
-        suite.addTestSuite(GridScheduleSelfTest.class);
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/spring/src/test/java/org/apache/ignite/testsuites/GridResourceSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/GridResourceSelfTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/GridResourceSelfTestSuite.java
deleted file mode 100644
index 7de7d56..0000000
--- a/modules/spring/src/test/java/org/apache/ignite/testsuites/GridResourceSelfTestSuite.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites;
-
-import junit.framework.*;
-import org.apache.ignite.internal.processors.resource.*;
-
-/**
- * Gridgain resource injection test Suite.
- */
-@SuppressWarnings({"ProhibitedExceptionDeclared"})
-public class GridResourceSelfTestSuite extends TestSuite {
-    /**
-     * @return Resource injection test suite.
-     * @throws Exception If failed.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Gridgain Resource Injection Test Suite");
-
-        suite.addTest(new TestSuite(GridResourceProcessorSelfTest.class));
-        suite.addTest(new TestSuite(GridLoggerInjectionSelfTest.class));
-        suite.addTest(new TestSuite(GridServiceInjectionSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
new file mode 100644
index 0000000..1c2003f
--- /dev/null
+++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteResourceSelfTestSuite.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.resource.*;
+
+/**
+ * Gridgain resource injection test Suite.
+ */
+@SuppressWarnings({"ProhibitedExceptionDeclared"})
+public class IgniteResourceSelfTestSuite extends TestSuite {
+    /**
+     * @return Resource injection test suite.
+     * @throws Exception If failed.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Ignite Resource Injection Test Suite");
+
+        suite.addTest(new TestSuite(GridResourceProcessorSelfTest.class));
+        suite.addTest(new TestSuite(GridLoggerInjectionSelfTest.class));
+        suite.addTest(new TestSuite(GridServiceInjectionSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
new file mode 100644
index 0000000..f1a3a60
--- /dev/null
+++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.p2p.*;
+import org.apache.ignite.spring.*;
+import org.apache.ignite.testsuites.*;
+
+/**
+ * Spring tests.
+ */
+public class IgniteSpringTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Spring Test Suite");
+
+        suite.addTestSuite(GridSpringBeanSerializationSelfTest.class);
+        suite.addTestSuite(GridFactorySelfTest.class);
+
+        suite.addTest(IgniteResourceSelfTestSuite.suite());
+
+        // Tests moved to this suite since they require Spring functionality.
+        suite.addTest(new TestSuite(GridP2PUserVersionChangeSelfTest.class));
+
+        suite.addTest(new TestSuite(GridSpringCacheManagerSelfTest.class));
+        suite.addTest(new TestSuite(GridSpringDynamicCacheManagerSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java
deleted file mode 100644
index ebefd0e..0000000
--- a/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.p2p.*;
-import org.apache.ignite.spring.*;
-import org.apache.ignite.testsuites.*;
-
-/**
- * Spring tests.
- */
-public class GridSpringTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Spring Test Suite");
-
-        suite.addTestSuite(GridSpringBeanSerializationSelfTest.class);
-        suite.addTestSuite(GridFactorySelfTest.class);
-
-        suite.addTest(GridResourceSelfTestSuite.suite());
-
-        // Tests moved to this suite since they require Spring functionality.
-        suite.addTest(new TestSuite(GridP2PUserVersionChangeSelfTest.class));
-
-        suite.addTest(new TestSuite(GridSpringCacheManagerSelfTest.class));
-        suite.addTest(new TestSuite(GridSpringDynamicCacheManagerSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/ssh/src/test/java/org/apache/ignite/internal/GridStartStopRestartTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/GridStartStopRestartTestSuite.java b/modules/ssh/src/test/java/org/apache/ignite/internal/GridStartStopRestartTestSuite.java
deleted file mode 100644
index 5292a4c..0000000
--- a/modules/ssh/src/test/java/org/apache/ignite/internal/GridStartStopRestartTestSuite.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal;
-
-import junit.framework.*;
-
-/**
- * Start nodes tests.
- */
-public class GridStartStopRestartTestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Start Nodes Test Suite");
-
-        suite.addTestSuite(GridNodeStartUtilsSelfTest.class);
-
-        suite.addTestSuite(GridProjectionStartStopRestartSelfTest.class);
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
new file mode 100644
index 0000000..a46a62b
--- /dev/null
+++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import junit.framework.*;
+
+/**
+ * Start nodes tests.
+ */
+public class IgniteStartStopRestartTestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Start Nodes Test Suite");
+
+        suite.addTestSuite(GridNodeStartUtilsSelfTest.class);
+
+        suite.addTestSuite(GridProjectionStartStopRestartSelfTest.class);
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java
deleted file mode 100644
index e4d8a1c..0000000
--- a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites;
-
-import junit.framework.*;
-import org.apache.ignite.tools.*;
-
-/**
- * Tools self-test suite.
- */
-public class GridToolsSelfTestSuite extends TestSuite {
-    /**
-     * @return Grid ant tasks tests suite.
-     * @throws Exception If failed.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Gridgain Ant Tasks Test Suite");
-
-        suite.addTest(new TestSuite(GridToolsSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
new file mode 100644
index 0000000..f37209a
--- /dev/null
+++ b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.tools.*;
+
+/**
+ * Tools self-test suite.
+ */
+public class IgniteToolsSelfTestSuite extends TestSuite {
+    /**
+     * @return Grid ant tasks tests suite.
+     * @throws Exception If failed.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Ignite Ant Tasks Test Suite");
+
+        suite.addTest(new TestSuite(GridToolsSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
new file mode 100644
index 0000000..092e40a
--- /dev/null
+++ b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.p2p.*;
+import org.apache.ignite.testsuites.*;
+import org.apache.ignite.spi.deployment.uri.*;
+import org.apache.ignite.spi.deployment.uri.scanners.file.*;
+import org.apache.ignite.spi.deployment.uri.scanners.http.*;
+
+/**
+ * Tests against {@link GridUriDeploymentSpi}.
+ */
+public class IgniteUriDeploymentTestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("URI Deployment Spi Test Suite");
+
+        suite.addTest(new TestSuite(GridUriDeploymentConfigSelfTest.class));
+        suite.addTest(new TestSuite(GridUriDeploymentSimpleSelfTest.class));
+        suite.addTest(new TestSuite(GridUriDeploymentClassloaderRegisterSelfTest.class));
+        suite.addTest(new TestSuite(GridUriDeploymentFileProcessorSelfTest.class));
+        suite.addTest(new TestSuite(GridUriDeploymentClassLoaderSelfTest.class));
+        suite.addTest(new TestSuite(GridUriDeploymentClassLoaderMultiThreadedSelfTest.class));
+        suite.addTest(new TestSuite(GridUriDeploymentMultiScannersSelfTest.class));
+        suite.addTest(new TestSuite(GridUriDeploymentConfigSelfTest.class));
+
+        suite.addTest(new TestSuite(GridFileDeploymentUndeploySelfTest.class));
+        suite.addTest(new TestSuite(GridHttpDeploymentSelfTest.class));
+
+        // GAR Ant task tests.
+        suite.addTest(IgniteToolsSelfTestSuite.suite());
+
+        suite.addTestSuite(GridTaskUriDeploymentDeadlockSelfTest.class);
+        suite.addTest(new TestSuite(GridP2PDisabledSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java
deleted file mode 100644
index 5456acd..0000000
--- a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites.bamboo;
-
-import junit.framework.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.p2p.*;
-import org.apache.ignite.testsuites.*;
-import org.apache.ignite.spi.deployment.uri.*;
-import org.apache.ignite.spi.deployment.uri.scanners.file.*;
-import org.apache.ignite.spi.deployment.uri.scanners.http.*;
-
-/**
- * Tests against {@link GridUriDeploymentSpi}.
- */
-public class GridUriDeploymentTestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("GridUriDeploymentSpi Test Suite");
-
-        suite.addTest(new TestSuite(GridUriDeploymentConfigSelfTest.class));
-        suite.addTest(new TestSuite(GridUriDeploymentSimpleSelfTest.class));
-        suite.addTest(new TestSuite(GridUriDeploymentClassloaderRegisterSelfTest.class));
-        suite.addTest(new TestSuite(GridUriDeploymentFileProcessorSelfTest.class));
-        suite.addTest(new TestSuite(GridUriDeploymentClassLoaderSelfTest.class));
-        suite.addTest(new TestSuite(GridUriDeploymentClassLoaderMultiThreadedSelfTest.class));
-        suite.addTest(new TestSuite(GridUriDeploymentMultiScannersSelfTest.class));
-        suite.addTest(new TestSuite(GridUriDeploymentConfigSelfTest.class));
-
-        suite.addTest(new TestSuite(GridFileDeploymentUndeploySelfTest.class));
-        suite.addTest(new TestSuite(GridHttpDeploymentSelfTest.class));
-
-        // GAR Ant task tests.
-        suite.addTest(GridToolsSelfTestSuite.suite());
-
-        suite.addTestSuite(GridTaskUriDeploymentDeadlockSelfTest.class);
-        suite.addTest(new TestSuite(GridP2PDisabledSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/web/src/test/java/org/apache/ignite/internal/websession/GridWebSessionSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/GridWebSessionSelfTestSuite.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/GridWebSessionSelfTestSuite.java
deleted file mode 100644
index b9cbbd0..0000000
--- a/modules/web/src/test/java/org/apache/ignite/internal/websession/GridWebSessionSelfTestSuite.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.websession;
-
-import junit.framework.*;
-
-/**
- * Test suite for web sessions caching functionality.
- */
-@SuppressWarnings("PublicInnerClass")
-public class GridWebSessionSelfTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Ignite Web Sessions Test Suite");
-
-        suite.addTestSuite(GridWebSessionSelfTest.class);
-        suite.addTestSuite(WebSessionTransactionalSelfTest.class);
-        suite.addTestSuite(WebSessionReplicatedSelfTest.class);
-
-        return suite;
-    }
-
-    /**
-     * Tests web sessions with TRANSACTIONAL cache.
-     */
-    public static class WebSessionTransactionalSelfTest extends GridWebSessionSelfTest {
-        /** {@inheritDoc} */
-        @Override protected String getCacheName() {
-            return "partitioned_tx";
-        }
-
-        /** {@inheritDoc} */
-        @Override public void testRestarts() throws Exception {
-            // TODO GG-8166, enable when fixed.
-        }
-    }
-
-    /**
-     * Tests web sessions with REPLICATED cache.
-     */
-    public static class WebSessionReplicatedSelfTest extends GridWebSessionSelfTest {
-        /** {@inheritDoc} */
-        @Override protected String getCacheName() {
-            return "replicated";
-        }
-    }
-}


Mime
View raw message