# ignite-164 : gridgain->ignite renaming tests [core]
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3efa8ae0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3efa8ae0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3efa8ae0 Branch: refs/heads/ignite-164v2 Commit: 3efa8ae052d1a4f2a86735f215de621d2501d108 Parents: d531496 Author: Artem Shutak <[email protected]> Authored: Fri Feb 6 17:06:40 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Fri Feb 6 17:06:40 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +- .../internal/processors/fs/GridGgfsAbstractSelfTest.java | 6 +++--- .../internal/processors/fs/GridGgfsDualAbstractSelfTest.java | 2 +- .../java/org/apache/ignite/internal/GridFactorySelfTest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3efa8ae0/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 4101f93..7b27bd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -855,7 +855,7 @@ public class IgnitionEx { if (name == null) throw new IgniteCheckedException("Default grid instance has already been started."); else - throw new IgniteCheckedException("Grid instance with this name has already been started: " + name); + throw new IgniteCheckedException("Ignite instance with this name has already been started: " + name); } if (startCtx.config().getWarmupClosure() != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3efa8ae0/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index efe6d17..ac0aba0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -150,11 +150,11 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes for (int i = 0; i < chunk.length; i++) chunk[i] = (byte)i; - Ignite igniteSecondary = startGridWithGgfs("grid-secondary", "ggfs-secondary", PRIMARY, null, SECONDARY_REST_CFG); + Ignite igniteSecondary = startGridWithGgfs("ignite-secondary", "ignitefs-secondary", PRIMARY, null, SECONDARY_REST_CFG); - ggfsSecondary = (GridGgfsImpl) igniteSecondary.fileSystem("ggfs-secondary"); + ggfsSecondary = (GridGgfsImpl) igniteSecondary.fileSystem("ignitefs-secondary"); - Ignite ignite = startGridWithGgfs("grid", "ggfs", mode, ggfsSecondary, PRIMARY_REST_CFG); + Ignite ignite = startGridWithGgfs("ignite", "ggfs", mode, ggfsSecondary, PRIMARY_REST_CFG); ggfs = (GridGgfsImpl) ignite.fileSystem("ggfs"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3efa8ae0/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java index 13cf6b4..ef02723 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDualAbstractSelfTest.java @@ -50,7 +50,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT * @throws Exception If failed. */ public void testDefaultDirectories() throws Exception { - IgniteFsPath gg = new IgniteFsPath("/gridgain"); + IgniteFsPath gg = new IgniteFsPath("/ignite"); IgniteFsPath[] paths = paths( gg, new IgniteFsPath(gg, "sync"), new IgniteFsPath(gg, "async"), new IgniteFsPath(gg, "primary")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3efa8ae0/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java index 2b12861..af90dc3 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java @@ -390,7 +390,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { if (msg != null && (msg.contains("Default grid instance has already been started.") || - msg.contains("Grid instance with this name has already been started:"))) + msg.contains("Ignite instance with this name has already been started:"))) info("Caught expected exception: " + msg); else throw e; // Unexpected exception.
