ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [7/7] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 10:11:26 GMT
# ignite-63


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08623ee2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08623ee2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08623ee2

Branch: refs/heads/ignite-63
Commit: 08623ee2aace9b2d9dd3c880b0670ca6841e0794
Parents: 11f8fdd
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Jan 23 13:10:45 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Jan 23 13:10:45 2015 +0300

----------------------------------------------------------------------
 .../testsuites/GridExamplesSelfTestSuite.java   |  74 -----
 .../testsuites/IgniteExamplesSelfTestSuite.java |  74 +++++
 .../s3/GridS3CheckpointManagerSelfTest.java     |   6 +-
 .../s3/GridS3CheckpointSpiSelfTest.java         |  10 +-
 .../GridS3CheckpointSpiStartStopSelfTest.java   |   6 +-
 .../s3/GridS3SessionCheckpointSelfTest.java     |   6 +-
 .../s3/GridTcpDiscoveryS3IpFinderSelfTest.java  |   6 +-
 .../ignite/testsuites/IgniteS3TestSuite.java    |  69 +++++
 .../testsuites/bamboo/GridS3TestSuite.java      |  69 -----
 .../router/testsuites/GridRouterTestSuite.java  |  41 ---
 .../testsuites/IgniteRouterTestSuite.java       |  41 +++
 .../client/suite/GridClientTestSuite.java       | 118 --------
 .../client/suite/IgniteClientTestSuite.java     | 118 ++++++++
 .../jdbc/suite/GridJdbcDriverTestSuite.java     |  45 ----
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |  45 ++++
 .../GridCacheInterceptorSelfTestSuite.java      |  56 ----
 .../IgniteCacheInterceptorSelfTestSuite.java    |  56 ++++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +-
 .../ignite/fs/GridGgfsEventsTestSuite.java      | 267 -------------------
 .../ignite/fs/IgniteFsEventsTestSuite.java      | 267 +++++++++++++++++++
 .../IgniteFsLinuxAndMacOSTestSuite.java         |  63 +++++
 .../testsuites/IgniteHadoopTestSuite.java       | 263 ++++++++++++++++++
 .../bamboo/GridGgfsLinuxAndMacOSTestSuite.java  |  63 -----
 .../testsuites/bamboo/GridHadoopTestSuite.java  | 263 ------------------
 .../testsuites/GridCacheQuerySelfTestSuite.java | 101 -------
 .../IgniteCacheQuerySelfTestSuite.java          | 101 +++++++
 .../IgniteH2IndexingSpiTestSuite.java           |  61 +++++
 .../bamboo/GridH2IndexingSpiTestSuite.java      |  61 -----
 .../ignite/testsuites/IgniteJclTestSuite.java   |  38 +++
 .../testsuites/bamboo/GridJclTestSuite.java     |  38 ---
 .../ignite/testsuites/IgniteJtaTestSuite.java   |  41 +++
 .../testsuites/bamboo/GridJtaTestSuite.java     |  41 ---
 .../ignite/testsuites/IgniteLog4jTestSuite.java |  40 +++
 .../testsuites/bamboo/GridLog4jTestSuite.java   |  40 ---
 .../testsuites/IgniteSchedulerTestSuite.java    |  38 +++
 .../bamboo/GridSchedulerTestSuite.java          |  38 ---
 .../testsuites/GridResourceSelfTestSuite.java   |  41 ---
 .../testsuites/IgniteResourceSelfTestSuite.java |  41 +++
 .../testsuites/IgniteSpringTestSuite.java       |  50 ++++
 .../testsuites/bamboo/GridSpringTestSuite.java  |  50 ----
 .../internal/GridStartStopRestartTestSuite.java |  39 ---
 .../IgniteStartStopRestartTestSuite.java        |  39 +++
 .../testsuites/GridToolsSelfTestSuite.java      |  38 ---
 .../testsuites/IgniteToolsSelfTestSuite.java    |  38 +++
 .../IgniteUriDeploymentTestSuite.java           |  59 ++++
 .../bamboo/GridUriDeploymentTestSuite.java      |  59 ----
 .../websession/GridWebSessionSelfTestSuite.java |  65 -----
 .../IgniteWebSessionSelfTestSuite.java          |  65 +++++
 48 files changed, 1625 insertions(+), 1625 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java
