ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/6] incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
Date Thu, 19 Mar 2015 15:22:03 GMT
#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/0c00f930
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c00f930
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c00f930

Branch: refs/heads/ignite-45
Commit: 0c00f930121a6409fc35f4207a17f0b768d83f4c
Parents: f2d23ff
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Mar 19 17:42:22 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Mar 19 17:42:22 2015 +0300

----------------------------------------------------------------------
 .../ClientAbstractMultiThreadedSelfTest.java    |  89 ------
 .../client/ClientTopologyCacheSelfTest.java     | 288 -------------------
 .../client/suite/IgniteClientTestSuite.java     |   2 -
 3 files changed, 379 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c00f930/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index e9064b3..41df0da 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
@@ -33,7 +32,6 @@ 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 org.jetbrains.annotations.*;
-import org.junit.*;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -114,13 +112,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
     protected abstract GridSslContextFactory sslContextFactory();
 
     /**
-     * @return Count of iterations for sync commit test.
-     */
-    protected int syncCommitIterCount() {
-        return 1000;
-    }
-
-    /**
      * @return Topology refresh frequency interval.
      */
     protected int topologyRefreshFrequency() {
@@ -241,86 +232,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
     /**
      * @throws Exception If failed.
      */
-    public void testSyncCommitFlagReplicated() throws Exception {
-        doTestSyncCommitFlag(client.data(REPLICATED_ASYNC_CACHE_NAME));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSyncCommitFlagPartitioned() throws Exception {
-        doTestSyncCommitFlag(client.data(PARTITIONED_ASYNC_BACKUP_CACHE_NAME));
-    }
-
-    /**
-     * Extracts array from given iterator.
-     *
-     * @param nodes Iterator of nodes.
-     * @return Nodes array.
-     */
-    private GridClientNode[] toArray(Iterator<? extends GridClientNode> nodes) {
-        ArrayList<GridClientNode> res = new ArrayList<>();
-
-        while (nodes.hasNext())
-            res.add(nodes.next());
-
-        return res.toArray(new GridClientNode[res.size()]);
-    }
-
-    /**
-     * Runs test on SYNC_COMMIT flag.
-     *
-     * @param data Client data to run test on.
-     * @throws Exception If failed.
-     */
-    private void doTestSyncCommitFlag(final GridClientData data) throws Exception {
-        final String key = "k0";
-
-        Collection<UUID> affNodesIds = F.viewReadOnly(
-            affinity(grid(0).jcache(data.cacheName())).mapKeyToPrimaryAndBackups(key),
-            F.node2id());
-
-        final GridClientData dataFirst = data.pinNodes(F.first(client.compute().nodes()));
-
-        List<GridClientNode> affNodes = new ArrayList<>();
-
-        for (GridClientNode node : client.compute().nodes()) {
-            if (affNodesIds.contains(node.nodeId()))
-                affNodes.add(node);
-        }
-
-        Assert.assertFalse(affNodes.isEmpty());
-
-        Iterator<? extends GridClientNode> it = affNodes.iterator();
-
-        final GridClientData dataOthers = data.pinNodes(it.next(), toArray(it));
-
-        for (int i = 0; i < syncCommitIterCount(); i++) {
-            final CountDownLatch l = new CountDownLatch(1);
-
-            final String val = "v" + i;
-
-            IgniteInternalFuture<?> f = multithreadedAsync(new Callable<Object>()
{
-                @Override public Object call() throws Exception {
-                    l.await();
-
-                    assertEquals(val, dataOthers.get(key));
-
-                    return null;
-                }
-            }, THREAD_CNT);
-
-            dataFirst.flagsOn(GridClientCacheFlag.SYNC_COMMIT).put(key, val);
-
-            l.countDown();
-
-            f.get();
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testMultithreadedTaskRun() throws Exception {
         final AtomicLong cnt = new AtomicLong();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c00f930/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java
deleted file mode 100644
index 9db1b9e..0000000
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java
+++ /dev/null
@@ -1,288 +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.client;
-
-import org.apache.ignite.configuration.*;
-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 java.util.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-
-/**
- * Tests topology caching.
- */
-public class ClientTopologyCacheSelfTest extends GridCommonAbstractTest {
-    static {
-        // Override default port.
-        System.setProperty(IGNITE_JETTY_PORT, Integer.toString(8081));
-    }
-
-    /** Host. */
-    public static final String HOST = "127.0.0.1";
-
-    /** Port. */
-    public static final int BINARY_PORT = 11212;
-
-    /** Cache name. */
-    private static final String CACHE_NAME = "cache";
-
-    /** */
-    private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        startGrid();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopGrid();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTopologyCache() throws Exception {
-        testTopologyCache(
-            true, // metricsCache
-            true, // attrsCache
-            false,// autoFetchMetrics
-            false,// autoFetchAttrs
-            false,// metricsBeforeRefresh
-            false,// attrsBeforeRefresh
-            true, // metricsAfterRefresh
-            true);// attrsAfterRefresh
-
-        testTopologyCache(
-            false, // metricsCache
-            false, // attrsCache
-            false,// autoFetchMetrics
-            false,// autoFetchAttrs
-            false, // metricsBeforeRefresh
-            false, // attrsBeforeRefresh
-            false, // metricsAfterRefresh
-            false);// attrsAfterRefresh
-
-        testTopologyCache(
-            true,  // metricsCache
-            false, // attrsCache
-            false, // autoFetchMetrics
-            false, // autoFetchAttrs
-            false, // metricsBeforeRefresh
-            false, // attrsBeforeRefresh
-            true,  // metricsAfterRefresh
-            false);// attrsAfterRefresh
-
-        testTopologyCache(
-            false, // metricsCache
-            true,  // attrsCache
-            false, // autoFetchMetrics
-            false, // autoFetchAttrs
-            false, // metricsBeforeRefresh
-            false, // attrsBeforeRefresh
-            false, // metricsAfterRefresh
-            true); // attrsAfterRefresh
-    }
-
-    public void testAutofetch() throws Exception {
-        testTopologyCache(
-            true, // metricsCache
-            true, // attrsCache
-            true, // autoFetchMetrics
-            true, // autoFetchAttrs
-            true, // metricsBeforeRefresh
-            true, // attrsBeforeRefresh
-            true, // metricsAfterRefresh
-            true);// attrsAfterRefresh
-
-        testTopologyCache(
-            true, // metricsCache
-            true, // attrsCache
-            false,// autoFetchMetrics
-            true, // autoFetchAttrs
-            false,// metricsBeforeRefresh
-            true, // attrsBeforeRefresh
-            true, // metricsAfterRefresh
-            true);// attrsAfterRefresh
-
-        testTopologyCache(
-            true, // metricsCache
-            true, // attrsCache
-            true, // autoFetchMetrics
-            false,// autoFetchAttrs
-            true, // metricsBeforeRefresh
-            false,// attrsBeforeRefresh
-            true, // metricsAfterRefresh
-            true);// attrsAfterRefresh
-
-        testTopologyCache(
-            true, // metricsCache
-            true, // attrsCache
-            false,// autoFetchMetrics
-            false,// autoFetchAttrs
-            false,// metricsBeforeRefresh
-            false,// attrsBeforeRefresh
-            true, // metricsAfterRefresh
-            true);// attrsAfterRefresh
-    }
-
-    /**
-     * Starts new client with the given caching configuration and refreshes topology,
-     * Checks node metrics and attributes availability according to the given flags
-     * before and after refresh.
-     *
-     * @param metricsCache Should metrics be cached?
-     * @param attrsCache Should attributes be cached?
-     * @param autoFetchMetrics Should metrics be fetched automatically?
-     * @param autoFetchAttrs Should attributes be fetched automatically?
-     * @param metricsBeforeRefresh Should metrics be available before topology refresh?
-     * @param attrsBeforeRefresh Should attributes be available before topology refresh?
-     * @param metricsAfterRefresh Should metrics be available after topology refresh?
-     * @param attrsAfterRefresh Should attributes be available after topology refresh?
-     * @throws Exception If failed.
-     */
-    private void testTopologyCache(boolean metricsCache, boolean attrsCache,
-        boolean autoFetchMetrics, boolean autoFetchAttrs,
-        boolean metricsBeforeRefresh, boolean attrsBeforeRefresh,
-        boolean metricsAfterRefresh, boolean attrsAfterRefresh) throws Exception {
-        GridClient client = client(metricsCache, attrsCache, autoFetchMetrics, autoFetchAttrs);
-
-        try {
-            // Exclude cache metrics because there is no background refresh for them.
-            assertEquals(metricsBeforeRefresh, metricsAvailable(client, false));
-            assertEquals(attrsBeforeRefresh, attrsAvailable(client));
-
-            client.compute().refreshTopology(true, true);
-            client.data(CACHE_NAME).metrics();
-
-            assertEquals(metricsAfterRefresh, metricsAvailable(client, true));
-            assertEquals(attrsAfterRefresh, attrsAvailable(client));
-        }
-        finally {
-            GridClientFactory.stop(client.id(), false);
-        }
-    }
-
-    /**
-     * @param client Client instance.
-     * @param includeCache If {@code true} then cache metrics should be considered
-     * and their consistency with node metrics should be asserted, otherwise consider only
node metrics.
-     * @return {@code true} if node metrics available through this client,
-     * {@code false} otherwise.
-     * @throws GridClientException If data projection is not available.
-     */
-    private boolean metricsAvailable(GridClient client, boolean includeCache) throws GridClientException
{
-        if (includeCache) {
-            boolean node = nodeMetricsAvailable(client);
-            boolean cache = client.data(CACHE_NAME).cachedMetrics() != null;
-
-            assertTrue("Inconsistency between cache and node metrics cache.", node == cache);
-
-            return node && cache;
-        }
-        else
-            return nodeMetricsAvailable(client);
-    }
-
-    /**
-     * @param client Client instance.
-     * @return {@code true} if node node metrics available through this client,
-     * {@code false} otherwise.
-     */
-    private boolean nodeMetricsAvailable(GridClient client) throws GridClientException {
-        for (GridClientNode node : client.compute().nodes())
-            if (node.metrics() != null)
-                return true;
-
-        return false;
-    }
-
-    /**
-     * @param client Client instance.
-     * @return {@code true} if node attributes available through this client,
-     * {@code false} otherwise.
-     */
-    private boolean attrsAvailable(GridClient client) throws GridClientException {
-        for (GridClientNode node : client.compute().nodes())
-            if (node.attributes() != null && !node.attributes().isEmpty())
-                return true;
-
-        return false;
-    }
-
-    /**
-     * @param metricsCache Should metrics cache be enabled?
-     * @param attrsCache Should attributes cache be enabled?
-     * @return Client.
-     * @throws GridClientException In case of error.
-     */
-    private GridClient client(boolean metricsCache, boolean attrsCache,
-        boolean autoFetchMetrics, boolean autoFetchAttrs) throws GridClientException {
-        GridClientDataConfiguration cache = new GridClientDataConfiguration();
-
-        cache.setName(CACHE_NAME);
-
-        GridClientConfiguration cfg = new GridClientConfiguration();
-
-        cfg.setServers(Arrays.asList(HOST + ":" + BINARY_PORT));
-        cfg.setEnableMetricsCache(metricsCache);
-        cfg.setEnableAttributesCache(attrsCache);
-        cfg.setAutoFetchMetrics(autoFetchMetrics);
-        cfg.setAutoFetchAttributes(autoFetchAttrs);
-        cfg.setDataConfigurations(Collections.singleton(cache));
-
-        return GridClientFactory.start(cfg);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
-        CacheConfiguration cacheCfg = defaultCacheConfiguration();
-
-        cacheCfg.setCacheMode(LOCAL);
-        cacheCfg.setName(CACHE_NAME);
-        cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
-        cacheCfg.setSwapEnabled(false);
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(IP_FINDER);
-
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        cfg.setLocalHost(HOST);
-
-        assert cfg.getConnectorConfiguration() == null;
-
-        ConnectorConfiguration clientCfg = new ConnectorConfiguration();
-
-        clientCfg.setPort(BINARY_PORT);
-
-        cfg.setConnectorConfiguration(clientCfg);
-
-        cfg.setCacheConfiguration(cacheCfg);
-        cfg.setDiscoverySpi(disco);
-
-        return cfg;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c00f930/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 2b58cef..5fdafb1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -101,8 +101,6 @@ public class IgniteClientTestSuite extends TestSuite {
 
         suite.addTestSuite(ClientByteUtilsTest.class);
 
-        suite.addTest(new TestSuite(ClientTopologyCacheSelfTest.class));
-
         // Router tests.
         suite.addTest(new TestSuite(TcpRouterSelfTest.class));
         // TODO uncomment when fixed https://issues.apache.org/jira/browse/IGNITE-433


Mime
View raw message