#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2d23ff9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2d23ff9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2d23ff9 Branch: refs/heads/ignite-45 Commit: f2d23ff916e746e6d1bb682ee13af5b52f7aa3bf Parents: 0db819b Author: ivasilinets <[email protected]> Authored: Thu Mar 19 17:13:54 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Mar 19 17:13:54 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiNodeSelfTest.java | 81 -------------------- .../integration/ClientAbstractSelfTest.java | 74 ------------------ 2 files changed, 155 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2d23ff9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 8c4794d..2dee305 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -227,36 +227,6 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testSyncCommitRollbackFlags() throws Exception { - commSpiEnabled = true; - - try { - GridClientData data = client.data(REPLICATED_ASYNC_CACHE_NAME); - - info("Before put x1"); - - data.put("x1", "y1"); - - info("Before put x2"); - - data.flagsOn(GridClientCacheFlag.SYNC_COMMIT).put("x2", "y2"); - - info("Before put x3"); - - data.put("x3", "y3"); - - info("Before put x4"); - - data.flagsOn(GridClientCacheFlag.SYNC_COMMIT).put("x4", "y4"); - } - finally { - commSpiEnabled = false; - } - } - - /** - * @throws Exception If failed. - */ public void testEmptyProjections() throws Exception { final GridClientCompute dflt = client.compute(); @@ -528,55 +498,4 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract assertTrue("Invalid tx flags: " + t, t.syncCommit()); } } - - /** - * @throws Exception If failed. - */ - public void testMultithreadedCommand() throws Exception { - final GridClientData data = client.data(PARTITIONED_CACHE_NAME); - final GridClientCompute compute = client.compute(); - final AtomicInteger cnt = new AtomicInteger(0); - - multithreaded(new Callable<Object>() { - @Override public Object call() throws Exception { - for (int i = 0; i < 20; i++) { - String key = UUID.randomUUID().toString(); - String val = UUID.randomUUID().toString(); - - switch (cnt.incrementAndGet() % 4) { - case 0: { - assertTrue(data.put(key, val)); - assertEquals(val, data.get(key)); - assertTrue(data.remove(key)); - - break; - } - - case 1: { - assertNotNull(data.metrics()); - - break; - } - - case 2: { - String nodeId = compute.execute(TestTask.class.getName(), null); - - assertNotNull(nodeId); - assertNotNull(compute.refreshNode(UUID.fromString(nodeId), true, true)); - - break; - } - - case 3: { - assertEquals(NODES_CNT, compute.refreshTopology(true, true).size()); - - break; - } - } - } - - return null; - } - }, 50, "multithreaded-client-access"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2d23ff9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index e590f6e..58d628c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -447,80 +447,6 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { assertEquals(0, failed); } - - /** - * @throws Exception If failed. - */ - public void testAppendPrepend() throws Exception { - List<GridClientData> datas = Arrays.asList(client.data(), client.data(CACHE_NAME)); - - String key = UUID.randomUUID().toString(); - - for (GridClientData data : datas) { - assertNotNull(data); - - data.remove(key); - - assertFalse(data.append(key, ".suffix")); - assertTrue(data.put(key, "val")); - assertTrue(data.append(key, ".suffix")); - assertEquals("val.suffix", data.get(key)); - assertTrue(data.remove(key)); - assertFalse(data.append(key, ".suffix")); - - data.remove(key); - - assertFalse(data.prepend(key, "postfix.")); - assertTrue(data.put(key, "val")); - assertTrue(data.prepend(key, "postfix.")); - assertEquals("postfix.val", data.get(key)); - assertTrue(data.remove(key)); - assertFalse(data.prepend(key, "postfix.")); - } - - // TCP protocol supports work with collections. - if (protocol() != GridClientProtocol.TCP) - return; - - List<String> origList = new ArrayList<>(Arrays.asList("1", "2")); // This list should be modifiable. - List<String> newList = Arrays.asList("3", "4"); - - Map<String, String> origMap = F.asMap("1", "a1", "2", "a2"); - Map<String, String> newMap = F.asMap("2", "b2", "3", "b3"); - - for (GridClientData data : datas) { - assertNotNull(data); - - data.remove(key); - - assertFalse(data.append(key, newList)); - assertTrue(data.put(key, origList)); - assertTrue(data.append(key, newList)); - assertEquals(Arrays.asList("1", "2", "3", "4"), data.get(key)); - - data.remove(key); - - assertFalse(data.prepend(key, newList)); - assertTrue(data.put(key, origList)); - assertTrue(data.prepend(key, newList)); - assertEquals(Arrays.asList("3", "4", "1", "2"), data.get(key)); - - data.remove(key); - - assertFalse(data.append(key, newMap)); - assertTrue(data.put(key, origMap)); - assertTrue(data.append(key, newMap)); - assertEquals(F.asMap("1", "a1", "2", "b2", "3", "b3"), data.get(key)); - - data.remove(key); - - assertFalse(data.prepend(key, newMap)); - assertTrue(data.put(key, origMap)); - assertTrue(data.prepend(key, newMap)); - assertEquals(F.asMap("1", "a1", "2", "a2", "3", "b3"), data.get(key)); - } - } - /** * @throws Exception If failed. */
