http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java deleted file mode 100644 index 60accfa..0000000 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ /dev/null @@ -1,432 +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.loadtests.offheap; - -import java.util.Map; -import java.util.Random; -import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; -import org.apache.ignite.cache.affinity.AffinityFunction; -import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; -import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.util.offheap.GridByteArrayWrapper; -import org.apache.ignite.internal.util.offheap.GridOffHeapPartitionedMap; -import org.apache.ignite.internal.util.typedef.T3; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Performance test for partitioned offheap hash map. - */ -@SuppressWarnings({"unchecked", "NonThreadSafeLazyInitialization"}) -public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends GridCommonAbstractTest { - /** */ - protected static final int LOAD_CNT = 256; - - /** Sample keys. */ - private static T3<Integer, Integer, byte[]> keys[]; - - /** Wrapped keys. */ - private static GridByteArrayWrapper[] wrappers; - - /** Unsafe map. */ - private GridOffHeapPartitionedMap map; - - /** */ - protected float load = 0.75f; - - /** */ - protected int concurrency = 16; - - /** */ - protected short lruStripes = 16; - - /** */ - protected long mem = 2L * 1024L * 1024L * 1024L; - - /** */ - protected long dur = 120 * 1000; - - /** - * - */ - protected GridOffHeapPartitionedMapPerformanceAbstractTest() { - super(false); - } - - /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - map = newMap(); - - if (keys == null) { - keys = new T3[LOAD_CNT]; - wrappers = new GridByteArrayWrapper[LOAD_CNT]; - - AffinityFunction aff = new RendezvousAffinityFunction(); - - Random rnd = new Random(); - - for (int i = 0; i < LOAD_CNT; i++) { - byte[] key = new byte[rnd.nextInt(511) + 1]; - - rnd.nextBytes(key); - - GridByteArrayWrapper wrap = new GridByteArrayWrapper(key); - - keys[i] = new T3<>(aff.partition(wrap), wrap.hashCode(), key); - wrappers[i] = wrap; - } - } - } - - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { - if (map != null) - map.destruct(); - } - - /** - * @return New map. - */ - protected abstract GridOffHeapPartitionedMap newMap(); - - /** - * @throws Exception If failed. - */ - public void testPuts() throws Exception { - info("Warming up..."); - - checkPuts(1, 20000); - - info("Warm up finished."); - - checkPuts(Runtime.getRuntime().availableProcessors(), dur); - } - - /** - * @throws Exception If failed. - */ - public void testPutsConcurrentMap() throws Exception { - info("Warming up..."); - - checkPutsConcurrentMap(1, 20000); - - info("Warm up finished."); - - checkPutsConcurrentMap(Runtime.getRuntime().availableProcessors(), dur); - } - - /** - * @throws Exception If failed. - */ - public void testPutRemoves() throws Exception { - info("Warming up..."); - - checkPutRemoves(2, 20000); - - info("Warm up finished."); - - checkPutRemoves(Runtime.getRuntime().availableProcessors(), dur); - } - - /** - * @throws Exception If failed. - */ - public void testPutRemovesConcurrentMap() throws Exception { - info("Warming up..."); - - checkPutRemovesConcurrentMap(2, 20000); - - info("Warm up finished."); - - checkPutRemovesConcurrentMap(Runtime.getRuntime().availableProcessors(), dur); - } - - /** - * @throws Exception If failed. - */ - private void checkPuts(int threadCnt, long duration) throws Exception { - final AtomicLong opCnt = new AtomicLong(); - final AtomicLong totalOpCnt = new AtomicLong(); - - final AtomicBoolean done = new AtomicBoolean(); - - long start = System.currentTimeMillis(); - - IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { - @Override public Object call() throws Exception { - Random rnd = new Random(); - - byte[] val = new byte[1024]; - - long locTotalOpCnt = 0; - - while (!done.get()) { - for (int i = 0; i < 500; i++) { - T3<Integer, Integer, byte[]> key = randomKey(rnd); - - map.put(key.get1(), key.get2(), key.get3(), val); - } - - locTotalOpCnt += 500; - opCnt.addAndGet(500); - } - - totalOpCnt.addAndGet(locTotalOpCnt); - - return null; - } - }, threadCnt); - - final int step = 2000; - - while (System.currentTimeMillis() - start < duration) { - U.sleep(step); - - long ops = opCnt.getAndSet(0); - - info("Putting " + (ops * 1000) / step + " ops/sec"); - } - - done.set(true); - - fut.get(); - - long end = System.currentTimeMillis(); - - info("Average put performance: " + (totalOpCnt.get() * 1000) / (end - start) + " ops/sec"); - } - - /** - * @throws Exception If failed. - */ - private void checkPutRemoves(int threadCnt, long duration) throws Exception { - final AtomicLong opCnt = new AtomicLong(); - final AtomicLong totalOpCnt = new AtomicLong(); - - final AtomicBoolean done = new AtomicBoolean(); - - long start = System.currentTimeMillis(); - - IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { - @Override public Object call() throws Exception { - Random rnd = new Random(); - - byte[] val = new byte[1024]; - - long locTotalOpCnt = 0; - - while (!done.get()) { - for (int i = 0; i < 500; i++) { - T3<Integer, Integer, byte[]> key = randomKey(rnd); - - int op = rnd.nextInt(2); - - switch (op) { - case 0: - map.put(key.get1(), key.get2(), key.get3(), val); - - break; - - case 1: - map.remove(key.get1(), key.get2(), key.get3()); - - break; - - default: - assert false; - } - } - - locTotalOpCnt += 500; - opCnt.addAndGet(500); - } - - totalOpCnt.addAndGet(locTotalOpCnt); - - return null; - } - }, threadCnt); - - final int step = 2000; - - while (System.currentTimeMillis() - start < duration) { - U.sleep(step); - - long ops = opCnt.getAndSet(0); - - info("Putting " + (ops * 1000) / step + " ops/sec"); - } - - done.set(true); - - fut.get(); - - long end = System.currentTimeMillis(); - - info("Average random operation performance: " + (totalOpCnt.get() * 1000) / (end - start) + " ops/sec"); - } - /** - * @throws Exception If failed. - */ - private void checkPutsConcurrentMap(int threadCnt, long duration) throws Exception { - final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap<>(); - - final AtomicLong opCnt = new AtomicLong(); - final AtomicLong totalOpCnt = new AtomicLong(); - - final AtomicBoolean done = new AtomicBoolean(); - - long start = System.currentTimeMillis(); - - IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { - @Override public Object call() throws Exception { - Random rnd = new Random(); - - long locTotalOpCnt = 0; - - while (!done.get()) { - for (int i = 0; i < 500; i++) { - GridByteArrayWrapper key = randomKeyWrapper(rnd); - - map.put(key, new byte[1024]); - } - - locTotalOpCnt += 500; - opCnt.addAndGet(500); - } - - totalOpCnt.addAndGet(locTotalOpCnt); - - return null; - } - }, threadCnt); - - final int step = 2000; - - while (System.currentTimeMillis() - start < duration) { - U.sleep(step); - - long ops = opCnt.getAndSet(0); - - info("Putting " + (ops * 1000) / step + " ops/sec"); - } - - done.set(true); - - fut.get(); - - long end = System.currentTimeMillis(); - - info("Average put performance: " + (totalOpCnt.get() * 1000) / (end - start) + " ops/sec"); - } - - /** - * @throws Exception If failed. - */ - private void checkPutRemovesConcurrentMap(int threadCnt, long duration) throws Exception { - final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap<>(); - - final AtomicLong opCnt = new AtomicLong(); - final AtomicLong totalOpCnt = new AtomicLong(); - - final AtomicBoolean done = new AtomicBoolean(); - - long start = System.currentTimeMillis(); - - IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { - @Override public Object call() throws Exception { - Random rnd = new Random(); - - byte[] val = new byte[1024]; - - long locTotalOpCnt = 0; - - while (!done.get()) { - for (int i = 0; i < 500; i++) { - GridByteArrayWrapper key = randomKeyWrapper(rnd); - - int op = rnd.nextInt(2); - - switch (op) { - case 0: - map.put(key, val); - - break; - - case 1: - map.remove(key); - - break; - - default: - assert false; - } - } - - locTotalOpCnt += 500; - opCnt.addAndGet(500); - } - - totalOpCnt.addAndGet(locTotalOpCnt); - - return null; - } - }, threadCnt); - - final int step = 2000; - - while (System.currentTimeMillis() - start < duration) { - U.sleep(step); - - long ops = opCnt.getAndSet(0); - - info("Putting " + (ops * 1000) / step + " ops/sec"); - } - - done.set(true); - - fut.get(); - - long end = System.currentTimeMillis(); - - info("Average random operation performance: " + (totalOpCnt.get() * 1000) / (end - start) + " ops/sec"); - } - - /** - * Gets random key from pregenerated array. - * - * @param rnd Random to use. - * @return Tuple with key. - */ - private T3<Integer, Integer, byte[]> randomKey(Random rnd) { - return keys[rnd.nextInt(keys.length)]; - } - - /** - * Gets random key from pregenerated array. - * - * @param rnd Random to use. - * @return Tuple with key. - */ - private GridByteArrayWrapper randomKeyWrapper(Random rnd) { - return wrappers[rnd.nextInt(keys.length)]; - } -} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafeMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafeMapPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafeMapPerformanceTest.java deleted file mode 100644 index af691b4..0000000 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafeMapPerformanceTest.java +++ /dev/null @@ -1,32 +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.loadtests.offheap.unsafe; - -import org.apache.ignite.internal.util.offheap.GridOffHeapMap; -import org.apache.ignite.internal.util.offheap.GridOffHeapMapFactory; -import org.apache.ignite.internal.util.offheap.GridOffHeapMapPerformanceAbstractTest; - -/** - * Unsafe map test. - */ -public class GridUnsafeMapPerformanceTest extends GridOffHeapMapPerformanceAbstractTest { - /** {@inheritDoc} */ - @Override protected GridOffHeapMap newMap() { - return GridOffHeapMapFactory.unsafeMap(concurrency, load, initCap, mem, lruStripes, evictClo); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java deleted file mode 100644 index 7f77300..0000000 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ /dev/null @@ -1,34 +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.loadtests.offheap.unsafe; - -import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; -import org.apache.ignite.internal.util.offheap.GridOffHeapMapFactory; -import org.apache.ignite.internal.util.offheap.GridOffHeapPartitionedMap; -import org.apache.ignite.internal.util.offheap.GridOffHeapPartitionedMapPerformanceAbstractTest; - -/** - * Unsafe partitioned map performance test. - */ -public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest { - /** {@inheritDoc} */ - @Override protected GridOffHeapPartitionedMap newMap() { - return GridOffHeapMapFactory.unsafePartitionedMap(RendezvousAffinityFunction.DFLT_PARTITION_COUNT, - Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanLoadTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanLoadTest.java new file mode 100644 index 0000000..93a1597 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanLoadTest.java @@ -0,0 +1,285 @@ +/* + * 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.spi.communication.tcp; + +import java.util.Collections; +import java.util.Deque; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; +import mx4j.tools.adaptor.http.HttpAdaptor; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteRunnable; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.spi.communication.CommunicationListener; +import org.apache.ignite.spi.communication.GridTestMessage; +import org.apache.ignite.testframework.GridSpiTestContext; +import org.apache.ignite.testframework.GridTestNode; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.config.GridTestProperties; +import org.apache.ignite.testframework.junits.IgniteTestResources; +import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; + +/** + * Class for multithreaded {@link TcpCommunicationSpi} test. + */ +@SuppressWarnings({"JUnitAbstractTestClassNamingConvention"}) +public class GridTcpCommunicationSpiLanLoadTest extends GridSpiAbstractTest<TcpCommunicationSpi> { + /** Connection idle timeout */ + public static final int IDLE_CONN_TIMEOUT = 2000; + + /** Count of threads sending messages. */ + public static final int THREAD_CNT = 5; + + /** Message id sequence. */ + private AtomicLong msgId = new AtomicLong(); + + /** SPI resource. */ + private IgniteTestResources spiRsrc; + + /** SPI */ + private TcpCommunicationSpi spi; + + /** Listener. */ + private MessageListener lsnr; + + /** Local node. */ + private GridTestNode locNode; + + /** Remote node. */ + private GridTestNode remoteNode; + + /** Flag indicating if listener should reject messages. */ + private boolean reject; + + // TODO: change this value to ip of remote node running testRunReceiver + /** Address of remote machine running receive test. */ + private static final String remoteAddr = "172.1.1.36"; + + /** */ + public GridTcpCommunicationSpiLanLoadTest() { + super(false); + } + + /** + * Accumulating listener. + */ + @SuppressWarnings({"deprecation"}) + private class MessageListener implements CommunicationListener<Message> { + /** Node id of local node. */ + private final UUID locNodeId; + + /** Received messages by node. */ + private Deque<GridTestMessage> rcvdMsgs = new ConcurrentLinkedDeque<>(); + + /** Count of messages received from remote nodes */ + private AtomicInteger rmtMsgCnt = new AtomicInteger(); + + /** + * @param locNodeId Local node ID. + */ + MessageListener(UUID locNodeId) { + assert locNodeId != null; + + this.locNodeId = locNodeId; + } + + /** {@inheritDoc} */ + @Override public void onMessage(UUID nodeId, Message msg, IgniteRunnable msgC) { + msgC.run(); + + if (msg instanceof GridTestMessage) { + GridTestMessage testMsg = (GridTestMessage)msg; + + if (!testMsg.getSourceNodeId().equals(nodeId)) + fail("Listener nodeId is not equal to message nodeId."); + + if (!reject) + rcvdMsgs.offer(testMsg); + + if (!locNodeId.equals(nodeId)) + rmtMsgCnt.incrementAndGet(); + } + } + + /** {@inheritDoc} */ + @Override public void onDisconnected(UUID nodeId) { + // No-op. + } + + /** + * @return Count of messages received from remote node. + */ + public int remoteMessageCount() { + return rmtMsgCnt.get(); + } + } + + /** + * @throws Exception If failed. + */ + public void testRunReceiver() throws Exception { + info(">>> Starting receiving SPI. <<<"); + + reject = true; + + while (!Thread.currentThread().isInterrupted()) { + U.sleep(5000); + + info(">>>" + lsnr.remoteMessageCount() + " messages received from remote node"); + } + } + + /** + * @throws Exception If failed. + */ + public void testRunSender() throws Exception { + reject = true; + + info(">>> Starting send to remote node multithreaded test. <<<"); + + final AtomicInteger cntr = new AtomicInteger(); + + final int msgCnt = 10000; + + long start = System.currentTimeMillis(); + + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { + @Override public void run() { + try { + while (cntr.getAndIncrement() < msgCnt) { + GridTestMessage msg = new GridTestMessage(locNode.id(), msgId.getAndIncrement(), 0); + + msg.payload(new byte[13 * 1024]); + + spi.sendMessage(remoteNode, msg); + } + } + catch (IgniteException e) { + fail("Unable to send message: " + e.getMessage()); + } + } + }, THREAD_CNT, "message-sender"); + + fut.get(); + + info(">>> Sent all messages in " + (System.currentTimeMillis() - start) + " milliseconds"); + + assertEquals("Invalid count of messages was sent", msgCnt, msgId.get()); + + U.sleep(IDLE_CONN_TIMEOUT * 2); + } + + /** + * @return Spi. + */ + private TcpCommunicationSpi createSpi() { + TcpCommunicationSpi spi = new TcpCommunicationSpi(); + + spi.setLocalPort(GridTestUtils.getNextCommPort(getClass())); + spi.setIdleConnectionTimeout(IDLE_CONN_TIMEOUT); + spi.setConnectTimeout(10000); + + return spi; + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + spi = createSpi(); + + spiRsrc = new IgniteTestResources(getMBeanServer()); + + locNode = new GridTestNode(spiRsrc.getNodeId()); + + GridSpiTestContext ctx = initSpiContext(); + + ctx.setLocalNode(locNode); + + info(">>> Initialized context: nodeId=" + ctx.localNode().id()); + + spiRsrc.inject(spi); + + lsnr = new MessageListener(spiRsrc.getNodeId()); + + spi.setListener(lsnr); + + Map<String, Object> attrs = spi.getNodeAttributes(); + + locNode.setAttributes(attrs); + + spi.spiStart(getTestIgniteInstanceName()); + + spi.onContextInitialized(ctx); + + IgniteTestResources remoteRsrc = new IgniteTestResources(); + + remoteNode = new GridTestNode(remoteRsrc.getNodeId()); + + remoteNode.setAttributes(attrs); + + remoteNode.setAttribute(U.spiAttribute(spi, TcpCommunicationSpi.ATTR_ADDRS), + Collections.singleton(remoteAddr)); + + ctx.remoteNodes().add(remoteNode); + } + + /** + * @return Configured MBean server. + * @throws Exception If failed. + */ + private MBeanServer getMBeanServer() throws Exception { + HttpAdaptor mbeanAdaptor = new HttpAdaptor(); + + MBeanServer mbeanSrv = MBeanServerFactory.createMBeanServer(); + + mbeanAdaptor.setPort( + Integer.valueOf(GridTestProperties.getProperty("comm.mbeanserver.selftest.baseport"))); + + mbeanSrv.registerMBean(mbeanAdaptor, new ObjectName("mbeanAdaptor:protocol=HTTP")); + + mbeanAdaptor.start(); + + return mbeanSrv; + } + + /** {@inheritDoc} */ + @SuppressWarnings({"NullableProblems"}) + @Override protected void afterTestsStopped() throws Exception { + spi.setListener(null); + + spi.spiStop(); + + spiRsrc.stopThreads(); + + tearDown(); + } + + /** + * @return 0 to disable test timeouts. + */ + @Override protected long getTestTimeout() { + return 0; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java deleted file mode 100644 index bb57d70..0000000 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java +++ /dev/null @@ -1,285 +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.spi.communication.tcp; - -import java.util.Collections; -import java.util.Deque; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; -import mx4j.tools.adaptor.http.HttpAdaptor; -import org.apache.ignite.IgniteException; -import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgniteRunnable; -import org.apache.ignite.plugin.extensions.communication.Message; -import org.apache.ignite.spi.communication.CommunicationListener; -import org.apache.ignite.spi.communication.GridTestMessage; -import org.apache.ignite.testframework.GridSpiTestContext; -import org.apache.ignite.testframework.GridTestNode; -import org.apache.ignite.testframework.GridTestUtils; -import org.apache.ignite.testframework.config.GridTestProperties; -import org.apache.ignite.testframework.junits.IgniteTestResources; -import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; - -/** - * Class for multithreaded {@link TcpCommunicationSpi} test. - */ -@SuppressWarnings({"JUnitAbstractTestClassNamingConvention"}) -public class GridTcpCommunicationSpiLanTest extends GridSpiAbstractTest<TcpCommunicationSpi> { - /** Connection idle timeout */ - public static final int IDLE_CONN_TIMEOUT = 2000; - - /** Count of threads sending messages. */ - public static final int THREAD_CNT = 5; - - /** Message id sequence. */ - private AtomicLong msgId = new AtomicLong(); - - /** SPI resource. */ - private IgniteTestResources spiRsrc; - - /** SPI */ - private TcpCommunicationSpi spi; - - /** Listener. */ - private MessageListener lsnr; - - /** Local node. */ - private GridTestNode locNode; - - /** Remote node. */ - private GridTestNode remoteNode; - - /** Flag indicating if listener should reject messages. */ - private boolean reject; - - // TODO: change this value to ip of remote node running testRunReceiver - /** Address of remote machine running receive test. */ - private static final String remoteAddr = "172.1.1.36"; - - /** */ - public GridTcpCommunicationSpiLanTest() { - super(false); - } - - /** - * Accumulating listener. - */ - @SuppressWarnings({"deprecation"}) - private class MessageListener implements CommunicationListener<Message> { - /** Node id of local node. */ - private final UUID locNodeId; - - /** Received messages by node. */ - private Deque<GridTestMessage> rcvdMsgs = new ConcurrentLinkedDeque<>(); - - /** Count of messages received from remote nodes */ - private AtomicInteger rmtMsgCnt = new AtomicInteger(); - - /** - * @param locNodeId Local node ID. - */ - MessageListener(UUID locNodeId) { - assert locNodeId != null; - - this.locNodeId = locNodeId; - } - - /** {@inheritDoc} */ - @Override public void onMessage(UUID nodeId, Message msg, IgniteRunnable msgC) { - msgC.run(); - - if (msg instanceof GridTestMessage) { - GridTestMessage testMsg = (GridTestMessage)msg; - - if (!testMsg.getSourceNodeId().equals(nodeId)) - fail("Listener nodeId is not equal to message nodeId."); - - if (!reject) - rcvdMsgs.offer(testMsg); - - if (!locNodeId.equals(nodeId)) - rmtMsgCnt.incrementAndGet(); - } - } - - /** {@inheritDoc} */ - @Override public void onDisconnected(UUID nodeId) { - // No-op. - } - - /** - * @return Count of messages received from remote node. - */ - public int remoteMessageCount() { - return rmtMsgCnt.get(); - } - } - - /** - * @throws Exception If failed. - */ - public void testRunReceiver() throws Exception { - info(">>> Starting receiving SPI. <<<"); - - reject = true; - - while (!Thread.currentThread().isInterrupted()) { - U.sleep(5000); - - info(">>>" + lsnr.remoteMessageCount() + " messages received from remote node"); - } - } - - /** - * @throws Exception If failed. - */ - public void testRunSender() throws Exception { - reject = true; - - info(">>> Starting send to remote node multithreaded test. <<<"); - - final AtomicInteger cntr = new AtomicInteger(); - - final int msgCnt = 10000; - - long start = System.currentTimeMillis(); - - IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { - @Override public void run() { - try { - while (cntr.getAndIncrement() < msgCnt) { - GridTestMessage msg = new GridTestMessage(locNode.id(), msgId.getAndIncrement(), 0); - - msg.payload(new byte[13 * 1024]); - - spi.sendMessage(remoteNode, msg); - } - } - catch (IgniteException e) { - fail("Unable to send message: " + e.getMessage()); - } - } - }, THREAD_CNT, "message-sender"); - - fut.get(); - - info(">>> Sent all messages in " + (System.currentTimeMillis() - start) + " milliseconds"); - - assertEquals("Invalid count of messages was sent", msgCnt, msgId.get()); - - U.sleep(IDLE_CONN_TIMEOUT * 2); - } - - /** - * @return Spi. - */ - private TcpCommunicationSpi createSpi() { - TcpCommunicationSpi spi = new TcpCommunicationSpi(); - - spi.setLocalPort(GridTestUtils.getNextCommPort(getClass())); - spi.setIdleConnectionTimeout(IDLE_CONN_TIMEOUT); - spi.setConnectTimeout(10000); - - return spi; - } - - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - spi = createSpi(); - - spiRsrc = new IgniteTestResources(getMBeanServer()); - - locNode = new GridTestNode(spiRsrc.getNodeId()); - - GridSpiTestContext ctx = initSpiContext(); - - ctx.setLocalNode(locNode); - - info(">>> Initialized context: nodeId=" + ctx.localNode().id()); - - spiRsrc.inject(spi); - - lsnr = new MessageListener(spiRsrc.getNodeId()); - - spi.setListener(lsnr); - - Map<String, Object> attrs = spi.getNodeAttributes(); - - locNode.setAttributes(attrs); - - spi.spiStart(getTestIgniteInstanceName()); - - spi.onContextInitialized(ctx); - - IgniteTestResources remoteRsrc = new IgniteTestResources(); - - remoteNode = new GridTestNode(remoteRsrc.getNodeId()); - - remoteNode.setAttributes(attrs); - - remoteNode.setAttribute(U.spiAttribute(spi, TcpCommunicationSpi.ATTR_ADDRS), - Collections.singleton(remoteAddr)); - - ctx.remoteNodes().add(remoteNode); - } - - /** - * @return Configured MBean server. - * @throws Exception If failed. - */ - private MBeanServer getMBeanServer() throws Exception { - HttpAdaptor mbeanAdaptor = new HttpAdaptor(); - - MBeanServer mbeanSrv = MBeanServerFactory.createMBeanServer(); - - mbeanAdaptor.setPort( - Integer.valueOf(GridTestProperties.getProperty("comm.mbeanserver.selftest.baseport"))); - - mbeanSrv.registerMBean(mbeanAdaptor, new ObjectName("mbeanAdaptor:protocol=HTTP")); - - mbeanAdaptor.start(); - - return mbeanSrv; - } - - /** {@inheritDoc} */ - @SuppressWarnings({"NullableProblems"}) - @Override protected void afterTestsStopped() throws Exception { - spi.setListener(null); - - spi.spiStop(); - - spiRsrc.stopThreads(); - - tearDown(); - } - - /** - * @return 0 to disable test timeouts. - */ - @Override protected long getTestTimeout() { - return 0; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java index d37e22f..0b533d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java @@ -24,6 +24,7 @@ import org.apache.ignite.internal.binary.BinaryBasicNameMapperSelfTest; import org.apache.ignite.internal.binary.BinaryConfigurationConsistencySelfTest; import org.apache.ignite.internal.binary.BinaryConfigurationCustomSerializerSelfTest; import org.apache.ignite.internal.binary.BinaryEnumsSelfTest; +import org.apache.ignite.internal.binary.BinaryFieldExtractionSelfTest; import org.apache.ignite.internal.binary.BinaryFieldsHeapSelfTest; import org.apache.ignite.internal.binary.BinaryFieldsOffheapSelfTest; import org.apache.ignite.internal.binary.BinaryFooterOffsetsHeapSelfTest; @@ -63,12 +64,17 @@ import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBi import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreObjectsSelfTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataMultinodeTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicOnheapSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedOnheapSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedSelfTest; import org.apache.ignite.internal.processors.cache.binary.distributed.replicated.GridCacheBinaryObjectsReplicatedSelfTest; import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsAtomicLocalSelfTest; +import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalOnheapSelfTest; import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteBinaryMetadataUpdateChangingTopologySelfTest; @@ -101,6 +107,7 @@ public class IgniteBinaryObjectsTestSuite extends TestSuite { suite.addTestSuite(BinaryObjectBuilderDefaultMappersSelfTest.class); suite.addTestSuite(BinaryObjectBuilderSimpleNameLowerCaseMappersSelfTest.class); suite.addTestSuite(BinaryObjectBuilderAdditionalSelfTest.class); + //suite.addTestSuite(BinaryFieldExtractionSelfTest.class); suite.addTestSuite(BinaryFieldsHeapSelfTest.class); suite.addTestSuite(BinaryFieldsOffheapSelfTest.class); suite.addTestSuite(BinaryFooterOffsetsHeapSelfTest.class); @@ -124,12 +131,17 @@ public class IgniteBinaryObjectsTestSuite extends TestSuite { suite.addTestSuite(BinaryFooterOffsetsOffheapNonCompactSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsLocalSelfTest.class); + //suite.addTestSuite(GridCacheBinaryObjectsLocalOnheapSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsAtomicLocalSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsReplicatedSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsPartitionedSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.class); + //suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.class); + //suite.addTestSuite(GridCacheBinaryObjectsPartitionedOnheapSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsAtomicSelfTest.class); + //suite.addTestSuite(GridCacheBinaryObjectsAtomicOnheapSelfTest.class); suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledSelfTest.class); + //suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.class); suite.addTestSuite(GridCacheBinaryStoreObjectsSelfTest.class); suite.addTestSuite(GridCacheBinaryStoreBinariesDefaultMappersSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index 80e8319..6bbf0fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -26,6 +26,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDa import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDiscoveryDataStructuresTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureUniqueNameTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureWithJobTest; +import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructuresNoClassOnServerTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteSequenceInternalCleanupTest; import org.apache.ignite.internal.processors.cache.datastructures.SemaphoreFailoverNoWaitingAcquirerTest; import org.apache.ignite.internal.processors.cache.datastructures.SemaphoreFailoverSafeReleasePermitsTest; @@ -44,6 +45,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueRotativeMultiNodeTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicReferenceApiSelfTest; +import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicReferenceMultiNodeTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSequenceMultiThreadedTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSequenceTxSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSetFailoverSelfTest; @@ -68,6 +70,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Ig import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSemaphoreSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceApiSelfTest; +import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceMultiNodeTest; import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicStampedApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedDataStructuresFailoverSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedQueueApiSelfTest; @@ -164,10 +167,14 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedAtomicReferenceApiSelfTest.class)); suite.addTest(new TestSuite(GridCacheReplicatedAtomicReferenceApiSelfTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedAtomicReferenceMultiNodeTest.class)); + //suite.addTest(new TestSuite(GridCacheReplicatedAtomicReferenceMultiNodeTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedNodeRestartTxSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueJoinedNodeSelfTest.class)); suite.addTest(new TestSuite(IgniteDataStructureUniqueNameTest.class)); + //suite.addTest(new TestSuite(IgniteDataStructuresNoClassOnServerTest.class)); suite.addTest(new TestSuite(IgniteClientDataStructuresTest.class)); suite.addTest(new TestSuite(IgniteClientDiscoveryDataStructuresTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java index 6668755..9cb3741 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java @@ -32,6 +32,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedFailoverSelfTest; import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteChangingBaselineDownCachePutAllFailoverTest; import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteChangingBaselineUpCachePutAllFailoverTest; +import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteStableBaselineCachePutAllFailoverTest; +import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteStableBaselineCacheRemoveFailoverTest; /** * @@ -61,9 +63,11 @@ public class IgniteCacheFailoverTestSuite2 { suite.addTestSuite(CachePutAllFailoverAtomicTest.class); suite.addTestSuite(CachePutAllFailoverTxTest.class); + //suite.addTestSuite(IgniteStableBaselineCachePutAllFailoverTest.class); + //suite.addTestSuite(IgniteStableBaselineCacheRemoveFailoverTest.class); suite.addTestSuite(IgniteChangingBaselineDownCachePutAllFailoverTest.class); suite.addTestSuite(IgniteChangingBaselineUpCachePutAllFailoverTest.class); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index bc46055..7d40a6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@ -78,6 +78,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicWit import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiMultithreadedSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalWithGroupFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.persistence.standbycluster.extended.GridActivateExtensionTest; import org.apache.ignite.testframework.junits.GridAbstractTest; /** @@ -173,6 +174,8 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedMultiNodeWithGroupFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearDisabledMultiNodeWithGroupFullApiSelfTest.class); + //suite.addTestSuite(GridActivateExtensionTest.class); + return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index f8a378f..81c3216 100755 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -35,8 +35,10 @@ import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreTest; import org.apache.ignite.cache.store.jdbc.GridCacheJdbcBlobStoreMultithreadedSelfTest; import org.apache.ignite.cache.store.jdbc.GridCacheJdbcBlobStoreSelfTest; import org.apache.ignite.cache.store.jdbc.JdbcTypesDefaultTransformerTest; +import org.apache.ignite.internal.IgniteInternalCacheRemoveTest; import org.apache.ignite.internal.managers.IgniteDiagnosticMessagesMultipleConnectionsTest; import org.apache.ignite.internal.managers.IgniteDiagnosticMessagesTest; +import org.apache.ignite.internal.managers.communication.GridIoManagerSelfTest; import org.apache.ignite.internal.managers.communication.IgniteCommunicationBalanceMultipleConnectionsTest; import org.apache.ignite.internal.managers.communication.IgniteCommunicationBalancePairedConnectionsTest; import org.apache.ignite.internal.managers.communication.IgniteCommunicationBalanceTest; @@ -44,6 +46,7 @@ import org.apache.ignite.internal.managers.communication.IgniteCommunicationSslB import org.apache.ignite.internal.managers.communication.IgniteIoTestMessagesTest; import org.apache.ignite.internal.managers.communication.IgniteVariousConnectionNumberTest; import org.apache.ignite.internal.processors.cache.CacheAffinityCallSelfTest; +import org.apache.ignite.internal.processors.cache.CacheAtomicSingleMessageCountSelfTest; import org.apache.ignite.internal.processors.cache.CacheDeferredDeleteQueueTest; import org.apache.ignite.internal.processors.cache.CacheDeferredDeleteSanitySelfTest; import org.apache.ignite.internal.processors.cache.CacheFutureExceptionSelfTest; @@ -56,16 +59,25 @@ import org.apache.ignite.internal.processors.cache.GridCacheAffinityApiSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheAffinityMapperSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheAsyncOperationsLimitSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheAtomicUsersAffinityMapperSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheClearAllSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheClearLocallySelfTest; import org.apache.ignite.internal.processors.cache.GridCacheColocatedTxStoreExceptionSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheConcurrentGetCacheOnClientTest; import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheConfigurationConsistencySelfTest; import org.apache.ignite.internal.processors.cache.GridCacheConfigurationValidationSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheFullTextQueryMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheKeyCheckNearEnabledSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheKeyCheckSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheLeakTest; import org.apache.ignite.internal.processors.cache.GridCacheLifecycleAwareSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheLocalTxStoreExceptionSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheMissingCommitVersionSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheMixedPartitionExchangeSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheMultiUpdateLockSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheMvccFlagsTest; import org.apache.ignite.internal.processors.cache.GridCacheMvccManagerSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheMvccPartitionedSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheMvccSelfTest; @@ -76,12 +88,17 @@ import org.apache.ignite.internal.processors.cache.GridCacheOffHeapMultiThreaded import org.apache.ignite.internal.processors.cache.GridCachePartitionedLocalStoreSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheReplicatedLocalStoreSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheReplicatedTxStoreExceptionSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheReplicatedUsersAffinityMapperSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheReturnValueTransferSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheSlowTxWarnTest; import org.apache.ignite.internal.processors.cache.GridCacheStopSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheStorePutxSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheStoreValueBytesSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheSwapPreloadSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerLoadTest; import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheTxPartitionedLocalStoreSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheTxUsersAffinityMapperSelfTest; import org.apache.ignite.internal.processors.cache.GridDataStorageConfigurationConsistencySelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalInvokeTest; @@ -89,6 +106,7 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalWithSto import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearEnabledInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStopBusySelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicWithStoreInvokeTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheBinaryEntryProcessorSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicLocalTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicReplicatedTest; import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicTest; @@ -99,15 +117,22 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerTxTes import org.apache.ignite.internal.processors.cache.IgniteCacheEntryProcessorCallTest; import org.apache.ignite.internal.processors.cache.IgniteCacheManyAsyncOperationsTest; import org.apache.ignite.internal.processors.cache.IgniteCacheNearLockValueSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheObjectPutSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheSerializationSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheStartStopLoadTest; import org.apache.ignite.internal.processors.cache.IgniteCacheTransactionalStopBusySelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheTxInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheTxLocalInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheTxNearEnabledInvokeTest; +import org.apache.ignite.internal.processors.cache.IgniteCachingProviderSelfTest; import org.apache.ignite.internal.processors.cache.IgniteClientAffinityAssignmentSelfTest; import org.apache.ignite.internal.processors.cache.IgniteIncompleteCacheObjectSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteOnePhaseCommitNearSelfTest; import org.apache.ignite.internal.processors.cache.IgnitePutAllLargeBatchSelfTest; import org.apache.ignite.internal.processors.cache.IgnitePutAllUpdateNonPreloadedPartitionSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteStaticCacheStartSelfTest; import org.apache.ignite.internal.processors.cache.IgniteTxConfigCacheSelfTest; +import org.apache.ignite.internal.processors.cache.InterceptorWithKeepBinaryCacheFullApiTest; import org.apache.ignite.internal.processors.cache.context.IgniteCacheAtomicExecutionContextTest; import org.apache.ignite.internal.processors.cache.context.IgniteCacheContinuousExecutionContextTest; import org.apache.ignite.internal.processors.cache.context.IgniteCacheIsolatedExecutionContextTest; @@ -322,6 +347,7 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(CacheTxFastFinishTest.class); + //suite.addTestSuite(GridIoManagerSelfTest.class); suite.addTestSuite(IgniteVariousConnectionNumberTest.class); suite.addTestSuite(IgniteCommunicationBalanceTest.class); suite.addTestSuite(IgniteCommunicationBalancePairedConnectionsTest.class); @@ -337,6 +363,31 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(CacheStoreReadFromBackupTest.class); suite.addTestSuite(CacheTransactionalStoreReadFromBackupTest.class); + //suite.addTestSuite(CacheAtomicSingleMessageCountSelfTest.class); + //suite.addTestSuite(GridCacheAtomicUsersAffinityMapperSelfTest.class); + //suite.addTestSuite(GridCacheClearLocallySelfTest.class); + //suite.addTestSuite(GridCacheConcurrentGetCacheOnClientTest.class); + //suite.addTestSuite(GridCacheFullTextQueryMultithreadedSelfTest.class); + //suite.addTestSuite(GridCacheKeyCheckNearEnabledSelfTest.class); + //suite.addTestSuite(GridCacheKeyCheckSelfTest.class); + //suite.addTestSuite(GridCacheLeakTest.class); + //suite.addTestSuite(GridCacheMultiUpdateLockSelfTest.class); + //suite.addTestSuite(GridCacheMvccFlagsTest.class); + //suite.addTestSuite(GridCacheReplicatedUsersAffinityMapperSelfTest.class); + //suite.addTestSuite(GridCacheReturnValueTransferSelfTest.class); + //suite.addTestSuite(GridCacheSlowTxWarnTest.class); + //suite.addTestSuite(GridCacheTtlManagerLoadTest.class); + //suite.addTestSuite(GridCacheTxUsersAffinityMapperSelfTest.class); + //suite.addTestSuite(IgniteInternalCacheRemoveTest.class); + //suite.addTestSuite(IgniteCacheBinaryEntryProcessorSelfTest.class); + //suite.addTestSuite(IgniteCacheObjectPutSelfTest.class); + //suite.addTestSuite(IgniteCacheSerializationSelfTest.class); + //suite.addTestSuite(IgniteCacheStartStopLoadTest.class); + //suite.addTestSuite(IgniteCachingProviderSelfTest.class); + //suite.addTestSuite(IgniteOnePhaseCommitNearSelfTest.class); + //suite.addTestSuite(IgniteStaticCacheStartSelfTest.class); + //suite.addTestSuite(InterceptorWithKeepBinaryCacheFullApiTest.class); + return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index 6eca728..79e1e4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -21,6 +21,7 @@ import junit.framework.TestSuite; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionBackupFilterSelfTest; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionExcludeNeighborsSelfTest; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionSelfTest; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionStandardHashSelfTest; import org.apache.ignite.internal.IgniteReflectionFactorySelfTest; import org.apache.ignite.internal.processors.cache.CacheComparatorTest; @@ -65,16 +66,22 @@ import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClient import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheServerNodeConcurrentStart; import org.apache.ignite.internal.processors.cache.distributed.dht.CachePartitionPartialCountersMapSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedDebugTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedOptimisticTransactionSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPreloadRestartSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPrimarySyncSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedTxSingleThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtAtomicEvictionNearReadersSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEntrySelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEntrySetSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionNearReadersSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionsDisabledSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtMappingSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtMultiBackupTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadBigDataSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDelayedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadMessageCountTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadMultiThreadedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadOnheapSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadPutGetSelfTest; @@ -82,10 +89,14 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtP import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadStartStopSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadUnloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledLockSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledMetricsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTopologyChangeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheClearDuringRebalanceTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheContainsKeyColocatedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCrossCacheTxNearEnabledSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteTxConsistencyColocatedRestartSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearReadersSelfTest; @@ -107,7 +118,9 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedBasicOpSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedBasicStoreMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedBasicStoreSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedEntryLockSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedEventSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedEvictionSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedExplicitLockNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedGetAndTransformStoreSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedLoadCacheSelfTest; @@ -116,20 +129,30 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiThreadedPutGetSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNestedTxTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedPreloadLifecycleSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedStorePutSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxConcurrentGetTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxReadTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxSingleThreadedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheRendezvousAffinityClientSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheStoreUpdateTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheContainsKeyNearSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearTxRollbackTest; +import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheMultithreadedUpdateTest; +import org.apache.ignite.internal.processors.cache.distributed.near.NearCachePutAllMultinodeTest; import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheSyncUpdateTest; import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedJobExecutionTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicBasicStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGetAndTransformStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicApiSelfTest; +import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicStoreMultithreadedSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicStoreSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEventSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEvictionEventSelfTest; @@ -139,6 +162,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalLoadAllSe import org.apache.ignite.internal.processors.cache.local.GridCacheLocalLockSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalMultithreadedSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxReadTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxSingleThreadedSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicyInitializationTest; @@ -161,6 +185,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { // Local cache. suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class); suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class); + //suite.addTestSuite(GridCacheLocalBasicStoreMultithreadedSelfTest.class); suite.addTestSuite(GridCacheLocalAtomicBasicStoreSelfTest.class); suite.addTestSuite(GridCacheLocalGetAndTransformStoreSelfTest.class); suite.addTestSuite(GridCacheLocalAtomicGetAndTransformStoreSelfTest.class); @@ -168,6 +193,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTestSuite(GridCacheLocalLockSelfTest.class); suite.addTestSuite(GridCacheLocalMultithreadedSelfTest.class); suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class); + //suite.addTestSuite(GridCacheLocalTxReadTest.class); suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class); suite.addTestSuite(GridCacheLocalEventSelfTest.class); suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class); @@ -190,6 +216,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCacheNearReaderPreloadSelfTest.class)); suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.class)); + //suite.addTest(new TestSuite(RendezvousAffinityFunctionSelfTest.class)); suite.addTest(new TestSuite(RendezvousAffinityFunctionExcludeNeighborsSelfTest.class)); suite.addTest(new TestSuite(RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest.class)); suite.addTest(new TestSuite(RendezvousAffinityFunctionStandardHashSelfTest.class)); @@ -210,6 +237,13 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedNodeFailureSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedExplicitLockNodeFailureSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedTxSingleThreadedSelfTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedEntryLockSelfTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedEvictionSelfTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedNestedTxTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedStorePutSelfTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedTxConcurrentGetTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedTxMultiNodeSelfTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedTxReadTest.class)); suite.addTest(new TestSuite(GridCacheColocatedTxSingleThreadedSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedTxTimeoutSelfTest.class)); suite.addTest(new TestSuite(GridCacheFinishPartitionsSelfTest.class)); @@ -280,10 +314,14 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(CacheConcurrentReadThroughTest.class)); suite.addTest(new TestSuite(GridNearCacheStoreUpdateTest.class)); + //suite.addTest(new TestSuite(NearCacheMultithreadedUpdateTest.class)); + //suite.addTest(new TestSuite(NearCachePutAllMultinodeTest.class)); suite.addTest(new TestSuite(IgniteOnePhaseCommitInvokeTest.class)); suite.addTest(new TestSuite(IgniteCacheNoSyncForGetTest.class)); + //suite.addTest(new TestSuite(IgniteCacheContainsKeyNearSelfTest.class)); + //suite.addTest(new TestSuite(IgniteCacheNearTxRollbackTest.class)); suite.addTest(new TestSuite(IgniteOnePhaseCommitNearReadersTest.class)); suite.addTest(new TestSuite(IgniteNearClientCacheCloseTest.class)); @@ -304,6 +342,17 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(IgniteReflectionFactorySelfTest.class)); + //suite.addTest(new TestSuite(GridCacheColocatedDebugTest.class)); + //suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class)); + //suite.addTest(new TestSuite(GridCacheDhtEntrySetSelfTest.class)); + //suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class)); + //suite.addTest(new TestSuite(GridCacheDhtMultiBackupTest.class)); + //suite.addTest(new TestSuite(GridCacheDhtPreloadMessageCountTest.class)); + //suite.addTest(new TestSuite(GridCachePartitionedNearDisabledMetricsSelfTest.class)); + //suite.addTest(new TestSuite(IgniteCacheContainsKeyColocatedSelfTest.class)); + //suite.addTest(new TestSuite(IgniteCrossCacheTxNearEnabledSelfTest.class)); + //suite.addTest(new TestSuite(IgniteTxConsistencyColocatedRestartSelfTest.class)); + return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java index 50549ca..188a035 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java @@ -55,18 +55,25 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicApiTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicOpSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicStoreSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEntrySetSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEventDisabledSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionEventSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedGetAndTransformStoreSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedLockSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMarshallerTxTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeLockSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNodeFailureSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOnheapFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOnheapMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedP2PDisabledByteArrayValuesSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedP2PEnabledByteArrayValuesSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedPreloadEventsSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxConcurrentGetTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxMultiNodeBasicTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxReadTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxSingleThreadedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheSyncReplicatedPreloadSelfTest; @@ -120,6 +127,14 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTestSuite(GridCacheReplicatedPreloadLifecycleSelfTest.class); suite.addTestSuite(GridCacheSyncReplicatedPreloadSelfTest.class); + //suite.addTestSuite(GridCacheReplicatedEntrySetSelfTest.class); + //suite.addTestSuite(GridCacheReplicatedMarshallerTxTest.class); + //suite.addTestSuite(GridCacheReplicatedOnheapFullApiSelfTest.class); + //suite.addTestSuite(GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.class); + //suite.addTestSuite(GridCacheReplicatedTxConcurrentGetTest.class); + //suite.addTestSuite(GridCacheReplicatedTxMultiNodeBasicTest.class); + //suite.addTestSuite(GridCacheReplicatedTxReadTest.class); + // TODO GG-11141. // suite.addTestSuite(GridCacheDeploymentSelfTest.class); // suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 321046b..2cc5f0b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -20,6 +20,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.cache.store.CacheStoreListenerRWThroughDisabledAtomicCacheTest; import org.apache.ignite.cache.store.CacheStoreListenerRWThroughDisabledTransactionalCacheTest; +import org.apache.ignite.cache.store.CacheStoreSessionListenerLifecycleSelfTest; import org.apache.ignite.cache.store.CacheStoreSessionListenerWriteBehindEnabledTest; import org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListenerSelfTest; import org.apache.ignite.internal.processors.GridCacheTxLoadFromStoreOnLockSelfTest; @@ -288,6 +289,7 @@ public class IgniteCacheTestSuite4 extends TestSuite { suite.addTestSuite(CacheOffheapMapEntrySelfTest.class); suite.addTestSuite(CacheJdbcStoreSessionListenerSelfTest.class); + //suite.addTestSuite(CacheStoreSessionListenerLifecycleSelfTest.class); suite.addTestSuite(CacheStoreListenerRWThroughDisabledAtomicCacheTest.class); suite.addTestSuite(CacheStoreListenerRWThroughDisabledTransactionalCacheTest.class); suite.addTestSuite(CacheStoreSessionListenerWriteBehindEnabledTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java index 1c74d6d..dafc44f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java @@ -43,7 +43,10 @@ import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheGroups import org.apache.ignite.internal.processors.cache.distributed.IgniteCachePartitionLossPolicySelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheTxIteratorSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.NotMappedPartitionInTxTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheAtomicProtocolTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheContainsKeyColocatedAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheContainsKeyNearAtomicSelfTest; import org.apache.ignite.internal.processors.cache.distributed.rebalancing.CacheManualRebalancingTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheSyncRebalanceModeSelfTest; import org.apache.ignite.internal.processors.cache.store.IgniteCacheWriteBehindNoUpdateSelfTest; @@ -104,6 +107,10 @@ public class IgniteCacheTestSuite5 extends TestSuite { suite.addTestSuite(ConcurrentCacheStartTest.class); + + //suite.addTestSuite(GridCacheAtomicPreloadSelfTest.class); + //suite.addTestSuite(IgniteCacheContainsKeyColocatedAtomicSelfTest.class); + //suite.addTestSuite(IgniteCacheContainsKeyNearAtomicSelfTest.class); return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/de9227d7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java index 4af9e1f..6f3df0b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java @@ -25,14 +25,18 @@ import org.apache.ignite.internal.processors.cache.ReplicatedAtomicCacheGetsDist import org.apache.ignite.internal.processors.cache.ReplicatedTransactionalOptimisticCacheGetsDistributionTest; import org.apache.ignite.internal.processors.cache.ReplicatedTransactionalPessimisticCacheGetsDistributionTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteExchangeLatchManagerCoordinatorFailTest; +import org.apache.ignite.internal.processors.cache.distributed.CacheClientsConcurrentStartTest; import org.apache.ignite.internal.processors.cache.distributed.CacheExchangeMergeTest; import org.apache.ignite.internal.processors.cache.distributed.CachePartitionStateTest; +import org.apache.ignite.internal.processors.cache.distributed.CacheTryLockMultithreadedTest; import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionEvictionDuringReadThroughSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCache150ClientsTest; +import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientMultiNodeUpdateTopologyLockTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheThreadLocalTxTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeMultiServerTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeTest; import org.apache.ignite.internal.processors.cache.distributed.IgnitePessimisticTxSuspendResumeTest; +import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingOrderingTest; import org.apache.ignite.internal.processors.cache.transactions.TxLabelTest; import org.apache.ignite.internal.processors.cache.transactions.TxMultiCacheAsyncOpsTest; import org.apache.ignite.internal.processors.cache.transactions.TxOnCachesStartTest; @@ -105,6 +109,11 @@ public class IgniteCacheTestSuite6 extends TestSuite { suite.addTestSuite(IgniteExchangeLatchManagerCoordinatorFailTest.class); + //suite.addTestSuite(CacheClientsConcurrentStartTest.class); + //suite.addTestSuite(CacheTryLockMultithreadedTest.class); + //suite.addTestSuite(GridCacheRebalancingOrderingTest.class); + //suite.addTestSuite(IgniteCacheClientMultiNodeUpdateTopologyLockTest.class); + return suite; } }
