http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java index ccf01c6..930b5d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java @@ -35,6 +35,8 @@ public class GridNioSslSelfTest extends GridNioSelfTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { + super.beforeTestsStarted(); + sslCtx = GridTestUtils.sslContext(); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java index c33014b..de6cd85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java @@ -70,11 +70,11 @@ public class GridToStringBuilderSelfTest extends GridCommonAbstractTest { } /** - * TODO: IGNITE-602. - * * @throws Exception If failed. */ public void testToStringCheckAdvancedRecursionPrevention() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-602";); + ArrayList<Object> list1 = new ArrayList<>(); ArrayList<Object> list2 = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java index 095a404..4164fda 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java @@ -17,6 +17,7 @@ package org.apache.ignite.marshaller; +import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.jsr166.*; @@ -27,11 +28,15 @@ import java.util.concurrent.*; */ public class MarshallerContextTestImpl extends MarshallerContextAdapter { /** */ - private final ConcurrentMap<Integer, String> map = new ConcurrentHashMap8<>(); + private final static ConcurrentMap<Integer, String> map = new ConcurrentHashMap8<>(); /** {@inheritDoc} */ - @Override protected boolean registerClassName(int id, String clsName) { - map.putIfAbsent(id, clsName); + @Override protected boolean registerClassName(int id, String clsName) throws IgniteCheckedException { + String oldClsName = map.putIfAbsent(id, clsName); + + if (oldClsName != null && !oldClsName.equals(clsName)) + throw new IgniteCheckedException("Duplicate ID [id=" + id + ", oldClsName=" + oldClsName + ", clsName=" + + clsName + ']'); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index b7838be..455bc8c 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; -import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -185,8 +184,6 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - ((OptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setIpFinder(ipFinder); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java index c71ccbb..6b3ad63 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -98,6 +98,8 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest */ @SuppressWarnings("unchecked") public void testDeployment() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-934";); + Ignite ignite = startGrid(GRID_NAME); Class cls = getExternalClassLoader().loadClass(TEST_TASK_1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java index 28eb687..51a7574 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java @@ -212,7 +212,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { for (ClusterNode node : subgrid) { if (node.id().equals(arg)) - return Collections.singletonMap(new TestJob(arg), node); + return Collections.singletonMap(new DeployementTestJob(arg), node); } throw new IgniteException("Failed to find target node: " + arg); @@ -230,7 +230,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { /** * Simple job class. */ - public static class TestJob extends ComputeJobAdapter { + public static class DeployementTestJob extends ComputeJobAdapter { /** Ignite instance. */ @IgniteInstanceResource private Ignite ignite; @@ -238,7 +238,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { /** * @param nodeId Node ID for node this job is supposed to execute on. */ - public TestJob(UUID nodeId) { super(nodeId); } + public DeployementTestJob(UUID nodeId) { super(nodeId); } /** {@inheritDoc} */ @Override public Serializable execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java index a6e3411..e62141e 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRemoteClassLoadersSelfTest.java @@ -43,9 +43,9 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { // Override P2P configuration to exclude Task and Job classes cfg.setPeerClassLoadingLocalClassPathExclude( - GridP2PTestTask.class.getName(), - GridP2PTestTask1.class.getName(), - GridP2PTestJob.class.getName(), + GridP2PRemoteTestTask.class.getName(), + GridP2PRemoteTestTask1.class.getName(), + GridP2PRemoteTestJob.class.getName(), GridP2PRemoteClassLoadersSelfTest.class.getName() ); @@ -73,13 +73,14 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { ClassLoader tstClsLdr = new GridTestClassLoader( Collections.<String, String>emptyMap(), getClass().getClassLoader(), - GridP2PTestTask.class.getName(), GridP2PTestTask1.class.getName(), GridP2PTestJob.class.getName()); + GridP2PRemoteTestTask.class.getName(), GridP2PRemoteTestTask1.class.getName(), + GridP2PRemoteTestJob.class.getName()); Class<? extends ComputeTask<?, ?>> task1 = - (Class<? extends ComputeTask<?, ?>>) tstClsLdr.loadClass(GridP2PTestTask.class.getName()); + (Class<? extends ComputeTask<?, ?>>) tstClsLdr.loadClass(GridP2PRemoteTestTask.class.getName()); Class<? extends ComputeTask<?, ?>> task2 = - (Class<? extends ComputeTask<?, ?>>) tstClsLdr.loadClass(GridP2PTestTask1.class.getName()); + (Class<? extends ComputeTask<?, ?>>) tstClsLdr.loadClass(GridP2PRemoteTestTask1.class.getName()); Object res1 = ignite1.compute().execute(task1.newInstance(), null); @@ -124,19 +125,19 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { ClassLoader tstClsLdr1 = new GridTestClassLoader( Collections.EMPTY_MAP, getClass().getClassLoader(), - GridP2PTestTask.class.getName(), GridP2PTestJob.class.getName() + GridP2PRemoteTestTask.class.getName(), GridP2PRemoteTestJob.class.getName() ); ClassLoader tstClsLdr2 = new GridTestClassLoader( Collections.EMPTY_MAP, getClass().getClassLoader(), - GridP2PTestTask1.class.getName(), GridP2PTestJob.class.getName()); + GridP2PRemoteTestTask1.class.getName(), GridP2PRemoteTestJob.class.getName()); Class<? extends ComputeTask<?, ?>> task1 = - (Class<? extends ComputeTask<?, ?>>) tstClsLdr1.loadClass(GridP2PTestTask.class.getName()); + (Class<? extends ComputeTask<?, ?>>) tstClsLdr1.loadClass(GridP2PRemoteTestTask.class.getName()); Class<? extends ComputeTask<?, ?>> task2 = - (Class<? extends ComputeTask<?, ?>>) tstClsLdr2.loadClass(GridP2PTestTask1.class.getName()); + (Class<? extends ComputeTask<?, ?>>) tstClsLdr2.loadClass(GridP2PRemoteTestTask1.class.getName()); Object res1 = ignite1.compute().execute(task1.newInstance(), null); @@ -217,11 +218,11 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { /** * P2P test job. */ - public static class GridP2PTestJob extends ComputeJobAdapter { + public static class GridP2PRemoteTestJob extends ComputeJobAdapter { /** * @param arg Argument. */ - public GridP2PTestJob(String arg) { + public GridP2PRemoteTestJob(String arg) { super(arg); } @@ -235,7 +236,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { /** * P2P test task. */ - public static class GridP2PTestTask extends ComputeTaskAdapter<Serializable, Object> { + public static class GridP2PRemoteTestTask extends ComputeTaskAdapter<Serializable, Object> { /** */ @LoggerResource private IgniteLogger log; @@ -250,7 +251,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { for (ClusterNode node : subgrid) { if (!node.id().equals(ignite.configuration().getNodeId())) - map.put(new GridP2PTestJob(null) , node); + map.put(new GridP2PRemoteTestJob(null) , node); } return map; @@ -275,7 +276,7 @@ public class GridP2PRemoteClassLoadersSelfTest extends GridCommonAbstractTest { /** * P2p test task. */ - public static class GridP2PTestTask1 extends GridP2PTestTask { + public static class GridP2PRemoteTestTask1 extends GridP2PRemoteTestTask { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java index 744635d..9e18c70 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.lang.*; -import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.internal.*; @@ -32,7 +31,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.net.*; import java.util.*; -import java.util.concurrent.*; /** * Test for {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi} and {@link org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi}. @@ -99,7 +97,6 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(spi); cfg.setLocalHost("127.0.0.1"); cfg.setConnectorConfiguration(null); - cfg.setMarshaller(new OptimizedMarshaller(false)); TcpCommunicationSpi commSpi = new TcpCommunicationSpi() { @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 1a85eae..d03d327 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -1510,4 +1510,18 @@ public final class GridTestUtils { else return cls.getSimpleName(); } + + /** + * Adds test to the suite only if it's not in {@code ignoredTests} set. + * + * @param suite TestSuite where to place the test. + * @param test Test. + * @param ignoredTests Tests to ignore. + */ + public static void addTestIfNeeded(TestSuite suite, Class test, Set<Class> ignoredTests) { + if (ignoredTests != null && ignoredTests.contains(test)) + return; + + suite.addTestSuite(test); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java index 5fa78ed..9345618 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java @@ -64,6 +64,9 @@ public final class GridTestProperties { private static final Map<String, Map<String, String>> pathProps = new HashMap<>(); /** */ + public static final String MARSH_CLASS_NAME = "marshaller.class"; + + /** */ static { // Initialize IGNITE_HOME system property. String igniteHome = System.getProperty("IGNITE_HOME"); @@ -159,6 +162,14 @@ public final class GridTestProperties { } /** + * @param name Property name. + * @param val Property value. + */ + public static synchronized void setProperty(String name, String val) { + getProperties().put(name, val); + } + + /** * @param dir Directory path. * @return Properties. */ @@ -175,9 +186,6 @@ public final class GridTestProperties { // potentially overriding defaults. loadProperties(props, dir); - // Seal it. - props = Collections.unmodifiableMap(props); - pathProps.put(dir, props); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 61dddbe..68ae64b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -193,6 +193,7 @@ public class IgniteTestResources { } /** + * @param cls Class. * @return Logger for specified class. */ public static IgniteLogger getLogger(Class<?> cls) { @@ -226,17 +227,17 @@ public class IgniteTestResources { */ @SuppressWarnings("unchecked") public synchronized Marshaller getMarshaller() throws IgniteCheckedException { - String marshallerName = GridTestProperties.getProperty("marshaller.class"); + String marshallerName = GridTestProperties.getProperty(GridTestProperties.MARSH_CLASS_NAME); - Marshaller marshaller; + Marshaller marsh; if (marshallerName == null) - marshaller = new OptimizedMarshaller(); + marsh = new OptimizedMarshaller(); else { try { Class<? extends Marshaller> cls = (Class<? extends Marshaller>)Class.forName(marshallerName); - marshaller = cls.newInstance(); + marsh = cls.newInstance(); } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) { throw new IgniteCheckedException("Failed to create test marshaller [marshaller=" + @@ -244,8 +245,11 @@ public class IgniteTestResources { } } - marshaller.setContext(new MarshallerContextTestImpl()); + if (marsh instanceof OptimizedMarshaller) + ((OptimizedMarshaller)marsh).setRequireSerializable(false); - return marshaller; + marsh.setContext(new MarshallerContextTestImpl()); + + return marsh; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index cc3abb4..b4977ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -29,6 +29,9 @@ import org.apache.ignite.internal.product.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.messaging.*; import org.apache.ignite.spi.*; +import org.apache.ignite.testframework.*; + +import java.util.*; /** * Basic test suite. @@ -39,28 +42,38 @@ public class IgniteBasicTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests Tests don't include in the execution. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Ignite Basic Test Suite"); suite.addTest(IgniteLangSelfTestSuite.suite()); - suite.addTest(IgniteUtilSelfTestSuite.suite()); - suite.addTest(IgniteMarshallerSelfTestSuite.suite()); - suite.addTest(IgniteKernalSelfTestSuite.suite()); + suite.addTest(IgniteUtilSelfTestSuite.suite(ignoredTests)); + suite.addTest(IgniteMarshallerSelfTestSuite.suite(ignoredTests)); + + suite.addTest(IgniteKernalSelfTestSuite.suite(ignoredTests)); suite.addTest(IgniteStartUpTestSuite.suite()); suite.addTest(IgniteExternalizableSelfTestSuite.suite()); suite.addTest(IgniteP2PSelfTestSuite.suite()); - suite.addTest(IgniteCacheP2pUnmarshallingErrorTestSuite.suite()); + suite.addTest(IgniteCacheP2pUnmarshallingErrorTestSuite.suite(ignoredTests)); suite.addTest(IgniteStreamSelfTestSuite.suite()); suite.addTest(new TestSuite(GridSelfTest.class)); - suite.addTest(new TestSuite(GridProjectionSelfTest.class)); - suite.addTest(new TestSuite(GridMessagingSelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, GridProjectionSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridMessagingSelfTest.class, ignoredTests); suite.addTest(new TestSuite(IgniteMessagingWithClientTest.class)); - suite.addTest(new TestSuite(GridMessagingNoPeerClassLoadingSelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, GridMessagingNoPeerClassLoadingSelfTest.class, ignoredTests); if (U.isLinux() || U.isMacOs()) suite.addTest(IgniteIpcSharedMemorySelfTestSuite.suite()); - suite.addTestSuite(GridReleaseTypeSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridReleaseTypeSelfTest.class, ignoredTests); suite.addTestSuite(GridProductVersionSelfTest.class); suite.addTestSuite(GridAffinityProcessorRendezvousSelfTest.class); suite.addTestSuite(GridClosureProcessorSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index c71da11..08178db 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -24,6 +24,9 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; +import org.apache.ignite.testframework.*; + +import java.util.*; /** * Test suite. @@ -34,12 +37,21 @@ public class IgniteCacheFailoverTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests Tests don't include in the execution. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Cache Failover Test Suite"); suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class); suite.addTestSuite(GridCacheAtomicClientInvalidPartitionHandlingSelfTest.class); - suite.addTestSuite(GridCacheIncrementTransformTest.class); + GridTestUtils.addTestIfNeeded(suite, GridCacheIncrementTransformTest.class, ignoredTests); // Failure consistency tests. suite.addTestSuite(GridCacheAtomicRemoveFailureTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuite.java index f54f85a..7cfefd1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuite.java @@ -19,6 +19,9 @@ package org.apache.ignite.testsuites; import junit.framework.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.testframework.*; + +import java.util.*; /** * Checks behavior on exception while unmarshalling key. @@ -29,12 +32,21 @@ public class IgniteCacheP2pUnmarshallingErrorTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests Tests don't include in the execution. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("P2p Unmarshalling Test Suite"); - suite.addTestSuite(IgniteCacheP2pUnmarshallingErrorTest.class); - suite.addTestSuite(IgniteCacheP2pUnmarshallingNearErrorTest.class); - suite.addTestSuite(IgniteCacheP2pUnmarshallingRebalanceErrorTest.class); - suite.addTestSuite(IgniteCacheP2pUnmarshallingTxErrorTest.class); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingErrorTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingNearErrorTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingRebalanceErrorTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingTxErrorTest.class, ignoredTests); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/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 5f37aea..6245308 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -32,6 +32,9 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.processors.cache.distributed.replicated.*; import org.apache.ignite.internal.processors.cache.local.*; import org.apache.ignite.internal.processors.datastreamer.*; +import org.apache.ignite.testframework.*; + +import java.util.*; /** * Test suite. @@ -42,6 +45,15 @@ public class IgniteCacheTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("IgniteCache Test Suite"); suite.addTestSuite(IgniteCacheEntryListenerAtomicTest.class); @@ -97,8 +109,8 @@ public class IgniteCacheTestSuite extends TestSuite { // Common tests. suite.addTestSuite(GridCacheConcurrentMapSelfTest.class); suite.addTestSuite(GridCacheAffinityMapperSelfTest.class); - suite.addTestSuite(GridCacheAffinityRoutingSelfTest.class); - suite.addTestSuite(GridCacheMvccSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridCacheAffinityRoutingSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheMvccSelfTest.class, ignoredTests); suite.addTestSuite(GridCacheMvccPartitionedSelfTest.class); suite.addTestSuite(GridCacheMvccManagerSelfTest.class); // suite.addTestSuite(GridCacheP2PUndeploySelfTest.class); TODO uncomment in DR branch. @@ -111,11 +123,11 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheBalancingStoreSelfTest.class); suite.addTestSuite(GridCacheAffinityApiSelfTest.class); suite.addTestSuite(GridCacheStoreValueBytesSelfTest.class); - suite.addTestSuite(DataStreamProcessorSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, DataStreamProcessorSelfTest.class, ignoredTests); suite.addTestSuite(DataStreamerMultiThreadedSelfTest.class); suite.addTestSuite(DataStreamerMultinodeCreateCacheTest.class); suite.addTestSuite(DataStreamerImplSelfTest.class); - suite.addTestSuite(GridCacheEntryMemorySizeSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridCacheEntryMemorySizeSelfTest.class, ignoredTests); suite.addTestSuite(GridCacheClearAllSelfTest.class); suite.addTestSuite(GridCacheObjectToStringSelfTest.class); suite.addTestSuite(GridCacheLoadOnlyStoreAdapterSelfTest.class); @@ -140,10 +152,10 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheMixedPartitionExchangeSelfTest.class); suite.addTestSuite(IgniteCacheAtomicMessageRecoveryTest.class); // suite.addTestSuite(IgniteCacheTxMessageRecoveryTest.class); TODO IGNITE-795 - suite.addTestSuite(GridCacheOffHeapTieredEvictionAtomicSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredEvictionSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredEvictionAtomicSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredEvictionSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredAtomicSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredSelfTest.class, ignoredTests); suite.addTestSuite(GridCacheGlobalLoadTest.class); suite.addTestSuite(GridCachePartitionedLocalStoreSelfTest.class); suite.addTestSuite(GridCacheReplicatedLocalStoreSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index f0080d5..978941d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@ -29,6 +29,9 @@ import org.apache.ignite.internal.processors.port.*; import org.apache.ignite.internal.processors.service.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.spi.communication.*; +import org.apache.ignite.testframework.*; + +import java.util.*; /** * Kernal self test suite. @@ -39,6 +42,15 @@ public class IgniteKernalSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests Tests don't include in the execution. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Ignite Kernal Test Suite"); suite.addTestSuite(GridSameVmStartupSelfTest.class); @@ -63,7 +75,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(GridDiscoveryEventSelfTest.class); suite.addTestSuite(GridPortProcessorSelfTest.class); suite.addTestSuite(GridHomePathSelfTest.class); - suite.addTestSuite(GridStartupWithSpecifiedWorkDirectorySelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridStartupWithSpecifiedWorkDirectorySelfTest.class, ignoredTests); suite.addTestSuite(GridStartupWithUndefinedIgniteHomeSelfTest.class); suite.addTestSuite(GridVersionSelfTest.class); suite.addTestSuite(GridListenActorSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java index 10afe10..40c32a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java @@ -21,6 +21,9 @@ import junit.framework.*; import org.apache.ignite.internal.util.io.*; import org.apache.ignite.marshaller.jdk.*; import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.testframework.*; + +import java.util.*; /** * Test suite for all marshallers. @@ -31,16 +34,25 @@ public class IgniteMarshallerSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Ignite Marshaller Test Suite"); - suite.addTest(new TestSuite(GridJdkMarshallerSelfTest.class)); - suite.addTest(new TestSuite(OptimizedMarshallerEnumSelfTest.class)); - suite.addTest(new TestSuite(OptimizedMarshallerSelfTest.class)); - suite.addTest(new TestSuite(OptimizedMarshallerTest.class)); - suite.addTest(new TestSuite(OptimizedObjectStreamSelfTest.class)); - suite.addTest(new TestSuite(GridUnsafeDataOutputArraySizingSelfTest.class)); - suite.addTest(new TestSuite(OptimizedMarshallerNodeFailoverTest.class)); - suite.addTest(new TestSuite(OptimizedMarshallerSerialPersistentFieldsSelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, GridJdkMarshallerSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerEnumSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, OptimizedObjectStreamSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridUnsafeDataOutputArraySizingSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerNodeFailoverTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerSerialPersistentFieldsSelfTest.class, ignoredTests); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java index 1c75a7f..64ff6ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java @@ -26,10 +26,13 @@ import org.apache.ignite.internal.util.offheap.unsafe.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.*; +import org.apache.ignite.testframework.*; import org.apache.ignite.thread.*; import org.apache.ignite.util.*; import org.apache.ignite.util.mbeans.*; +import java.util.*; + /** * Test suite for Ignite utility classes. */ @@ -39,10 +42,19 @@ public class IgniteUtilSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests Tests don't include in the execution. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Ignite Util Test Suite"); suite.addTestSuite(GridThreadPoolExecutorServiceSelfTest.class); - suite.addTestSuite(IgniteUtilsSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, IgniteUtilsSelfTest.class, ignoredTests); suite.addTestSuite(GridSpinReadWriteLockSelfTest.class); suite.addTestSuite(GridQueueSelfTest.class); suite.addTestSuite(GridStringBuilderFactorySelfTest.class); @@ -64,9 +76,9 @@ public class IgniteUtilSelfTestSuite extends TestSuite { // NIO. suite.addTestSuite(GridNioSessionMetaKeySelfTest.class); - suite.addTestSuite(GridNioSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridNioSelfTest.class, ignoredTests); suite.addTestSuite(GridNioFilterChainSelfTest.class); - suite.addTestSuite(GridNioSslSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridNioSslSelfTest.class, ignoredTests); suite.addTestSuite(GridNioDelimitedBufferSelfTest.class); return suite; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java index c997358..2ae54aa 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java @@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer sleep = false; } - Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size()); + Map<TestJob1, ClusterNode> jobs = U.newHashMap(subgrid.size()); for (ClusterNode node : subgrid) { if (nodeIds.contains(node.id())) - jobs.put(new TestJob(node.id(), sleep), node); + jobs.put(new TestJob1(node.id(), sleep), node); } if (!jobs.isEmpty()) @@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer * Simple job class */ @SuppressWarnings({"PublicInnerClass"}) - public static class TestJob extends ComputeJobAdapter { + public static class TestJob1 extends ComputeJobAdapter { /** Task session. */ @TaskSessionResource private ComputeTaskSession ses; @@ -107,7 +107,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer /** * */ - public TestJob() { + public TestJob1() { // No-op. } @@ -115,7 +115,7 @@ public class P2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, Integer * @param nodeId Node ID for node this job is supposed to execute on. * @param sleep Sleep flag. */ - public TestJob(UUID nodeId, boolean sleep) { + public TestJob1(UUID nodeId, boolean sleep) { super(nodeId); this.sleep = sleep; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java index 6c7565b..01f3991 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java @@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer sleep = false; } - Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size()); + Map<TestJob2, ClusterNode> jobs = U.newHashMap(subgrid.size()); for (ClusterNode node : subgrid) { if (nodeIds.contains(node.id())) - jobs.put(new TestJob(node.id(), sleep), node); + jobs.put(new TestJob2(node.id(), sleep), node); } if (!jobs.isEmpty()) @@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer * Simple job class */ @SuppressWarnings("PublicInnerClass") - public static class TestJob extends ComputeJobAdapter { + public static class TestJob2 extends ComputeJobAdapter { /** Ignite instance. */ @IgniteInstanceResource private Ignite ignite; @@ -108,7 +108,7 @@ public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer * @param nodeId Node ID for node this job is supposed to execute on. * @param sleep Sleep flag. */ - public TestJob(UUID nodeId, boolean sleep) { + public TestJob2(UUID nodeId, boolean sleep) { super(nodeId); this.sleep = sleep; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/pom.xml ---------------------------------------------------------------------- diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml index 7aab5e8..e2175f6 100644 --- a/modules/indexing/pom.xml +++ b/modules/indexing/pom.xml @@ -93,4 +93,20 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 40c40a5..29220f3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -58,8 +58,6 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setMarshaller(new OptimizedMarshaller(false)); - c.setCacheConfiguration(createCache("replicated", CacheMode.REPLICATED), createCache("partitioned", CacheMode.PARTITIONED)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 2d6855e..c29027c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -98,7 +98,6 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheCfg); - cfg.setMarshaller(new OptimizedMarshaller(false)); cfg.setDeploymentMode(SHARED); if (excluded) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index 7d06fe6..c3290a6 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -21,7 +21,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.marshaller.optimized.*; import java.util.*; import java.util.concurrent.*; @@ -51,15 +50,6 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract } /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration c = super.getConfiguration(gridName); - - c.setMarshaller(new OptimizedMarshaller(false)); - - return c; - } - - /** {@inheritDoc} */ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index b859ba9..4555c6b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; -import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -99,8 +98,6 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheSwapSelfTest.class.getName(), CacheValue.class.getName()); - cfg.setMarshaller(new OptimizedMarshaller(false)); - return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index 3159589..ccb3115 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.internal.processors.datastructures.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.processors.query.h2.sql.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -74,8 +73,6 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA cfg.setPeerClassLoadingEnabled(false); - cfg.setMarshaller(new OptimizedMarshaller(false)); - if (hasCache) cfg.setCacheConfiguration(cache(null, true), cache(CACHE, true), cache(EMPTY_CACHE, true), cache(CACHE_NO_PRIMITIVES, false), cache(CACHE_COMPLEX_KEYS, false)); @@ -217,11 +214,11 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA assert metas != null; - assertEquals("Invalid meta: " + metas, 5, metas.size()); - boolean wasNull = false; boolean wasNamed = false; boolean wasEmpty = false; + boolean wasNoPrimitives = false; + boolean wasComplexKeys = false; for (GridCacheSqlMetadata meta : metas) { if (meta.cacheName() == null) { @@ -288,11 +285,17 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA wasEmpty = true; } + else if (CACHE_NO_PRIMITIVES.equals(meta.cacheName())) + wasNoPrimitives = true; + else if (CACHE_COMPLEX_KEYS.equals(meta.cacheName())) + wasComplexKeys = true; } assert wasNull; assert wasNamed; assert wasEmpty; + assert wasNoPrimitives; + assert wasComplexKeys; } finally { ((IgniteKernal)grid(0)).getCache(null).remove(new GridCacheInternalKeyImpl("LONG")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index 0d45711..f0ee81f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -108,8 +108,6 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac // Otherwise noop swap space will be chosen on Windows. c.setSwapSpaceSpi(new FileSwapSpaceSpi()); - c.setMarshaller(new OptimizedMarshaller(false)); - if (!gridName.startsWith("client")) { CacheConfiguration[] ccs = new CacheConfiguration[2]; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java index c0e1b21..024163e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java @@ -78,7 +78,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon cc.setRebalanceMode(CacheRebalanceMode.SYNC); cc.setAtomicityMode(TRANSACTIONAL); cc.setIndexedTypes( - UUID.class, Person.class + UUID.class, PersonObj.class ); c.setCacheConfiguration(cc); @@ -126,12 +126,12 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon long duration = 10 * 1000; final int logMod = 100; - final Person p1 = new Person("Jon", 1500, "Master"); - final Person p2 = new Person("Jane", 2000, "Master"); - final Person p3 = new Person("Mike", 1800, "Bachelor"); - final Person p4 = new Person("Bob", 1900, "Bachelor"); + final PersonObj p1 = new PersonObj("Jon", 1500, "Master"); + final PersonObj p2 = new PersonObj("Jane", 2000, "Master"); + final PersonObj p3 = new PersonObj("Mike", 1800, "Bachelor"); + final PersonObj p4 = new PersonObj("Bob", 1900, "Bachelor"); - final IgniteCache<UUID, Person> cache0 = grid(0).cache(null); + final IgniteCache<UUID, PersonObj> cache0 = grid(0).cache(null); cache0.put(p1.id(), p1); cache0.put(p2.id(), p2); @@ -150,10 +150,10 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon IgniteInternalFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { - QueryCursor<Cache.Entry<UUID, Person>> master = - cache0.query(new TextQuery(Person.class, "Master")); + QueryCursor<Cache.Entry<UUID, PersonObj>> master = + cache0.query(new TextQuery(PersonObj.class, "Master")); - Collection<Cache.Entry<UUID, Person>> entries = master.getAll(); + Collection<Cache.Entry<UUID, PersonObj>> entries = master.getAll(); checkResult(entries, p1, p2); @@ -171,10 +171,10 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon IgniteInternalFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { - QueryCursor<Cache.Entry<UUID, Person>> bachelors = - cache0.query(new SqlQuery(Person.class, "degree = 'Bachelor'")); + QueryCursor<Cache.Entry<UUID, PersonObj>> bachelors = + cache0.query(new SqlQuery(PersonObj.class, "degree = 'Bachelor'")); - Collection<Cache.Entry<UUID, Person>> entries = bachelors.getAll(); + Collection<Cache.Entry<UUID, PersonObj>> entries = bachelors.getAll(); checkResult(entries, p3, p4); @@ -198,8 +198,8 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon * @param entries Queried result. * @param persons Persons that should be in the result. */ - private void checkResult(Iterable<Cache.Entry<UUID, Person>> entries, Person... persons) { - for (Cache.Entry<UUID, Person> entry : entries) { + private void checkResult(Iterable<Cache.Entry<UUID, PersonObj>> entries, PersonObj... persons) { + for (Cache.Entry<UUID, PersonObj> entry : entries) { assertEquals(entry.getKey(), entry.getValue().id()); assert F.asList(persons).contains(entry.getValue()); @@ -207,7 +207,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon } /** Test class. */ - private static class Person implements Externalizable { + private static class PersonObj implements Externalizable { /** */ @GridToStringExclude private UUID id = UUID.randomUUID(); @@ -226,7 +226,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon private String degree; /** Required by {@link Externalizable}. */ - public Person() { + public PersonObj() { // No-op. } @@ -235,7 +235,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon * @param salary Salary. * @param degree Degree. */ - Person(String name, int salary, String degree) { + PersonObj(String name, int salary, String degree) { assert name != null; assert salary > 0; assert degree != null; @@ -291,17 +291,17 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon if (obj == this) return true; - if (!(obj instanceof Person)) + if (!(obj instanceof PersonObj)) return false; - Person that = (Person)obj; + PersonObj that = (PersonObj)obj; return that.id.equals(id) && that.name.equals(name) && that.salary == salary && that.degree.equals(degree); } /** {@inheritDoc} */ @Override public String toString() { - return S.toString(Person.class, this); + return S.toString(PersonObj.class, this); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index 1d6bbc8..9fcd947 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java @@ -84,7 +84,6 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes cfg.setDiscoverySpi(disco); cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); - cfg.setMarshaller(new OptimizedMarshaller(false)); cfg.setCacheConfiguration(cacheConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 34e86ff..8ab2485 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -62,7 +62,6 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom cfg.setCacheConfiguration(); cfg.setDiscoverySpi(discovery()); - cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c56f69/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java index e8b3c61..c4d2481 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java @@ -25,7 +25,6 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.processors.query.h2.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -62,8 +61,6 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setMarshaller(new OptimizedMarshaller(true)); - // Cache. CacheConfiguration cc = defaultCacheConfiguration(); @@ -92,7 +89,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { } /** - * + * @throws Exception If failed. */ public void testAllExamples() throws Exception { checkQuery("select ? limit ? offset ?");
