Repository: incubator-ignite Updated Branches: refs/heads/ignite-82 bbbd02bb5 -> 8e5b052ec
# ignite-213 : move DFLT_LIC_FILE_NAME const and move GridStartupWithUndefinedIgniteHomeSelfTest.java to ggprivate Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fdeced53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fdeced53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fdeced53 Branch: refs/heads/ignite-82 Commit: fdeced539b68abf9d7d7a3f557ba025d1d64ddbf Parents: e3afc71 Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon Feb 9 17:51:47 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon Feb 9 17:51:47 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/Ignition.java | 6 -- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 106 ------------------- .../testsuites/IgniteKernalSelfTestSuite.java | 1 - 3 files changed, 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdeced53/modules/core/src/main/java/org/apache/ignite/Ignition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java index 8ae3368..9ff6fd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignition.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java @@ -97,12 +97,6 @@ public class Ignition { public static final int KILL_EXIT_CODE = 130; /** - * Default License file name. This file will be tried if no - * license provided in configuration. - */ - public static final String DFLT_LIC_FILE_NAME = "gridgain-license.xml"; - - /** * Enforces singleton. */ protected Ignition() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdeced53/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java deleted file mode 100644 index 5b6e059..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java +++ /dev/null @@ -1,106 +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.util; - -import junit.framework.*; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.logger.java.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.junits.common.*; - -import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.internal.util.IgniteUtils.*; - -/** - * Checks that node can be started without operations with undefined IGNITE_HOME. - * <p> - * Notes: - * 1. The test intentionally extends JUnit {@link TestCase} class to make the test - * independent from {@link GridCommonAbstractTest} stuff. - * 2. Do not replace native Java asserts with JUnit ones - test won't fall on TeamCity. - */ -public class GridStartupWithUndefinedIgniteHomeSelfTest extends TestCase { - /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - - /** */ - private static final int GRID_COUNT = 2; - - /** {@inheritDoc} */ - @Override protected void tearDown() throws Exception { - // Next grid in the same VM shouldn't use cached values produced by these tests. - nullifyHomeDirectory(); - - U.getIgniteHome(); - } - - /** - * @throws Exception If failed. - */ - public void testStartStopWithUndefinedIgniteHome() throws Exception { - IgniteUtils.nullifyHomeDirectory(); - - // We can't use U.getIgniteHome() here because - // it will initialize cached value which is forbidden to override. - String ggHome = IgniteSystemProperties.getString(IGNITE_HOME); - - assert ggHome != null; - - U.setIgniteHome(null); - - String ggHome0 = U.getIgniteHome(); - - assert ggHome0 == null; - - IgniteLogger log = new JavaLogger(); - - log.info(">>> Test started: " + getName()); - log.info("Grid start-stop test count: " + GRID_COUNT); - - for (int i = 0; i < GRID_COUNT; i++) { - TcpDiscoverySpi disc = new TcpDiscoverySpi(); - - disc.setIpFinder(IP_FINDER); - - IgniteConfiguration cfg = new IgniteConfiguration(); - - // We have to explicitly configure path to license config because of undefined IGNITE_HOME. - cfg.setLicenseUrl("file:///" + ggHome + "/" + Ignition.DFLT_LIC_FILE_NAME); - - // Default console logger is used - cfg.setGridLogger(log); - cfg.setDiscoverySpi(disc); - cfg.setRestEnabled(false); - - try (Ignite g = G.start(cfg)) { - assert g != null; - - ggHome0 = U.getIgniteHome(); - - assert ggHome0 == null; - - X.println("Stopping grid " + g.cluster().localNode().id()); - } - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdeced53/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index dd0e4be..74a6d1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@ -60,7 +60,6 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(GridPortProcessorSelfTest.class); suite.addTestSuite(GridHomePathSelfTest.class); suite.addTestSuite(GridStartupWithSpecifiedWorkDirectorySelfTest.class); - suite.addTestSuite(GridStartupWithUndefinedIgniteHomeSelfTest.class); suite.addTestSuite(GridVersionSelfTest.class); suite.addTestSuite(GridListenActorSelfTest.class); suite.addTestSuite(GridNodeLocalSelfTest.class);