deleted file mode 100644
index 41be0d9..0000000
--- a/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java
+++ /dev/null
@@ -1,74 +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.examples.*;
-import org.apache.ignite.testframework.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-
-/**
- * Examples test suite.
- * <p>
- * Contains only Spring gridify examples tests.
- */
-public class GridExamplesSelfTestSuite extends TestSuite {
-    /**
-     * @return Suite.
-     * @throws Exception If failed.
-     */
-    public static TestSuite suite() throws Exception {
-        System.setProperty(GG_OVERRIDE_MCAST_GRP,
-            GridTestUtils.getNextMulticastGroup(GridExamplesSelfTestSuite.class));
-
-        TestSuite suite = new TestSuite("Ignite Examples Test Suite");
-
-        suite.addTest(new TestSuite(GridCacheExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridBasicExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuationExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuousMapperExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridDeploymentExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridEventsExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridLifecycleExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridMessagingExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridMemcacheRestExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridMonteCarloExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridTaskExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridSpringBeanExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridGgfsExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridCheckpointExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridHibernateL2CacheExampleSelfTest.class));
-        suite.addTest(new TestSuite(GridProjectionExampleSelfTest.class));
-
-        // Multi-node.
-        suite.addTest(new TestSuite(GridCacheExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridCacheStoreLoadDataExampleMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridBasicExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuationExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuousMapperExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridDeploymentExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridEventsExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridTaskExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridMemcacheRestExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridMonteCarloExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridHibernateL2CacheExampleMultiNodeSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
new file mode 100644
index 0000000..264433a
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
@@ -0,0 +1,74 @@
+/*
+ * 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.examples.*;
+import org.apache.ignite.testframework.*;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
+
+/**
+ * Examples test suite.
+ * <p>
+ * Contains only Spring gridify examples tests.
+ */
+public class IgniteExamplesSelfTestSuite extends TestSuite {
+    /**
+     * @return Suite.
+     * @throws Exception If failed.
+     */
+    public static TestSuite suite() throws Exception {
+        System.setProperty(GG_OVERRIDE_MCAST_GRP,
+            GridTestUtils.getNextMulticastGroup(IgniteExamplesSelfTestSuite.class));
+
+        TestSuite suite = new TestSuite("Ignite Examples Test Suite");
+
+        suite.addTest(new TestSuite(GridCacheExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridBasicExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridContinuationExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridContinuousMapperExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridDeploymentExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridEventsExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridLifecycleExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridMessagingExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridMemcacheRestExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridMonteCarloExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridTaskExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridSpringBeanExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridGgfsExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridCheckpointExamplesSelfTest.class));
+        suite.addTest(new TestSuite(GridHibernateL2CacheExampleSelfTest.class));
+        suite.addTest(new TestSuite(GridProjectionExampleSelfTest.class));
+
+        // Multi-node.
+        suite.addTest(new TestSuite(GridCacheExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheStoreLoadDataExampleMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridBasicExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridContinuationExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridContinuousMapperExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridDeploymentExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridEventsExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridTaskExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridMemcacheRestExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridMonteCarloExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridHibernateL2CacheExampleMultiNodeSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointManagerSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointManagerSelfTest.java
index 4e35dfd..ff1b046 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointManagerSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointManagerSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.spi.checkpoint.s3;
 import com.amazonaws.auth.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.managers.checkpoint.*;
-import org.apache.ignite.testsuites.bamboo.*;
+import org.apache.ignite.testsuites.*;
 
 /**
  * Checkpoint manager test using {@link GridS3CheckpointSpi}.
@@ -34,8 +34,8 @@ public class GridS3CheckpointManagerSelfTest extends GridCheckpointManagerAbstra
 
         GridS3CheckpointSpi spi = new GridS3CheckpointSpi();
 
-        AWSCredentials cred = new BasicAWSCredentials(GridS3TestSuite.getAccessKey(),
-            GridS3TestSuite.getSecretKey());
+        AWSCredentials cred = new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(),
+            IgniteS3TestSuite.getSecretKey());
 
         spi.setAwsCredentials(cred);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
index b98917b..0a8e7d4 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
@@ -24,7 +24,7 @@ import com.amazonaws.services.s3.model.*;
 import org.apache.ignite.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.testsuites.bamboo.*;
+import org.apache.ignite.testsuites.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.spi.*;
@@ -42,8 +42,8 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check
 
     /** {@inheritDoc} */
     @Override protected void spiConfigure(GridS3CheckpointSpi spi) throws Exception {
-        AWSCredentials cred = new BasicAWSCredentials(GridS3TestSuite.getAccessKey(),
-            GridS3TestSuite.getSecretKey());
+        AWSCredentials cred = new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(),
+            IgniteS3TestSuite.getSecretKey());
 
         spi.setAwsCredentials(cred);
 
@@ -56,8 +56,8 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check
      * @throws Exception If error.
      */
     @Override protected void afterSpiStopped() throws Exception {
-        AWSCredentials cred = new BasicAWSCredentials(GridS3TestSuite.getAccessKey(),
-            GridS3TestSuite.getSecretKey());
+        AWSCredentials cred = new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(),
+            IgniteS3TestSuite.getSecretKey());
 
         AmazonS3 s3 = new AmazonS3Client(cred);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiStartStopSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiStartStopSelfTest.java
index 4525bd6..b027ced 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiStartStopSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3CheckpointSpiStartStopSelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.spi.checkpoint.s3;
 
 import com.amazonaws.auth.*;
 import org.apache.ignite.spi.*;
-import org.apache.ignite.testsuites.bamboo.*;
+import org.apache.ignite.testsuites.*;
 import org.apache.ignite.testframework.junits.spi.*;
 
 /**
@@ -29,8 +29,8 @@ import org.apache.ignite.testframework.junits.spi.*;
 public class GridS3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<GridS3CheckpointSpi> {
     /** {@inheritDoc} */
     @Override protected void spiConfigure(GridS3CheckpointSpi spi) throws Exception {
-        AWSCredentials cred = new BasicAWSCredentials(GridS3TestSuite.getAccessKey(),
-            GridS3TestSuite.getSecretKey());
+        AWSCredentials cred = new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(),
+            IgniteS3TestSuite.getSecretKey());
 
         spi.setAwsCredentials(cred);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3SessionCheckpointSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3SessionCheckpointSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3SessionCheckpointSelfTest.java
index 13b0d5d..ae6bc56 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3SessionCheckpointSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/GridS3SessionCheckpointSelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.spi.checkpoint.s3;
 
 import com.amazonaws.auth.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.testsuites.bamboo.*;
+import org.apache.ignite.testsuites.*;
 import org.apache.ignite.session.*;
 
 /**
@@ -34,8 +34,8 @@ public class GridS3SessionCheckpointSelfTest extends GridSessionCheckpointAbstra
 
         GridS3CheckpointSpi spi = new GridS3CheckpointSpi();
 
-        AWSCredentials cred = new BasicAWSCredentials(GridS3TestSuite.getAccessKey(),
-            GridS3TestSuite.getSecretKey());
+        AWSCredentials cred = new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(),
+            IgniteS3TestSuite.getSecretKey());
 
         spi.setAwsCredentials(cred);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java
index c6b2252..e35a6e3 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3;
 import com.amazonaws.auth.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testsuites.bamboo.*;
+import org.apache.ignite.testsuites.*;
 
 import java.net.*;
 import java.util.*;
@@ -47,8 +47,8 @@ public class GridTcpDiscoveryS3IpFinderSelfTest
 
         assert finder.isShared() : "Ip finder should be shared by default.";
 
-        finder.setAwsCredentials(new BasicAWSCredentials(GridS3TestSuite.getAccessKey(),
-            GridS3TestSuite.getSecretKey()));
+        finder.setAwsCredentials(new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(),
+            IgniteS3TestSuite.getSecretKey()));
 
         // Bucket name should be unique for the host to parallel test run on one bucket.
         finder.setBucketName("ip-finder-test-bucket-" + InetAddress.getLocalHost().getAddress()[3]);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
new file mode 100644
index 0000000..2487052
--- /dev/null
+++ b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java
@@ -0,0 +1,69 @@
+/*
+ * 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.spi.checkpoint.s3.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.*;
+
+/**
+ * S3 integration tests.
+ */
+public class IgniteS3TestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("S3 Integration Test Suite");
+
+        // Checkpoint SPI.
+        suite.addTest(new TestSuite(GridS3CheckpointSpiConfigSelfTest.class));
+        suite.addTest(new TestSuite(GridS3CheckpointSpiSelfTest.class));
+        suite.addTest(new TestSuite(GridS3CheckpointSpiStartStopSelfTest.class));
+        suite.addTest(new TestSuite(GridS3CheckpointManagerSelfTest.class));
+        suite.addTest(new TestSuite(GridS3SessionCheckpointSelfTest.class));
+
+        // S3 IP finder.
+        suite.addTest(new TestSuite(GridTcpDiscoveryS3IpFinderSelfTest.class));
+
+        return suite;
+    }
+
+    /**
+     * @return Access key.
+     */
+    public static String getAccessKey() {
+        String key = System.getenv("test.amazon.access.key");
+
+        assert key != null : "Environment variable 'test.amazon.access.key' is not set";
+
+        return key;
+    }
+
+    /**
+     * @return Access key.
+     */
+    public static String getSecretKey() {
+        String key = System.getenv("test.amazon.secret.key");
+
+        assert key != null : "Environment variable 'test.amazon.secret.key' is not set";
+
+        return key;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/aws/src/test/java/org/apache/ignite/testsuites/bamboo/GridS3TestSuite.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/testsuites/bamboo/GridS3TestSuite.java b/modules/aws/src/test/java/org/apache/ignite/testsuites/bamboo/GridS3TestSuite.java
deleted file mode 100644
index f35e9cf..0000000
--- a/modules/aws/src/test/java/org/apache/ignite/testsuites/bamboo/GridS3TestSuite.java
+++ /dev/null
@@ -1,69 +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.spi.checkpoint.s3.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.*;
-
-/**
- * S3 integration tests.
- */
-public class GridS3TestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("S3 Integration Test Suite");
-
-        // Checkpoint SPI.
-        suite.addTest(new TestSuite(GridS3CheckpointSpiConfigSelfTest.class));
-        suite.addTest(new TestSuite(GridS3CheckpointSpiSelfTest.class));
-        suite.addTest(new TestSuite(GridS3CheckpointSpiStartStopSelfTest.class));
-        suite.addTest(new TestSuite(GridS3CheckpointManagerSelfTest.class));
-        suite.addTest(new TestSuite(GridS3SessionCheckpointSelfTest.class));
-
-        // S3 IP finder.
-        suite.addTest(new TestSuite(GridTcpDiscoveryS3IpFinderSelfTest.class));
-
-        return suite;
-    }
-
-    /**
-     * @return Access key.
-     */
-    public static String getAccessKey() {
-        String key = System.getenv("test.amazon.access.key");
-
-        assert key != null : "Environment variable 'test.amazon.access.key' is not set";
-
-        return key;
-    }
-
-    /**
-     * @return Access key.
-     */
-    public static String getSecretKey() {
-        String key = System.getenv("test.amazon.secret.key");
-
-        assert key != null : "Environment variable 'test.amazon.secret.key' is not set";
-
-        return key;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/GridRouterTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/GridRouterTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/GridRouterTestSuite.java
deleted file mode 100644
index c460f2f..0000000
--- a/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/GridRouterTestSuite.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.client.router.testsuites;
-
-import junit.framework.*;
-import org.apache.ignite.client.router.*;
-
-/**
- * Test suite for router tests.
- */
-public class GridRouterTestSuite extends TestSuite {
-    /**
-     * @return Suite that contains all router tests.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Gridgain Router Test Suite");
-
-        suite.addTest(new TestSuite(GridRouterFactorySelfTest.class));
-        suite.addTest(new TestSuite(GridTcpRouterSelfTest.class));
-        suite.addTest(new TestSuite(GridTcpSslRouterSelfTest.class));
-        suite.addTest(new TestSuite(GridTcpRouterMultiNodeSelfTest.class));
-//        suite.addTest(new TestSuite(GridClientFailedInitSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/IgniteRouterTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/IgniteRouterTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/IgniteRouterTestSuite.java
new file mode 100644
index 0000000..cc661e4
--- /dev/null
+++ b/modules/clients/src/test/java/org/apache/ignite/client/router/testsuites/IgniteRouterTestSuite.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.client.router.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.client.router.*;
+
+/**
+ * Test suite for router tests.
+ */
+public class IgniteRouterTestSuite extends TestSuite {
+    /**
+     * @return Suite that contains all router tests.
+     */
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite("Ignite Router Test Suite");
+
+        suite.addTest(new TestSuite(GridRouterFactorySelfTest.class));
+        suite.addTest(new TestSuite(GridTcpRouterSelfTest.class));
+        suite.addTest(new TestSuite(GridTcpSslRouterSelfTest.class));
+        suite.addTest(new TestSuite(GridTcpRouterMultiNodeSelfTest.class));
+//        suite.addTest(new TestSuite(GridClientFailedInitSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/clients/src/test/java/org/apache/ignite/client/suite/GridClientTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/suite/GridClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/client/suite/GridClientTestSuite.java
deleted file mode 100644
index 628a2d8..0000000
--- a/modules/clients/src/test/java/org/apache/ignite/client/suite/GridClientTestSuite.java
+++ /dev/null
@@ -1,118 +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.client.suite;
-
-import junit.framework.*;
-import org.apache.ignite.client.*;
-import org.apache.ignite.client.impl.*;
-import org.apache.ignite.client.integration.*;
-import org.apache.ignite.client.router.*;
-import org.apache.ignite.client.util.*;
-import org.apache.ignite.internal.processors.rest.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
-
-/**
- * Test suite includes all test that concern REST processors.
- */
-public class GridClientTestSuite extends TestSuite {
-    /**
-     * @return Suite that contains all tests for REST.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Gridgain Clients Test Suite");
-
-        suite.addTest(new TestSuite(GridRouterFactorySelfTest.class));
-
-        // Parser standalone test.
-        suite.addTest(new TestSuite(GridTcpRestParserSelfTest.class));
-
-        // Test memcache protocol with custom test client.
-        suite.addTest(new TestSuite(GridRestMemcacheProtocolSelfTest.class));
-
-        // Test custom binary protocol with test client.
-        suite.addTest(new TestSuite(GridRestBinaryProtocolSelfTest.class));
-
-        // Test jetty rest processor
-        suite.addTest(new TestSuite(GridJettyRestProcessorSignedSelfTest.class));
-        suite.addTest(new TestSuite(GridJettyRestProcessorUnsignedSelfTest.class));
-
-        // Test TCP rest processor with original memcache client.
-        suite.addTest(new TestSuite(GridClientMemcachedProtocolSelfTest.class));
-
-        suite.addTest(new TestSuite(GridRestProcessorStartSelfTest.class));
-
-        // Test cache flag conversion.
-        suite.addTest(new TestSuite(GridClientCacheFlagsCodecTest.class));
-
-        // Test multi-start.
-        suite.addTest(new TestSuite(GridRestProcessorMultiStartSelfTest.class));
-
-        // Test clients.
-        suite.addTest(new TestSuite(GridClientDataImplSelfTest.class));
-        suite.addTest(new TestSuite(GridClientComputeImplSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpDirectSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpSslSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpSslDirectSelfTest.class));
-
-        // Test client with many nodes.
-        suite.addTest(new TestSuite(GridClientTcpMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpDirectMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpSslMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpSslDirectMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpUnreachableMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridClientPreferDirectSelfTest.class));
-
-        // Test client with many nodes and in multithreaded scenarios
-        suite.addTest(new TestSuite(GridClientTcpMultiThreadedSelfTest.class));
-        suite.addTest(new TestSuite(GridClientTcpSslMultiThreadedSelfTest.class));
-
-        // Test client authentication.
-        suite.addTest(new TestSuite(GridClientTcpSslAuthenticationSelfTest.class));
-
-        suite.addTest(new TestSuite(GridClientTcpConnectivitySelfTest.class));
-        suite.addTest(new TestSuite(GridClientReconnectionSelfTest.class));
-
-        // Rest task command handler test.
-        suite.addTest(new TestSuite(GridTaskCommandHandlerSelfTest.class));
-
-        // Default cache only test.
-        suite.addTest(new TestSuite(GridClientDefaultCacheSelfTest.class));
-
-        suite.addTestSuite(GridClientFutureAdapterSelfTest.class);
-        suite.addTestSuite(GridClientPartitionAffinitySelfTest.class);
-        suite.addTestSuite(GridClientPropertiesConfigurationSelfTest.class);
-        suite.addTestSuite(GridClientConsistentHashSelfTest.class);
-        suite.addTestSuite(GridClientJavaHasherSelfTest.class);
-
-        suite.addTestSuite(GridClientByteUtilsTest.class);
-
-        suite.addTest(new TestSuite(GridClientTopologyCacheSelfTest.class));
-
-        // Router tests.
-        suite.addTest(new TestSuite(GridTcpRouterSelfTest.class));
-        suite.addTest(new TestSuite(GridTcpSslRouterSelfTest.class));
-        suite.addTest(new TestSuite(GridTcpRouterMultiNodeSelfTest.class));
-
-        suite.addTest(new TestSuite(GridClientFailedInitSelfTest.class));
-
-        suite.addTest(new TestSuite(GridClientTcpTaskExecutionAfterTopologyRestartSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java
new file mode 100644
index 0000000..ab3cca1
--- /dev/null
+++ b/modules/clients/src/test/java/org/apache/ignite/client/suite/IgniteClientTestSuite.java
@@ -0,0 +1,118 @@
+/*
+ * 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.client.suite;
+
+import junit.framework.*;
+import org.apache.ignite.client.*;
+import org.apache.ignite.client.impl.*;
+import org.apache.ignite.client.integration.*;
+import org.apache.ignite.client.router.*;
+import org.apache.ignite.client.util.*;
+import org.apache.ignite.internal.processors.rest.*;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
+
+/**
+ * Test suite includes all test that concern REST processors.
+ */
+public class IgniteClientTestSuite extends TestSuite {
+    /**
+     * @return Suite that contains all tests for REST.
+     */
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite("Ignite Clients Test Suite");
+
+        suite.addTest(new TestSuite(GridRouterFactorySelfTest.class));
+
+        // Parser standalone test.
+        suite.addTest(new TestSuite(GridTcpRestParserSelfTest.class));
+
+        // Test memcache protocol with custom test client.
+        suite.addTest(new TestSuite(GridRestMemcacheProtocolSelfTest.class));
+
+        // Test custom binary protocol with test client.
+        suite.addTest(new TestSuite(GridRestBinaryProtocolSelfTest.class));
+
+        // Test jetty rest processor
+        suite.addTest(new TestSuite(GridJettyRestProcessorSignedSelfTest.class));
+        suite.addTest(new TestSuite(GridJettyRestProcessorUnsignedSelfTest.class));
+
+        // Test TCP rest processor with original memcache client.
+        suite.addTest(new TestSuite(GridClientMemcachedProtocolSelfTest.class));
+
+        suite.addTest(new TestSuite(GridRestProcessorStartSelfTest.class));
+
+        // Test cache flag conversion.
+        suite.addTest(new TestSuite(GridClientCacheFlagsCodecTest.class));
+
+        // Test multi-start.
+        suite.addTest(new TestSuite(GridRestProcessorMultiStartSelfTest.class));
+
+        // Test clients.
+        suite.addTest(new TestSuite(GridClientDataImplSelfTest.class));
+        suite.addTest(new TestSuite(GridClientComputeImplSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpDirectSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpSslSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpSslDirectSelfTest.class));
+
+        // Test client with many nodes.
+        suite.addTest(new TestSuite(GridClientTcpMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpDirectMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpSslMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpSslDirectMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpUnreachableMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridClientPreferDirectSelfTest.class));
+
+        // Test client with many nodes and in multithreaded scenarios
+        suite.addTest(new TestSuite(GridClientTcpMultiThreadedSelfTest.class));
+        suite.addTest(new TestSuite(GridClientTcpSslMultiThreadedSelfTest.class));
+
+        // Test client authentication.
+        suite.addTest(new TestSuite(GridClientTcpSslAuthenticationSelfTest.class));
+
+        suite.addTest(new TestSuite(GridClientTcpConnectivitySelfTest.class));
+        suite.addTest(new TestSuite(GridClientReconnectionSelfTest.class));
+
+        // Rest task command handler test.
+        suite.addTest(new TestSuite(GridTaskCommandHandlerSelfTest.class));
+
+        // Default cache only test.
+        suite.addTest(new TestSuite(GridClientDefaultCacheSelfTest.class));
+
+        suite.addTestSuite(GridClientFutureAdapterSelfTest.class);
+        suite.addTestSuite(GridClientPartitionAffinitySelfTest.class);
+        suite.addTestSuite(GridClientPropertiesConfigurationSelfTest.class);
+        suite.addTestSuite(GridClientConsistentHashSelfTest.class);
+        suite.addTestSuite(GridClientJavaHasherSelfTest.class);
+
+        suite.addTestSuite(GridClientByteUtilsTest.class);
+
+        suite.addTest(new TestSuite(GridClientTopologyCacheSelfTest.class));
+
+        // Router tests.
+        suite.addTest(new TestSuite(GridTcpRouterSelfTest.class));
+        suite.addTest(new TestSuite(GridTcpSslRouterSelfTest.class));
+        suite.addTest(new TestSuite(GridTcpRouterMultiNodeSelfTest.class));
+
+        suite.addTest(new TestSuite(GridClientFailedInitSelfTest.class));
+
+        suite.addTest(new TestSuite(GridClientTcpTaskExecutionAfterTopologyRestartSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/GridJdbcDriverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/GridJdbcDriverTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/GridJdbcDriverTestSuite.java
deleted file mode 100644
index d519ea6..0000000
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/GridJdbcDriverTestSuite.java
+++ /dev/null
@@ -1,45 +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.jdbc.suite;
-
-import junit.framework.*;
-import org.apache.ignite.jdbc.*;
-
-/**
- * JDBC driver test suite.
- */
-public class GridJdbcDriverTestSuite extends TestSuite {
-    /**
-     * @return JDBC Driver Test Suite.
-     * @throws Exception In case of error.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Gridgain JDBC Driver Test Suite");
-
-        suite.addTest(new TestSuite(GridJdbcConnectionSelfTest.class));
-        suite.addTest(new TestSuite(GridJdbcStatementSelfTest.class));
-        suite.addTest(new TestSuite(GridJdbcPreparedStatementSelfTest.class));
-        suite.addTest(new TestSuite(GridJdbcResultSetSelfTest.class));
-        suite.addTest(new TestSuite(GridJdbcComplexQuerySelfTest.class));
-        suite.addTest(new TestSuite(GridJdbcMetadataSelfTest.class));
-        suite.addTest(new TestSuite(GridJdbcEmptyCacheSelfTest.class));
-        suite.addTest(new TestSuite(GridJdbcLocalCachesSelfTest.class));
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
new file mode 100644
index 0000000..68fca02
--- /dev/null
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
@@ -0,0 +1,45 @@
+/*
+ * 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.jdbc.suite;
+
+import junit.framework.*;
+import org.apache.ignite.jdbc.*;
+
+/**
+ * JDBC driver test suite.
+ */
+public class IgniteJdbcDriverTestSuite extends TestSuite {
+    /**
+     * @return JDBC Driver Test Suite.
+     * @throws Exception In case of error.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("Ignite JDBC Driver Test Suite");
+
+        suite.addTest(new TestSuite(GridJdbcConnectionSelfTest.class));
+        suite.addTest(new TestSuite(GridJdbcStatementSelfTest.class));
+        suite.addTest(new TestSuite(GridJdbcPreparedStatementSelfTest.class));
+        suite.addTest(new TestSuite(GridJdbcResultSetSelfTest.class));
+        suite.addTest(new TestSuite(GridJdbcComplexQuerySelfTest.class));
+        suite.addTest(new TestSuite(GridJdbcMetadataSelfTest.class));
+        suite.addTest(new TestSuite(GridJdbcEmptyCacheSelfTest.class));
+        suite.addTest(new TestSuite(GridJdbcLocalCachesSelfTest.class));
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTestSuite.java
deleted file mode 100644
index da18646..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorSelfTestSuite.java
+++ /dev/null
@@ -1,56 +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.processors.cache;
-
-import junit.framework.*;
-
-/**
- * Cache interceptor suite.
- */
-public class GridCacheInterceptorSelfTestSuite extends TestSuite {
-    /**
-     * @return Cache API test suite.
-     * @throws Exception If failed.
-     */
-    public static TestSuite suite() throws Exception {
-        TestSuite suite = new TestSuite("Gridgain CacheInterceptor Test Suite");
-
-        suite.addTestSuite(GridCacheInterceptorLocalSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorLocalWithStoreSelfTest.class);
-
-        suite.addTestSuite(GridCacheInterceptorLocalAtomicSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorLocalAtomicWithStoreSelfTest.class);
-
-        suite.addTestSuite(GridCacheInterceptorAtomicSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorAtomicNearEnabledSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorAtomicWithStoreSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.class);
-
-        suite.addTestSuite(GridCacheInterceptorAtomicReplicatedSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.class);
-
-        suite.addTestSuite(GridCacheInterceptorSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorNearEnabledSelfTest.class);
-//        suite.addTestSuite(GridCacheInterceptorWithStoreSelfTest.class); TODO GG-9141
-        suite.addTestSuite(GridCacheInterceptorReplicatedSelfTest.class);
-        suite.addTestSuite(GridCacheInterceptorReplicatedWithStoreSelfTest.class);
-
-        return suite;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
new file mode 100644
index 0000000..87b9e4b
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
@@ -0,0 +1,56 @@
+/*
+ * 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.processors.cache;
+
+import junit.framework.*;
+
+/**
+ * Cache interceptor suite.
+ */
+public class IgniteCacheInterceptorSelfTestSuite extends TestSuite {
+    /**
+     * @return Cache API test suite.
+     * @throws Exception If failed.
+     */
+    public static TestSuite suite() throws Exception {
+        TestSuite suite = new TestSuite("CacheInterceptor Test Suite");
+
+        suite.addTestSuite(GridCacheInterceptorLocalSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorLocalWithStoreSelfTest.class);
+
+        suite.addTestSuite(GridCacheInterceptorLocalAtomicSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorLocalAtomicWithStoreSelfTest.class);
+
+        suite.addTestSuite(GridCacheInterceptorAtomicSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorAtomicNearEnabledSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorAtomicWithStoreSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.class);
+
+        suite.addTestSuite(GridCacheInterceptorAtomicReplicatedSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.class);
+
+        suite.addTestSuite(GridCacheInterceptorSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorNearEnabledSelfTest.class);
+//        suite.addTestSuite(GridCacheInterceptorWithStoreSelfTest.class); TODO GG-9141
+        suite.addTestSuite(GridCacheInterceptorReplicatedSelfTest.class);
+        suite.addTestSuite(GridCacheInterceptorReplicatedWithStoreSelfTest.class);
+
+        return suite;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index b3503cf..c49d113 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -324,7 +324,7 @@ public class IgniteCacheTestSuite extends TestSuite {
         suite.addTest(IgniteCacheTxRecoverySelfTestSuite.suite());
 
         // Cache interceptor tests.
-        suite.addTest(GridCacheInterceptorSelfTestSuite.suite());
+        suite.addTest(IgniteCacheInterceptorSelfTestSuite.suite());
 
         // Multi node update.
         suite.addTestSuite(GridCacheMultinodeUpdateSelfTest.class);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsEventsTestSuite.java
deleted file mode 100644
index 78c4ca3..0000000
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsEventsTestSuite.java
+++ /dev/null
@@ -1,267 +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.fs;
-
-import junit.framework.*;
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.fs.hadoop.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.fs.IgniteFsMode.*;
-
-/**
- * Test suite for GGFS event tests.
- */
-@SuppressWarnings("PublicInnerClass")
-public class GridGgfsEventsTestSuite extends TestSuite {
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
-        GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
-
-        TestSuite suite = new TestSuite("Gridgain GGFS Events Test Suite");
-
-        suite.addTest(new TestSuite(ldr.loadClass(ShmemPrivate.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(ShmemDualSync.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(ShmemDualAsync.class.getName())));
-
-        suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName())));
-
-        return suite;
-    }
-
-    /**
-     * @return Test suite with only tests that are supported on all platforms.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suiteNoarchOnly() throws Exception {
-        GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
-
-        TestSuite suite = new TestSuite("Gridgain GGFS Events Test Suite Noarch Only");
-
-        suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName())));
-        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName())));
-
-        return suite;
-    }
-
-    /**
-     * Shared memory IPC in PRIVATE mode.
-     */
-    public static class ShmemPrivate extends GridGgfsEventsAbstractSelfTest {
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
-                put("type", "shmem");
-                put("port", String.valueOf(GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + 1));
-            }});
-
-            return ggfsCfg;
-        }
-    }
-
-    /**
-     * Loopback socket IPS in PRIVATE mode.
-     */
-    public static class LoopbackPrivate extends GridGgfsEventsAbstractSelfTest {
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
-                put("type", "tcp");
-                put("port", String.valueOf(GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + 1));
-            }});
-
-            return ggfsCfg;
-        }
-    }
-
-    /**
-     * Base class for all GGFS tests with primary and secondary file system.
-     */
-    public abstract static class PrimarySecondaryTest extends GridGgfsEventsAbstractSelfTest {
-        /** Secondary file system. */
-        private static IgniteFs ggfsSec;
-
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper(
-                "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/",
-                "modules/core/src/test/config/hadoop/core-site-secondary.xml"));
-
-            return ggfsCfg;
-        }
-
-        /**
-         * @return GGFS configuration for secondary file system.
-         */
-        protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setName("ggfs-secondary");
-            ggfsCfg.setDefaultMode(PRIMARY);
-            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>(){{
-                put("type", "tcp");
-                put("port", "11500");
-            }});
-
-            return ggfsCfg;
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void beforeTestsStarted() throws Exception {
-            ggfsSec = startSecondary();
-
-            super.beforeTestsStarted();
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void afterTestsStopped() throws Exception {
-            super.afterTestsStopped();
-
-            G.stopAll(true);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void afterTest() throws Exception {
-            super.afterTest();
-
-            // Clean up secondary file system.
-            ggfsSec.format();
-        }
-
-        /**
-         * Start a grid with the secondary file system.
-         *
-         * @return Secondary file system handle.
-         * @throws Exception If failed.
-         */
-        @Nullable private IgniteFs startSecondary() throws Exception {
-            IgniteConfiguration cfg = getConfiguration("grid-secondary", getSecondaryGgfsConfiguration());
-
-            cfg.setLocalHost("127.0.0.1");
-            cfg.setPeerClassLoadingEnabled(false);
-
-            Ignite secG = G.start(cfg);
-
-            return secG.fileSystem("ggfs-secondary");
-        }
-    }
-
-    /**
-     * Shared memory IPC in DUAL_SYNC mode.
-     */
-    public static class ShmemDualSync extends PrimarySecondaryTest {
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setDefaultMode(DUAL_SYNC);
-
-            return ggfsCfg;
-        }
-    }
-
-    /**
-     * Shared memory IPC in DUAL_SYNC mode.
-     */
-    public static class ShmemDualAsync extends PrimarySecondaryTest {
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setDefaultMode(DUAL_ASYNC);
-
-            return ggfsCfg;
-        }
-    }
-
-    /**
-     * Loopback socket IPC with secondary file system.
-     */
-    public abstract static class LoopbackPrimarySecondaryTest extends PrimarySecondaryTest {
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper(
-                "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/",
-                "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml"));
-
-            return ggfsCfg;
-        }
-
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getSecondaryGgfsConfiguration();
-
-            ggfsCfg.setName("ggfs-secondary");
-            ggfsCfg.setDefaultMode(PRIMARY);
-            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
-                put("type", "tcp");
-                put("port", "11500");
-            }});
-
-            return ggfsCfg;
-        }
-    }
-
-    /**
-     * Loopback IPC in DUAL_SYNC mode.
-     */
-    public static class LoopbackDualSync extends LoopbackPrimarySecondaryTest {
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setDefaultMode(DUAL_SYNC);
-
-            return ggfsCfg;
-        }
-    }
-
-    /**
-     * Loopback socket IPC in DUAL_ASYNC mode.
-     */
-    public static class LoopbackDualAsync extends LoopbackPrimarySecondaryTest {
-        /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
-
-            ggfsCfg.setDefaultMode(DUAL_ASYNC);
-
-            return ggfsCfg;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/hadoop/src/test/java/org/apache/ignite/fs/IgniteFsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/IgniteFsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/IgniteFsEventsTestSuite.java
new file mode 100644
index 0000000..8ad8a43
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/IgniteFsEventsTestSuite.java
@@ -0,0 +1,267 @@
+/*
+ * 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.fs;
+
+import junit.framework.*;
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.fs.hadoop.*;
+import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.ipc.shmem.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+import static org.apache.ignite.fs.IgniteFsMode.*;
+
+/**
+ * Test suite for GGFS event tests.
+ */
+@SuppressWarnings("PublicInnerClass")
+public class IgniteFsEventsTestSuite extends TestSuite {
+    /**
+     * @return Test suite.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suite() throws Exception {
+        GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
+
+        TestSuite suite = new TestSuite("Ignite FS Events Test Suite");
+
+        suite.addTest(new TestSuite(ldr.loadClass(ShmemPrivate.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(ShmemDualSync.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(ShmemDualAsync.class.getName())));
+
+        suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName())));
+
+        return suite;
+    }
+
+    /**
+     * @return Test suite with only tests that are supported on all platforms.
+     * @throws Exception Thrown in case of the failure.
+     */
+    public static TestSuite suiteNoarchOnly() throws Exception {
+        GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
+
+        TestSuite suite = new TestSuite("Gridgain GGFS Events Test Suite Noarch Only");
+
+        suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName())));
+        suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName())));
+
+        return suite;
+    }
+
+    /**
+     * Shared memory IPC in PRIVATE mode.
+     */
+    public static class ShmemPrivate extends GridGgfsEventsAbstractSelfTest {
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
+                put("type", "shmem");
+                put("port", String.valueOf(GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + 1));
+            }});
+
+            return ggfsCfg;
+        }
+    }
+
+    /**
+     * Loopback socket IPS in PRIVATE mode.
+     */
+    public static class LoopbackPrivate extends GridGgfsEventsAbstractSelfTest {
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
+                put("type", "tcp");
+                put("port", String.valueOf(GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + 1));
+            }});
+
+            return ggfsCfg;
+        }
+    }
+
+    /**
+     * Base class for all GGFS tests with primary and secondary file system.
+     */
+    public abstract static class PrimarySecondaryTest extends GridGgfsEventsAbstractSelfTest {
+        /** Secondary file system. */
+        private static IgniteFs ggfsSec;
+
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper(
+                "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/",
+                "modules/core/src/test/config/hadoop/core-site-secondary.xml"));
+
+            return ggfsCfg;
+        }
+
+        /**
+         * @return GGFS configuration for secondary file system.
+         */
+        protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setName("ggfs-secondary");
+            ggfsCfg.setDefaultMode(PRIMARY);
+            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>(){{
+                put("type", "tcp");
+                put("port", "11500");
+            }});
+
+            return ggfsCfg;
+        }
+
+        /** {@inheritDoc} */
+        @Override protected void beforeTestsStarted() throws Exception {
+            ggfsSec = startSecondary();
+
+            super.beforeTestsStarted();
+        }
+
+        /** {@inheritDoc} */
+        @Override protected void afterTestsStopped() throws Exception {
+            super.afterTestsStopped();
+
+            G.stopAll(true);
+        }
+
+        /** {@inheritDoc} */
+        @Override protected void afterTest() throws Exception {
+            super.afterTest();
+
+            // Clean up secondary file system.
+            ggfsSec.format();
+        }
+
+        /**
+         * Start a grid with the secondary file system.
+         *
+         * @return Secondary file system handle.
+         * @throws Exception If failed.
+         */
+        @Nullable private IgniteFs startSecondary() throws Exception {
+            IgniteConfiguration cfg = getConfiguration("grid-secondary", getSecondaryGgfsConfiguration());
+
+            cfg.setLocalHost("127.0.0.1");
+            cfg.setPeerClassLoadingEnabled(false);
+
+            Ignite secG = G.start(cfg);
+
+            return secG.fileSystem("ggfs-secondary");
+        }
+    }
+
+    /**
+     * Shared memory IPC in DUAL_SYNC mode.
+     */
+    public static class ShmemDualSync extends PrimarySecondaryTest {
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setDefaultMode(DUAL_SYNC);
+
+            return ggfsCfg;
+        }
+    }
+
+    /**
+     * Shared memory IPC in DUAL_SYNC mode.
+     */
+    public static class ShmemDualAsync extends PrimarySecondaryTest {
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setDefaultMode(DUAL_ASYNC);
+
+            return ggfsCfg;
+        }
+    }
+
+    /**
+     * Loopback socket IPC with secondary file system.
+     */
+    public abstract static class LoopbackPrimarySecondaryTest extends PrimarySecondaryTest {
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper(
+                "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/",
+                "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml"));
+
+            return ggfsCfg;
+        }
+
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getSecondaryGgfsConfiguration();
+
+            ggfsCfg.setName("ggfs-secondary");
+            ggfsCfg.setDefaultMode(PRIMARY);
+            ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
+                put("type", "tcp");
+                put("port", "11500");
+            }});
+
+            return ggfsCfg;
+        }
+    }
+
+    /**
+     * Loopback IPC in DUAL_SYNC mode.
+     */
+    public static class LoopbackDualSync extends LoopbackPrimarySecondaryTest {
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setDefaultMode(DUAL_SYNC);
+
+            return ggfsCfg;
+        }
+    }
+
+    /**
+     * Loopback socket IPC in DUAL_ASYNC mode.
+     */
+    public static class LoopbackDualAsync extends LoopbackPrimarySecondaryTest {
+        /** {@inheritDoc} */
+        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+
+            ggfsCfg.setDefaultMode(DUAL_ASYNC);
+
+            return ggfsCfg;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08623ee2/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java
new file mode 100644
index 0000000..640932d
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java
@@ -0,0 +1,63 @@
+/*
+ * 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.fs.*;
+import org.apache.ignite.internal.processors.fs.*;
+import org.apache.ignite.internal.processors.hadoop.*;
+
+import static org.apache.ignite.testsuites.IgniteHadoopTestSuite.*;
+
+/**
+ * Test suite for Hadoop file system over GridGain cache.
+ * Contains tests which works on Linux and Mac OS platform only.
+ */
+public class IgniteFsLinuxAndMacOSTestSuite 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(IgniteFsEventsTestSuite.suite());
+
+        return suite;
+    }
+}


Mime
View raw message