Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ignite.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sboikov@apache.org
To: commits@ignite.incubator.apache.org
Date: Mon, 22 Jun 2015 17:02:19 -0000
Message-Id: <37a872ebb0674815ace99ae654afd82e@git.apache.org>
Subject: [1/6] incubator-ignite git commit: # ignite-648: move isMultiJvm

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-648 63e98328c -> 470e48b54


# ignite-648: move isMultiJvm


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

Branch: refs/heads/ignite-648
Commit: 2e8c0fef91f05aa6ad61509aee35b4a151ce1264
Parents: 63e9832
Author: ashutak <ashutak@gridgain.com>
Authored: Mon Jun 22 13:24:49 2015 +0300
Committer: ashutak <ashutak@gridgain.com>
Committed: Mon Jun 22 13:24:49 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractSelfTest.java        | 25 --------------------
 .../IpcSharedMemoryNativeLoaderSelfTest.java    |  1 +
 .../testframework/junits/GridAbstractTest.java  | 25 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e8c0fef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index f129dd0..b6e56d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -358,31 +358,6 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Gets flag whether nodes will run in one jvm or in separate jvms.
-     *
-     * @return <code>True</code> to run nodes in separate jvms.
-     */
-    protected boolean isMultiJvm() {
-        return false;
-    }
-
-    /**
-     * @param gridName Grid name.
-     * @return <code>True</code> if test was run in multy jvm mode and grid at another jvm.
-     */
-    protected boolean isMultiJvmAndNodeIsRemote(String gridName) {
-        return isMultiJvm() && !gridName.endsWith("0");
-    }
-
-    /**
-     * @param idx Grid index.
-     * @return <code>True</code> if test was run in multy jvm mode and grid at another jvm.
-     */
-    protected boolean isMultiJvmAndNodeIsRemote(int idx) {
-        return isMultiJvm() && idx != 0;
-    }
-
-    /**
      * @param idx Index of grid.
      * @return Cache context.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e8c0fef/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
index 6a72698..65fa543 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
@@ -28,6 +28,7 @@ import java.util.*;
  * Test shared memory native loader.
  */
 public class IpcSharedMemoryNativeLoaderSelfTest extends TestCase {
+
     /**
      * Test {@link IpcSharedMemoryNativeLoader#load()} in case, when native library path was
      * already loaded, but corrupted.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e8c0fef/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 9c42920..fb5ca51 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1286,6 +1286,31 @@ public abstract class GridAbstractTest extends TestCase {
     }
 
     /**
+     * Gets flag whether nodes will run in one jvm or in separate jvms.
+     *
+     * @return <code>True</code> to run nodes in separate jvms.
+     */
+    protected boolean isMultiJvm() {
+        return false;
+    }
+
+    /**
+     * @param gridName Grid name.
+     * @return <code>True</code> if test was run in multy jvm mode and grid at another jvm.
+     */
+    protected boolean isMultiJvmAndNodeIsRemote(String gridName) {
+        return isMultiJvm() && !gridName.endsWith("0");
+    }
+
+    /**
+     * @param idx Grid index.
+     * @return <code>True</code> if test was run in multy jvm mode and grid at another jvm.
+     */
+    protected boolean isMultiJvmAndNodeIsRemote(int idx) {
+        return isMultiJvm() && idx != 0;
+    }
+
+    /**
      * @return Test counters.
      */
     protected synchronized TestCounters getTestCounters() throws IgniteCheckedException {