You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/02/17 09:59:23 UTC
[13/50] [abbrv] ignite git commit: IGNITE-4550: Move service
deployment to certain test. This closes #1437.
IGNITE-4550: Move service deployment to certain test. This closes #1437.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/71a76c81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/71a76c81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/71a76c81
Branch: refs/heads/ignite-1.9
Commit: 71a76c81530d1aa38525fd78a90b065b6e19a6bb
Parents: f350578
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Thu Jan 19 13:29:55 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Thu Jan 19 15:21:03 2017 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/71a76c81/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b328960..1cfb330 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -64,6 +64,7 @@ import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -294,18 +295,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
cacheCfgMap = null;
}
- // We won't deploy service unless non-client node is configured.
- for (int i = 0; i < gridCount(); i++) {
- Boolean clientMode = grid(i).configuration().isClientMode();
-
- if (clientMode != null && clientMode) // Can be null in multi jvm tests.
- continue;
-
- grid(0).services(grid(0).cluster()).deployNodeSingleton(SERVICE_NAME1, new DummyServiceImpl());
-
- break;
- }
-
for (int i = 0; i < gridCount(); i++)
info("Grid " + i + ": " + grid(i).localNode().id());
}
@@ -5521,6 +5510,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testTransformResourceInjection() throws Exception {
+ ClusterGroup servers = grid(0).cluster().forServers();
+
+ if(F.isEmpty(servers.nodes()))
+ return;
+
+ grid(0).services( grid(0).cluster()).deployNodeSingleton(SERVICE_NAME1, new DummyServiceImpl());
+
IgniteCache<String, Integer> cache = jcache();
Ignite ignite = ignite(0);