#ignite-164: remove gridgain from test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a72e031b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a72e031b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a72e031b Branch: refs/heads/ignite-164v2 Commit: a72e031b43a41994b317eb6b4b73bb1c2a9d0058 Parents: 07e925d Author: ivasilinets <vasilinetc....@gmail.com> Authored: Thu Feb 5 16:15:14 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Thu Feb 5 16:15:14 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java | 2 +- .../apache/ignite/client/integration/ClientAbstractSelfTest.java | 4 ++-- .../src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java | 2 +- .../test/java/org/apache/ignite/testframework/GridTestUtils.java | 4 ++-- .../testsuites/IgniteCacheDataStructuresSelfTestSuite.java | 2 +- .../ignite/testsuites/IgniteContinuousTaskSelfTestSuite.java | 2 +- .../apache/ignite/testsuites/IgniteJobMetricsSelfTestSuite.java | 2 +- .../ignite/testsuites/IgniteSpiEventStorageSelfTestSuite.java | 2 +- .../test/java/org/apache/ignite/fs/IgniteFsEventsTestSuite.java | 2 +- .../apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java | 2 +- .../ignite/internal/GridProjectionStartStopRestartSelfTest.java | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java index d6c1210..5c2ab54 100644 --- a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java +++ b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java @@ -33,7 +33,7 @@ public class IgniteAopSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Gridgain AOP Test Suite"); + TestSuite suite = new TestSuite("Ignite AOP Test Suite"); // Test configuration. suite.addTest(new TestSuite(BasicAopSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index 90b73c0..fd5deeb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -1305,7 +1305,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { final GridClientCompute compute = client.compute(); /* Usually this log file is created by log4j, but some times it doesn't exists. */ - new File(U.getIgniteHome(), "work/log/gridgain.log").createNewFile(); + new File(U.getIgniteHome(), "work/log/ignite.log").createNewFile(); List<String> log = compute.log(6, 7); assertNotNull(log); @@ -1317,7 +1317,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { assertNotNull(log); assertTrue(log.isEmpty()); - String path = "work/log/gridgain.log." + System.currentTimeMillis(); + String path = "work/log/ignite.log." + System.currentTimeMillis(); File file = new File(U.getIgniteHome(), path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java index 80a6903..2c1d0d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java @@ -822,7 +822,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { assert false : e.getMessage(); } - String s = "gridgain functional programming"; + String s = "ignite functional programming"; IgniteOutClosure<Boolean> co = F.coInvoke(s, "contains", "prog"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 19bb3c6..7419bde 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -655,10 +655,10 @@ public final class GridTestUtils { File dir = new File(ggHome); if (!dir.exists()) - throw new Exception("Gridgain home does not exist [girdgain-home=" + dir.getAbsolutePath() + ']'); + throw new Exception("Ignite home does not exist [ignite-home=" + dir.getAbsolutePath() + ']'); if (!dir.isDirectory()) - throw new Exception("Gridgain home is not a directory [gridgain-home=" + dir.getAbsolutePath() + ']'); + throw new Exception("Ignite home is not a directory [ignite-home=" + dir.getAbsolutePath() + ']'); return ggHome; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index e2366d9..d4b65ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -32,7 +32,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Gridgain Cache Data Structures Test Suite"); + TestSuite suite = new TestSuite("Ignite Cache Data Structures Test Suite"); // Data structures. suite.addTest(new TestSuite(GridCachePartitionedQueueFailoverDataConsistencySelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousTaskSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousTaskSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousTaskSelfTestSuite.java index ad95992..4241815 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousTaskSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousTaskSelfTestSuite.java @@ -29,7 +29,7 @@ public class IgniteContinuousTaskSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Gridgain Kernal Test Suite"); + TestSuite suite = new TestSuite("Ignite Kernal Test Suite"); suite.addTest(new TestSuite(GridContinuousJobAnnotationSelfTest.class)); suite.addTest(new TestSuite(GridContinuousJobSiblingsSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteJobMetricsSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteJobMetricsSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteJobMetricsSelfTestSuite.java index 68e5331..b445fb4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteJobMetricsSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteJobMetricsSelfTestSuite.java @@ -29,7 +29,7 @@ public class IgniteJobMetricsSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Gridgain Job metrics Test Suite"); + TestSuite suite = new TestSuite("Ignite Job metrics Test Suite"); suite.addTest(new TestSuite(GridJobMetricsProcessorLoadTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiEventStorageSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiEventStorageSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiEventStorageSelfTestSuite.java index af738d6..0cad9e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiEventStorageSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiEventStorageSelfTestSuite.java @@ -29,7 +29,7 @@ public class IgniteSpiEventStorageSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Gridgain Event Storage Test Suite"); + TestSuite suite = new TestSuite("Ignite Event Storage Test Suite"); suite.addTest(new TestSuite(GridMemoryEventStorageSpiSelfTest.class)); suite.addTest(new TestSuite(GridMemoryEventStorageSpiStartStopSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/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 index 46d4494..24b5123 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/IgniteFsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/IgniteFsEventsTestSuite.java @@ -62,7 +62,7 @@ public class IgniteFsEventsTestSuite extends TestSuite { public static TestSuite suiteNoarchOnly() throws Exception { GridHadoopClassLoader ldr = new GridHadoopClassLoader(null); - TestSuite suite = new TestSuite("Gridgain GGFS Events Test Suite Noarch Only"); + TestSuite suite = new TestSuite("Ignite GGFS Events Test Suite Noarch Only"); suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName()))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/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 index 4383a2c..a4abdbb 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java @@ -38,7 +38,7 @@ public class IgniteFsLinuxAndMacOSTestSuite extends TestSuite { GridHadoopClassLoader ldr = new GridHadoopClassLoader(null); - TestSuite suite = new TestSuite("Gridgain GGFS Test Suite For Linux And Mac OS"); + TestSuite suite = new TestSuite("Ignite GGFS Test Suite For Linux And Mac OS"); suite.addTest(new TestSuite(ldr.loadClass(GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.class.getName()))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a72e031b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java index 5c39c12..9bd8601 100644 --- a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java +++ b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java @@ -1004,7 +1004,7 @@ public class GridProjectionStartStopRestartSelfTest extends GridCommonAbstractTe * @return Whether name belongs to log file. */ private boolean isSshNodeLogName(String name) { - return name.matches("gridgain.[0-9a-z-]+.log"); + return name.matches("ignite.[0-9a-z-]+.log"); } /**
