Repository: ignite Updated Branches: refs/heads/master b1db69343 -> c2369ff70
IGNITE-8412 Issues with cache names in GridCommandHandlerTest broke corresponding tests in security module. - Fixes #3937. Signed-off-by: dpavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2369ff7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2369ff7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2369ff7 Branch: refs/heads/master Commit: c2369ff70a5c19f4931039e3fd45d6db758fdb0e Parents: b1db693 Author: Aleksei Scherbakov <[email protected]> Authored: Thu May 3 19:25:23 2018 +0300 Committer: dpavlov <[email protected]> Committed: Thu May 3 19:25:23 2018 +0300 ---------------------------------------------------------------------- .../ignite/util/GridCommandHandlerTest.java | 27 +++++++------------- 1 file changed, 9 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2369ff7/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java index dbd6107..bfa1424 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java @@ -587,7 +587,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { IgniteCache<Object, Object> cache = ignite.createCache(new CacheConfiguration<>() .setAffinity(new RendezvousAffinityFunction(false, 32)) .setBackups(1) - .setName("cacheIV")); + .setName(DEFAULT_CACHE_NAME)); for (int i = 0; i < 100; i++) cache.put(i, i); @@ -600,7 +600,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { HashSet<Integer> clearKeys = new HashSet<>(Arrays.asList(1, 2, 3, 4, 5, 6)); - ((IgniteEx)ignite).context().cache().cache("cacheIV").clearLocallyAll(clearKeys, true, true, true); + ((IgniteEx)ignite).context().cache().cache(DEFAULT_CACHE_NAME).clearLocallyAll(clearKeys, true, true, true); assertEquals(EXIT_CODE_OK, execute("--cache", "idle_verify")); @@ -624,7 +624,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { .setAffinity(new RendezvousAffinityFunction(false, 32)) .setAtomicityMode(TRANSACTIONAL) .setBackups(1) - .setName("cacheCont")); + .setName(DEFAULT_CACHE_NAME)); final CountDownLatch l = new CountDownLatch(1); @@ -712,23 +712,14 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { ignite.cluster().active(true); - IgniteCache<Object, Object> cache1 = ignite.createCache(new CacheConfiguration<>() - .setAffinity(new RendezvousAffinityFunction(false, 32)) - .setBackups(1) - .setGroupName("G100") - .setName("cacheG1")); - - IgniteCache<Object, Object> cache2 = ignite.createCache(new CacheConfiguration<>() + IgniteCache<Object, Object> cache = ignite.createCache(new CacheConfiguration<>() .setAffinity(new RendezvousAffinityFunction(false, 32)) .setBackups(1) .setGroupName("G100") - .setName("cacheG2")); + .setName(DEFAULT_CACHE_NAME)); - for (int i = 0; i < 100; i++) { - cache1.put(i, i); - - cache2.put(i, i); - } + for (int i = 0; i < 100; i++) + cache.put(i, i); injectTestSystemOut(); @@ -748,7 +739,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { IgniteCache<Object, Object> cache1 = ignite.createCache(new CacheConfiguration<>() .setAffinity(new RendezvousAffinityFunction(false, 32)) .setBackups(1) - .setName("cacheAf")); + .setName(DEFAULT_CACHE_NAME)); for (int i = 0; i < 100; i++) cache1.put(i, i); @@ -757,7 +748,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { assertEquals(EXIT_CODE_OK, execute("--cache", "list", ".*")); - assertTrue(testOut.toString().contains("cacheName=cacheAf")); + assertTrue(testOut.toString().contains("cacheName=" + DEFAULT_CACHE_NAME)); assertTrue(testOut.toString().contains("prim=32")); assertTrue(testOut.toString().contains("mapped=32")); assertTrue(testOut.toString().contains("affCls=RendezvousAffinityFunction"));
