ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [19/41] incubator-ignite git commit: IGNITE-49 Fixed tests.
Date Fri, 23 Jan 2015 08:47:54 GMT
IGNITE-49 Fixed 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/88d705d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88d705d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88d705d0

Branch: refs/heads/ignite-49
Commit: 88d705d007fbb271191cbb637492309a6f84dbbd
Parents: e7e87fe
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Wed Jan 21 11:28:27 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Wed Jan 21 11:28:27 2015 +0300

----------------------------------------------------------------------
 .../p2p/GridAbstractMultinodeRedeployTest.java  |  10 +-
 .../GridExternalCacheQueryReducerClosure.java   |  39 ----
 .../GridCacheQueryUserResourceSelfTest.java     | 180 -------------------
 3 files changed, 5 insertions(+), 224 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88d705d0/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
index 9e0cbd9..e8db7b7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
@@ -90,20 +90,20 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest
                 ignite1.compute().localDeployTask(loadTaskClass(), loadTaskClass().getClassLoader());
                 ignite2.compute().localDeployTask(loadTaskClass(), loadTaskClass().getClassLoader());
 
-                ComputeTaskFuture<int[]> fut1 = executeAsync(ignite1.compute(), TASK_NAME,
Arrays.<UUID>asList(
+                ComputeTaskFuture<Integer> fut1 = executeAsync(ignite1.compute(), TASK_NAME,
Arrays.<UUID>asList(
                     ignite1.cluster().localNode().id(),
                     ignite2.cluster().localNode().id(),
                     ignite3.cluster().localNode().id()));
 
-                ComputeTaskFuture<int[]> fut2 = executeAsync(ignite2.compute(), TASK_NAME,
Arrays.<UUID>asList(
+                ComputeTaskFuture<Integer> fut2 = executeAsync(ignite2.compute(), TASK_NAME,
Arrays.<UUID>asList(
                     ignite1.cluster().localNode().id(),
                     ignite2.cluster().localNode().id(),
                     ignite3.cluster().localNode().id()));
 
-                int[] res1 = fut1.get();
-                int[] res2 = fut2.get();
+                Integer res1 = fut1.get();
+                Integer res2 = fut2.get();
 
-                if (res1 == null || res2 == null || res1.length != 2 || res2.length != 2)
+                if (res1 == null || res2 == null)
                     throw new IgniteCheckedException("Received wrong result.");
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88d705d0/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
deleted file mode 100644
index e458673..0000000
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
+++ /dev/null
@@ -1,39 +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.gridgain.grid.tests.p2p;
-
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-/**
- * Closure that returns cache query reducer, which uses
- * {@link GridP2PAwareTestUserResource}.
- */
-public class GridExternalCacheQueryReducerClosure implements IgniteReducer<Map.Entry<Integer,
Integer>, Integer> {
-    /** {@inheritDoc} */
-    @Override public boolean collect(Map.Entry<Integer, Integer> e) {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Integer reduce() {
-        return 0;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88d705d0/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java
deleted file mode 100644
index 57c1cb6..0000000
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java
+++ /dev/null
@@ -1,180 +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.gridgain.grid.kernal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.discovery.*;
-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.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.testframework.*;
-import org.gridgain.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.gridgain.grid.cache.GridCacheMode.*;
-
-/**
- * Test runs cache queries with injected user resource.
- */
-public class GridCacheQueryUserResourceSelfTest extends GridCommonAbstractTest {
-    /** Deploy counter key. */
-    private static final String DEPLOY_CNT_KEY = "deployCnt";
-
-    /** Undeploy counter key. */
-    private static final String UNDEPLOY_CNT_KEY = "undeployCnt";
-
-    /** Grid count. */
-    private static final int GRID_CNT = 2;
-
-    /** Node run count. */
-    private static final int RUN_CNT = 2;
-
-    /** VM ip finder for TCP discovery. */
-    private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
-    /** External class loader. */
-    private static final ClassLoader extClsLdr;
-
-    /**
-     * Initialize external class loader.
-     */
-    static {
-        extClsLdr = getExternalClassLoader();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        cfg.setDiscoverySpi(discoverySpi());
-        cfg.setCacheConfiguration(cacheConfiguration());
-
-        return cfg;
-    }
-
-    /**
-     * @return Discovery SPI.
-     * @throws Exception In case of error.
-     */
-    private DiscoverySpi discoverySpi() throws Exception {
-        TcpDiscoverySpi spi = new TcpDiscoverySpi();
-
-        spi.setMaxMissedHeartbeats(Integer.MAX_VALUE);
-        spi.setIpFinder(IP_FINDER);
-
-        return spi;
-    }
-
-    /**
-     * @return Cache configuration.
-     * @throws Exception In case of error.
-     */
-    private GridCacheConfiguration cacheConfiguration() throws Exception {
-        GridCacheConfiguration cfg = defaultCacheConfiguration();
-
-        cfg.setCacheMode(PARTITIONED);
-        cfg.setBackups(1);
-
-        return cfg;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected long getTestTimeout() {
-        return 30 * 1000; // 30 seconds.
-    }
-
-    /**
-     * Checks that user resource in cache query reducer is
-     * deployed and undeployed correctly.
-     *
-     * @throws Exception If failed.
-     */
-    public void testCacheQueryUserResourceDeployment() throws Exception {
-        // Start secondary nodes.
-        for (int i = 0; i < GRID_CNT; i++)
-            startGrid(i);
-
-        try {
-            for (int i = 1; i <= RUN_CNT; i++) {
-                // Start primary node.
-                Ignite g = startGrid();
-
-                try {
-                    runQuery(g);
-                }
-                finally {
-                    // Stop primary node.
-                    stopGrid();
-                }
-
-                final int fi = i;
-
-                assertTrue(GridTestUtils.waitForCondition(new PA() {
-                    @Override public boolean apply() {
-                        for (int i = 0; i < GRID_CNT; i++) {
-                            Ignite g = grid(i);
-
-                            ClusterNodeLocalMap<String, Integer> nodeLoc = g.cluster().nodeLocalMap();
-
-                            Integer depCnt = nodeLoc.get(DEPLOY_CNT_KEY);
-                            Integer undepCnt = nodeLoc.get(UNDEPLOY_CNT_KEY);
-
-                            if (depCnt == null || depCnt != fi)
-                                return false;
-
-                            if (undepCnt == null || undepCnt != fi)
-                                return false;
-                        }
-
-                        return true;
-                    }
-                }, getTestTimeout()));
-            }
-        }
-        finally {
-            // Stop secondary nodes.
-            for (int i = 0; i < GRID_CNT; i++)
-                stopGrid(i);
-        }
-    }
-
-    /**
-     * Runs {@code SCAN} query with user resource injected into reducer.
-     *
-     * @param g Grid.
-     * @throws Exception In case of error.
-     */
-    @SuppressWarnings("ConstantConditions")
-    private void runQuery(Ignite g) throws Exception {
-        GridCacheQuery<Map.Entry<Integer, Integer>> q = g.<Integer, Integer>cache(null).queries().createScanQuery(null);
-
-        // We use external class loader here to guarantee that secondary nodes
-        // won't load the reducer and user resource from each other.
-        Class<?> redCls = extClsLdr.loadClass("org.gridgain.grid.tests.p2p.GridExternalCacheQueryReducerClosure");
-
-        q.projection(g.cluster().forRemotes()).
-            execute((IgniteReducer<Map.Entry<Integer, Integer>, Integer>)redCls.newInstance()).get();
-    }
-}


Mime
View raw message