From commits-return-119472-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Tue Jul 31 15:26:17 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8434E180662 for ; Tue, 31 Jul 2018 15:26:15 +0200 (CEST) Received: (qmail 44642 invoked by uid 500); 31 Jul 2018 13:26:14 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 44633 invoked by uid 99); 31 Jul 2018 13:26:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Jul 2018 13:26:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2FE30DFAD2; Tue, 31 Jul 2018 13:26:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agura@apache.org To: commits@ignite.apache.org Message-Id: <08aef3e9e19d49e786ddbff0572beedf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-9100 Split Basic and Cache TC configurations on pure in-memory and with disk usage one Date: Tue, 31 Jul 2018 13:26:14 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 8309cef79 -> c5e723c53 IGNITE-9100 Split Basic and Cache TC configurations on pure in-memory and with disk usage one Signed-off-by: Andrey Gura Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5e723c5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5e723c5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5e723c5 Branch: refs/heads/master Commit: c5e723c533a336802ba0fa6b9e9f361182db16ff Parents: 8309cef Author: Eduard Shangareev Authored: Tue Jul 31 16:25:50 2018 +0300 Committer: Andrey Gura Committed: Tue Jul 31 16:25:50 2018 +0300 ---------------------------------------------------------------------- .../testframework/junits/GridAbstractTest.java | 95 ++++++++++++++------ .../ignite/testsuites/IgniteBasicTestSuite.java | 12 ++- .../IgniteBasicWithPersistenceTestSuite.java | 67 ++++++++++++++ ...IgniteBinaryObjectsComputeGridTestSuite.java | 3 + .../IgniteCacheEvictionSelfTestSuite.java | 3 - .../IgniteCacheFullApiSelfTestSuite.java | 3 + .../IgniteCacheMetricsSelfTestSuite.java | 4 - .../ignite/testsuites/IgniteCacheTestSuite.java | 8 +- .../testsuites/IgniteCacheTestSuite2.java | 5 +- .../testsuites/IgniteCacheTestSuite3.java | 7 +- .../testsuites/IgniteCacheTestSuite4.java | 5 +- .../testsuites/IgniteCacheTestSuite5.java | 6 +- .../testsuites/IgniteCacheTestSuite6.java | 28 +----- .../testsuites/IgniteCacheTestSuite7.java | 53 ++++++++++- .../testsuites/IgniteComputeGridTestSuite.java | 2 - .../testsuites/IgniteKernalSelfTestSuite.java | 7 +- .../IgniteMarshallerSelfTestSuite.java | 5 +- .../testsuites/IgniteUtilSelfTestSuite.java | 7 +- .../GridInternalTaskUnusedWalSegmentsTest.java | 27 +++--- ...acheWithIndexingAndPersistenceTestSuite.java | 38 ++++++++ .../IgniteCacheWithIndexingTestSuite.java | 6 +- 21 files changed, 282 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 1adb074..53ccdc7 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -17,31 +17,6 @@ package org.apache.ignite.testframework.junits; -import java.io.ObjectStreamException; -import java.io.Serializable; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.Proxy; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import javax.cache.configuration.Factory; -import javax.cache.configuration.FactoryBuilder; import junit.framework.TestCase; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -55,6 +30,8 @@ import org.apache.ignite.binary.BinaryBasicNameMapper; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.events.EventType; @@ -121,6 +98,32 @@ import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; +import javax.cache.configuration.Factory; +import javax.cache.configuration.FactoryBuilder; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; + import static org.apache.ignite.IgniteSystemProperties.IGNITE_CLIENT_CACHE_CHANGE_MESSAGE_TIMEOUT; import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -138,6 +141,9 @@ import static org.apache.ignite.testframework.config.GridTestProperties.IGNITE_C "JUnitTestCaseWithNonTrivialConstructors" }) public abstract class GridAbstractTest extends TestCase { + /** Persistence in tests allowed property. */ + public static final String PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY = "PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY"; + /************************************************************** * DO NOT REMOVE TRANSIENT - THIS OBJECT MIGHT BE TRANSFERRED * * TO ANOTHER NODE. * @@ -198,6 +204,12 @@ public abstract class GridAbstractTest extends TestCase { /** * */ + private static final boolean PERSISTENCE_ALLOWED = + IgniteSystemProperties.getBoolean(PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, true); + + /** + * + */ static { System.setProperty(IgniteSystemProperties.IGNITE_ALLOW_ATOMIC_OPS_IN_TX, "false"); System.setProperty(IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000"); @@ -856,6 +868,9 @@ public abstract class GridAbstractTest extends TestCase { */ protected Ignite startGrid(String igniteInstanceName, IgniteConfiguration cfg, GridSpringResourceContext ctx) throws Exception { + + checkConfiguration(cfg); + if (!isRemoteJvm(igniteInstanceName)) { startingIgniteInstanceName.set(igniteInstanceName); @@ -901,6 +916,30 @@ public abstract class GridAbstractTest extends TestCase { } /** + * @param cfg Config. + */ + protected void checkConfiguration(IgniteConfiguration cfg) { + if (cfg == null) + return; + + if (!PERSISTENCE_ALLOWED) { + String errorMsg = "PERSISTENCE IS NOT ALLOWED IN THIS SUITE, PUT YOUR TEST TO ANOTHER ONE!"; + + DataStorageConfiguration dsCfg = cfg.getDataStorageConfiguration(); + + if (dsCfg != null) { + assertFalse(errorMsg, dsCfg.getDefaultDataRegionConfiguration().isPersistenceEnabled()); + + DataRegionConfiguration[] dataRegionConfigurations = dsCfg.getDataRegionConfigurations(); + + if (dataRegionConfigurations != null) + for (DataRegionConfiguration dataRegionConfiguration : dataRegionConfigurations) + assertFalse(errorMsg, dataRegionConfiguration.isPersistenceEnabled()); + } + } + } + + /** * Starts new grid at another JVM with given name. * * @param igniteInstanceName Ignite instance name. @@ -996,6 +1035,8 @@ public abstract class GridAbstractTest extends TestCase { if (cfg == null) cfg = optimize(getConfiguration(igniteInstanceName)); + checkConfiguration(cfg); + if (locNode != null) { DiscoverySpi discoverySpi = locNode.configuration().getDiscoverySpi(); @@ -1034,6 +1075,8 @@ public abstract class GridAbstractTest extends TestCase { * @throws IgniteCheckedException On error. */ protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException { + checkConfiguration(cfg); + if (cfg.getLocalHost() == null) { if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi) { cfg.setLocalHost("127.0.0.1"); @@ -1635,6 +1678,8 @@ public abstract class GridAbstractTest extends TestCase { cfg.setFailureHandler(getFailureHandler(igniteInstanceName)); + checkConfiguration(cfg); + return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 c75ab7d..74e23ed 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 @@ -17,16 +17,12 @@ package org.apache.ignite.testsuites; -import java.util.Set; import junit.framework.TestSuite; import org.apache.ignite.GridSuppressedExceptionSelfTest; -import org.apache.ignite.failure.AccountTransferTransactionTest; import org.apache.ignite.failure.FailureHandlerTriggeredTest; -import org.apache.ignite.failure.IoomFailureHandlerTest; import org.apache.ignite.failure.OomFailureHandlerTest; import org.apache.ignite.failure.StopNodeFailureHandlerTest; import org.apache.ignite.failure.StopNodeOrHaltFailureHandlerTest; -import org.apache.ignite.failure.SystemWorkersTerminationTest; import org.apache.ignite.internal.ClassSetTest; import org.apache.ignite.internal.ClusterGroupHostsSelfTest; import org.apache.ignite.internal.ClusterGroupSelfTest; @@ -87,12 +83,15 @@ import org.apache.ignite.plugin.security.SecurityPermissionSetBuilderTest; import org.apache.ignite.spi.GridSpiLocalHostInjectionTest; import org.apache.ignite.startup.properties.NotStringSystemPropertyTest; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.GridAbstractTest; import org.apache.ignite.testframework.test.ConfigVariationsTestSuiteBuilderTest; import org.apache.ignite.testframework.test.ParametersTest; import org.apache.ignite.testframework.test.VariationsIteratorTest; import org.apache.ignite.util.AttributeNodeFilterSelfTest; import org.jetbrains.annotations.Nullable; +import java.util.Set; + /** * Basic test suite. */ @@ -111,6 +110,8 @@ public class IgniteBasicTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite(@Nullable final Set ignoredTests) throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("Ignite Basic Test Suite"); suite.addTest(IgniteMarshallerSelfTestSuite.suite(ignoredTests)); @@ -209,10 +210,7 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTestSuite(FailureHandlerTriggeredTest.class); suite.addTestSuite(StopNodeFailureHandlerTest.class); suite.addTestSuite(StopNodeOrHaltFailureHandlerTest.class); - suite.addTestSuite(IoomFailureHandlerTest.class); suite.addTestSuite(OomFailureHandlerTest.class); - suite.addTestSuite(AccountTransferTransactionTest.class); - suite.addTestSuite(SystemWorkersTerminationTest.class); suite.addTestSuite(AtomicOperationsInTxTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java new file mode 100644 index 0000000..5f1d18d --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java @@ -0,0 +1,67 @@ +/* + * 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.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.failure.AccountTransferTransactionTest; +import org.apache.ignite.failure.IoomFailureHandlerTest; +import org.apache.ignite.failure.SystemWorkersTerminationTest; +import org.apache.ignite.internal.ClusterBaselineNodesMetricsSelfTest; +import org.apache.ignite.internal.processors.service.ServiceDeploymentOnActivationTest; +import org.apache.ignite.internal.processors.service.ServiceDeploymentOutsideBaselineTest; +import org.apache.ignite.marshaller.GridMarshallerMappingConsistencyTest; +import org.apache.ignite.util.GridCommandHandlerTest; +import org.apache.ignite.util.GridInternalTaskUnusedWalSegmentsTest; +import org.jetbrains.annotations.Nullable; + +import java.util.Set; + +/** + * Basic test suite. + */ +public class IgniteBasicWithPersistenceTestSuite extends TestSuite { + /** + * @return Test suite. + * @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. Providing null means nothing to exclude. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(@Nullable final Set ignoredTests) throws Exception { + TestSuite suite = new TestSuite("Ignite Basic With Persistence Test Suite"); + + suite.addTestSuite(IoomFailureHandlerTest.class); + suite.addTestSuite(AccountTransferTransactionTest.class); + suite.addTestSuite(ClusterBaselineNodesMetricsSelfTest.class); + suite.addTestSuite(ServiceDeploymentOnActivationTest.class); + suite.addTestSuite(ServiceDeploymentOutsideBaselineTest.class); + suite.addTestSuite(GridMarshallerMappingConsistencyTest.class); + suite.addTestSuite(SystemWorkersTerminationTest.class); + + suite.addTestSuite(GridCommandHandlerTest.class); + suite.addTestSuite(GridInternalTaskUnusedWalSegmentsTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java index 8798db9..4820d45 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsComputeGridTestSuite.java @@ -19,6 +19,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.GridComputationBinarylizableClosuresSelfTest; +import org.apache.ignite.testframework.junits.GridAbstractTest; /** * @@ -29,6 +30,8 @@ public class IgniteBinaryObjectsComputeGridTestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = IgniteComputeGridTestSuite.suite(); suite.addTestSuite(GridComputationBinarylizableClosuresSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java index f2ac1c0..79d98e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java @@ -37,7 +37,6 @@ import org.apache.ignite.internal.processors.cache.eviction.lru.LruNearEvictionP import org.apache.ignite.internal.processors.cache.eviction.lru.LruNearOnlyNearEvictionPolicySelfTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionDataStreamerTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionMetricTest; -import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionMultinodeMixedRegionsTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionPagesRecyclingAndReusingTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionReadThroughTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionTouchOrderTest; @@ -91,8 +90,6 @@ public class IgniteCacheEvictionSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(PageEvictionReadThroughTest.class)); suite.addTest(new TestSuite(PageEvictionDataStreamerTest.class)); - suite.addTest(new TestSuite(PageEvictionMultinodeMixedRegionsTest.class)); - suite.addTest(new TestSuite(PageEvictionMetricTest.class)); suite.addTest(new TestSuite(PageEvictionPagesRecyclingAndReusingTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 b380ebc..bc46055 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.testframework.junits.GridAbstractTest; /** * Test suite for cache API. @@ -88,6 +89,8 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("Cache Full API Test Suite"); // One node. http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java index 6f62ffb..b6dcb21 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java @@ -19,9 +19,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.TransactionMetricsMxBeanImplTest; -import org.apache.ignite.internal.processors.cache.CacheGroupMetricsMBeanTest; import org.apache.ignite.internal.processors.cache.CacheGroupsMetricsRebalanceTest; -import org.apache.ignite.internal.processors.cache.CacheMetricsManageTest; import org.apache.ignite.internal.processors.cache.CacheMetricsEntitiesCountTest; import org.apache.ignite.internal.processors.cache.CacheMetricsForClusterGroupSelfTest; import org.apache.ignite.internal.processors.cache.CacheValidatorMetricsTest; @@ -69,9 +67,7 @@ public class IgniteCacheMetricsSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheAtomicLocalTckMetricsSelfTestImpl.class); suite.addTestSuite(CacheGroupsMetricsRebalanceTest.class); - suite.addTestSuite(CacheGroupMetricsMBeanTest.class); suite.addTestSuite(CacheValidatorMetricsTest.class); - suite.addTestSuite(CacheMetricsManageTest.class); suite.addTestSuite(CacheMetricsEntitiesCountTest.class); // Cluster wide metrics. http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 c607284..f8a378f 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 @@ -17,7 +17,6 @@ package org.apache.ignite.testsuites; -import java.util.Set; import junit.framework.TestSuite; import org.apache.ignite.cache.IgniteCacheEntryProcessorSequentialCallTest; import org.apache.ignite.cache.IgniteWarmupClosureSelfTest; @@ -52,6 +51,7 @@ import org.apache.ignite.internal.processors.cache.CacheNamesSelfTest; import org.apache.ignite.internal.processors.cache.CacheNamesWithSpecialCharactersTest; import org.apache.ignite.internal.processors.cache.CachePutEventListenerErrorSelfTest; import org.apache.ignite.internal.processors.cache.CacheTxFastFinishTest; +import org.apache.ignite.internal.processors.cache.DataStorageConfigurationValidationTest; import org.apache.ignite.internal.processors.cache.GridCacheAffinityApiSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheAffinityMapperSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; @@ -83,7 +83,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheSwapPreloadSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheTxPartitionedLocalStoreSelfTest; import org.apache.ignite.internal.processors.cache.GridDataStorageConfigurationConsistencySelfTest; -import org.apache.ignite.internal.processors.cache.DataStorageConfigurationValidationTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalWithStoreInvokeTest; @@ -150,6 +149,9 @@ import org.apache.ignite.internal.processors.datastreamer.DataStreamerMultinodeC import org.apache.ignite.internal.processors.datastreamer.DataStreamerTimeoutTest; import org.apache.ignite.internal.processors.datastreamer.DataStreamerUpdateAfterLoadTest; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.GridAbstractTest; + +import java.util.Set; /** * Test suite. @@ -169,6 +171,8 @@ public class IgniteCacheTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite(Set ignoredTests) throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("IgniteCache Test Suite"); suite.addTestSuite(IgniteCacheEntryListenerAtomicTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 e9c5e76..6eca728 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 @@ -31,7 +31,6 @@ import org.apache.ignite.internal.processors.cache.CacheEnumOperationsSingleNode import org.apache.ignite.internal.processors.cache.CacheEnumOperationsTest; import org.apache.ignite.internal.processors.cache.CacheExchangeMessageDuplicatedStateTest; import org.apache.ignite.internal.processors.cache.CacheGroupLocalConfigurationSelfTest; -import org.apache.ignite.internal.processors.cache.CacheDataRegionConfigurationTest; import org.apache.ignite.internal.processors.cache.CacheOptimisticTransactionsWithFilterSingleServerTest; import org.apache.ignite.internal.processors.cache.CacheOptimisticTransactionsWithFilterTest; import org.apache.ignite.internal.processors.cache.CrossCacheTxNearEnabledRandomOperationsTest; @@ -144,6 +143,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxSingleT import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicyInitializationTest; import org.apache.ignite.internal.processors.continuous.IgniteNoCustomEventsOnNodeStart; +import org.apache.ignite.testframework.junits.GridAbstractTest; /** * Test suite. @@ -154,6 +154,8 @@ public class IgniteCacheTestSuite2 extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("IgniteCache Test Suite part 2"); // Local cache. @@ -266,7 +268,6 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(CacheConfigurationLeakTest.class)); suite.addTest(new TestSuite(MemoryPolicyConfigValidationTest.class)); suite.addTest(new TestSuite(MemoryPolicyInitializationTest.class)); - suite.addTest(new TestSuite(CacheDataRegionConfigurationTest.class)); suite.addTest(new TestSuite(CacheGroupLocalConfigurationSelfTest.class)); suite.addTest(new TestSuite(CacheEnumOperationsSingleNodeTest.class)); suite.addTest(new TestSuite(CacheEnumOperationsTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 b66bf5b..55436d6 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 @@ -53,11 +53,9 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePut import org.apache.ignite.internal.processors.cache.distributed.near.IgniteTxReentryNearSelfTest; import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRabalancingDelayedPartitionMapExchangeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingAsyncSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingPartitionCountersTest; import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingSyncCheckDataTest; import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingSyncSelfTest; import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingUnmarshallingFailedSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingWithAsyncClearingTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheDaemonNodeReplicatedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicGetAndTransformStoreSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicApiTest; @@ -84,6 +82,7 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.preloa import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadStartStopEventsSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheDaemonNodeLocalSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalByteArrayValuesSelfTest; +import org.apache.ignite.testframework.junits.GridAbstractTest; /** * Test suite. @@ -94,6 +93,8 @@ public class IgniteCacheTestSuite3 extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("IgniteCache Test Suite part 3"); suite.addTestSuite(IgniteCacheGroupsTest.class); @@ -151,8 +152,6 @@ public class IgniteCacheTestSuite3 extends TestSuite { suite.addTestSuite(GridCacheRebalancingUnmarshallingFailedSelfTest.class); suite.addTestSuite(GridCacheRebalancingAsyncSelfTest.class); suite.addTestSuite(GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.class); - suite.addTestSuite(GridCacheRebalancingPartitionCountersTest.class); - suite.addTestSuite(GridCacheRebalancingWithAsyncClearingTest.class); // Test for byte array value special case. suite.addTestSuite(GridCacheLocalByteArrayValuesSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 b973c91..321046b 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 @@ -80,7 +80,6 @@ import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheFilterTest; import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheMultinodeTest; import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartCoordinatorFailoverTest; import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartFailTest; -import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartFailWithPersistenceTest; import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartNoExchangeTimeoutTest; import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartSelfTest; import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartStopConcurrentTest; @@ -151,6 +150,7 @@ import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPa import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedAtomicSelfTest; import org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedTransactionalSelfTest; +import org.apache.ignite.testframework.junits.GridAbstractTest; /** * Test suite. @@ -161,6 +161,8 @@ public class IgniteCacheTestSuite4 extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("IgniteCache Test Suite part 4"); // Multi node update. @@ -229,7 +231,6 @@ public class IgniteCacheTestSuite4 extends TestSuite { suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class); suite.addTestSuite(IgniteDynamicCacheMultinodeTest.class); suite.addTestSuite(IgniteDynamicCacheStartFailTest.class); - suite.addTestSuite(IgniteDynamicCacheStartFailWithPersistenceTest.class); suite.addTestSuite(IgniteDynamicCacheStartCoordinatorFailoverTest.class); suite.addTestSuite(IgniteDynamicCacheWithConfigStartSelfTest.class); suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 945a76c..1c74d6d 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 @@ -37,7 +37,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCachePutStackOverflowSe import org.apache.ignite.internal.processors.cache.IgniteCacheReadThroughEvictionsVariationsSuite; import org.apache.ignite.internal.processors.cache.IgniteCacheStoreCollectionTest; import org.apache.ignite.internal.processors.cache.PartitionsExchangeOnDiscoveryHistoryOverflowTest; -import org.apache.ignite.internal.processors.cache.distributed.Cache64kPartitionsTest; import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinityAssignmentNodeJoinValidationTest; import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinityAssignmentTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheGroupsPartitionLossPolicySelfTest; @@ -48,6 +47,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.Ignite 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; +import org.apache.ignite.testframework.junits.GridAbstractTest; /** * Test suite. @@ -58,6 +58,8 @@ public class IgniteCacheTestSuite5 extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("IgniteCache Test Suite part 5"); suite.addTestSuite(CacheSerializableTransactionsTest.class); @@ -102,8 +104,6 @@ public class IgniteCacheTestSuite5 extends TestSuite { suite.addTestSuite(ConcurrentCacheStartTest.class); - suite.addTestSuite(Cache64kPartitionsTest.class); - return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 77285be..7a5aa80 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 @@ -18,20 +18,12 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.authentication.AuthenticationConfigurationClusterTest; -import org.apache.ignite.internal.processors.authentication.AuthenticationOnNotActiveClusterTest; -import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorNPEOnStartTest; -import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorNodeRestartTest; -import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorSelfTest; import org.apache.ignite.internal.processors.cache.PartitionedAtomicCacheGetsDistributionTest; import org.apache.ignite.internal.processors.cache.PartitionedTransactionalOptimisticCacheGetsDistributionTest; import org.apache.ignite.internal.processors.cache.PartitionedTransactionalPessimisticCacheGetsDistributionTest; import org.apache.ignite.internal.processors.cache.ReplicatedAtomicCacheGetsDistributionTest; import org.apache.ignite.internal.processors.cache.ReplicatedTransactionalOptimisticCacheGetsDistributionTest; import org.apache.ignite.internal.processors.cache.ReplicatedTransactionalPessimisticCacheGetsDistributionTest; -import org.apache.ignite.internal.processors.cache.WalModeChangeAdvancedSelfTest; -import org.apache.ignite.internal.processors.cache.WalModeChangeCoordinatorNotAffinityNodeSelfTest; -import org.apache.ignite.internal.processors.cache.WalModeChangeSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteExchangeLatchManagerCoordinatorFailTest; import org.apache.ignite.internal.processors.cache.distributed.CacheExchangeMergeTest; import org.apache.ignite.internal.processors.cache.distributed.CachePartitionStateTest; @@ -41,7 +33,6 @@ import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheThread 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.persistence.IgnitePdsCacheAssignmentNodeRestartsTest; 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; @@ -49,12 +40,11 @@ import org.apache.ignite.internal.processors.cache.transactions.TxOptimisticOnPa import org.apache.ignite.internal.processors.cache.transactions.TxOptimisticPrepareOnUnstableTopologyTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackAsyncNearCacheTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackAsyncTest; -import org.apache.ignite.internal.processors.cache.transactions.TxRollbackAsyncWithPersistenceTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTimeoutNearCacheTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTimeoutNoDeadlockDetectionTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTimeoutTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTopologyChangeTest; -import org.apache.ignite.internal.processors.cache.transactions.TxWithSmallTimeoutAndContentionOneKeyTest; +import org.apache.ignite.testframework.junits.GridAbstractTest; /** * Test suite. @@ -65,6 +55,8 @@ public class IgniteCacheTestSuite6 extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("IgniteCache Test Suite part 6"); suite.addTestSuite(CachePartitionStateTest.class); @@ -79,11 +71,9 @@ public class IgniteCacheTestSuite6 extends TestSuite { suite.addTestSuite(TxRollbackOnTimeoutTest.class); suite.addTestSuite(TxRollbackOnTimeoutNoDeadlockDetectionTest.class); suite.addTestSuite(TxRollbackOnTimeoutNearCacheTest.class); - suite.addTestSuite(TxWithSmallTimeoutAndContentionOneKeyTest.class); suite.addTestSuite(IgniteCacheThreadLocalTxTest.class); suite.addTestSuite(TxRollbackAsyncTest.class); suite.addTestSuite(TxRollbackAsyncNearCacheTest.class); - suite.addTestSuite(TxRollbackAsyncWithPersistenceTest.class); suite.addTestSuite(TxRollbackOnTopologyChangeTest.class); suite.addTestSuite(TxOptimisticPrepareOnUnstableTopologyTest.class); @@ -94,23 +84,11 @@ public class IgniteCacheTestSuite6 extends TestSuite { suite.addTestSuite(TxOnCachesStartTest.class); - suite.addTestSuite(IgnitePdsCacheAssignmentNodeRestartsTest.class); - - suite.addTestSuite(WalModeChangeSelfTest.class); - suite.addTestSuite(WalModeChangeCoordinatorNotAffinityNodeSelfTest.class); - suite.addTestSuite(WalModeChangeAdvancedSelfTest.class); - suite.addTestSuite(IgniteCache150ClientsTest.class); // TODO enable this test after IGNITE-6753, now it takes too long // suite.addTestSuite(IgniteOutOfMemoryPropagationTest.class); - suite.addTestSuite(AuthenticationConfigurationClusterTest.class); - suite.addTestSuite(AuthenticationProcessorSelfTest.class); - suite.addTestSuite(AuthenticationOnNotActiveClusterTest.class); - suite.addTestSuite(AuthenticationProcessorNodeRestartTest.class); - suite.addTestSuite(AuthenticationProcessorNPEOnStartTest.class); - suite.addTestSuite(ReplicatedAtomicCacheGetsDistributionTest.class); suite.addTestSuite(ReplicatedTransactionalOptimisticCacheGetsDistributionTest.class); suite.addTestSuite(ReplicatedTransactionalPessimisticCacheGetsDistributionTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite7.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite7.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite7.java index dbd455a..330796c 100755 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite7.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite7.java @@ -17,9 +17,30 @@ package org.apache.ignite.testsuites; -import java.util.Set; import junit.framework.TestSuite; +import org.apache.ignite.internal.processors.authentication.Authentication1kUsersNodeRestartTest; +import org.apache.ignite.internal.processors.authentication.AuthenticationConfigurationClusterTest; +import org.apache.ignite.internal.processors.authentication.AuthenticationOnNotActiveClusterTest; +import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorNPEOnStartTest; +import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorNodeRestartTest; +import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorSelfTest; +import org.apache.ignite.internal.processors.cache.CacheDataRegionConfigurationTest; +import org.apache.ignite.internal.processors.cache.CacheGroupMetricsMBeanTest; +import org.apache.ignite.internal.processors.cache.CacheMetricsManageTest; +import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartFailWithPersistenceTest; +import org.apache.ignite.internal.processors.cache.WalModeChangeAdvancedSelfTest; +import org.apache.ignite.internal.processors.cache.WalModeChangeCoordinatorNotAffinityNodeSelfTest; +import org.apache.ignite.internal.processors.cache.WalModeChangeSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.Cache64kPartitionsTest; +import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingPartitionCountersTest; +import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingWithAsyncClearingTest; +import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionMultinodeMixedRegionsTest; +import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCacheAssignmentNodeRestartsTest; import org.apache.ignite.internal.processors.cache.persistence.db.CheckpointBufferDeadlockTest; +import org.apache.ignite.internal.processors.cache.transactions.TxRollbackAsyncWithPersistenceTest; +import org.apache.ignite.internal.processors.cache.transactions.TxWithSmallTimeoutAndContentionOneKeyTest; + +import java.util.Set; /** * Test suite. @@ -39,10 +60,38 @@ public class IgniteCacheTestSuite7 extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite(Set ignoredTests) throws Exception { - TestSuite suite = new TestSuite("IgniteCache Test Suite part 7"); + TestSuite suite = new TestSuite("IgniteCache With Persistence Test Suite"); suite.addTestSuite(CheckpointBufferDeadlockTest.class); + suite.addTestSuite(AuthenticationConfigurationClusterTest.class); + suite.addTestSuite(AuthenticationProcessorSelfTest.class); + suite.addTestSuite(AuthenticationOnNotActiveClusterTest.class); + suite.addTestSuite(AuthenticationProcessorNodeRestartTest.class); + suite.addTestSuite(AuthenticationProcessorNPEOnStartTest.class); + suite.addTestSuite(Authentication1kUsersNodeRestartTest.class); + + suite.addTestSuite(CacheDataRegionConfigurationTest.class); + + suite.addTestSuite(WalModeChangeAdvancedSelfTest.class); + suite.addTestSuite(WalModeChangeSelfTest.class); + suite.addTestSuite(WalModeChangeCoordinatorNotAffinityNodeSelfTest.class); + + suite.addTestSuite(Cache64kPartitionsTest.class); + suite.addTestSuite(GridCacheRebalancingPartitionCountersTest.class); + suite.addTestSuite(GridCacheRebalancingWithAsyncClearingTest.class); + + suite.addTestSuite(IgnitePdsCacheAssignmentNodeRestartsTest.class); + suite.addTestSuite(TxRollbackAsyncWithPersistenceTest.class); + + suite.addTestSuite(CacheGroupMetricsMBeanTest.class); + suite.addTestSuite(CacheMetricsManageTest.class); + suite.addTestSuite(PageEvictionMultinodeMixedRegionsTest.class); + + suite.addTestSuite(IgniteDynamicCacheStartFailWithPersistenceTest.class); + + suite.addTestSuite(TxWithSmallTimeoutAndContentionOneKeyTest.class); + return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java index bab7099..14eb296 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java @@ -18,7 +18,6 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.ClusterBaselineNodesMetricsSelfTest; import org.apache.ignite.internal.ClusterNodeMetricsSelfTest; import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest; import org.apache.ignite.internal.GridAffinityNoCacheSelfTest; @@ -125,7 +124,6 @@ public class IgniteComputeGridTestSuite { suite.addTestSuite(GridTaskInstanceExecutionSelfTest.class); suite.addTestSuite(ClusterNodeMetricsSelfTest.class); suite.addTestSuite(ClusterNodeMetricsUpdateTest.class); - suite.addTestSuite(ClusterBaselineNodesMetricsSelfTest.class); suite.addTestSuite(GridNonHistoryMetricsSelfTest.class); suite.addTestSuite(GridCancelledJobsMetricsSelfTest.class); suite.addTestSuite(GridCollisionJobsContextSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 0b7d2d2..af9e151 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 @@ -17,7 +17,6 @@ package org.apache.ignite.testsuites; -import java.util.Set; import junit.framework.TestSuite; import org.apache.ignite.internal.ComputeJobCancelWithServiceSelfTest; import org.apache.ignite.internal.GridCommunicationSelfTest; @@ -70,8 +69,6 @@ import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClas import org.apache.ignite.internal.processors.service.IgniteServiceDynamicCachesSelfTest; import org.apache.ignite.internal.processors.service.IgniteServiceProxyTimeoutInitializedTest; import org.apache.ignite.internal.processors.service.IgniteServiceReassignmentTest; -import org.apache.ignite.internal.processors.service.ServiceDeploymentOnActivationTest; -import org.apache.ignite.internal.processors.service.ServiceDeploymentOutsideBaselineTest; import org.apache.ignite.internal.processors.service.ServicePredicateAccessCacheTest; import org.apache.ignite.internal.processors.service.SystemCacheNotConfiguredTest; import org.apache.ignite.internal.util.GridStartupWithUndefinedIgniteHomeSelfTest; @@ -79,6 +76,8 @@ import org.apache.ignite.services.ServiceThreadPoolSelfTest; import org.apache.ignite.spi.communication.GridCacheMessageSelfTest; import org.apache.ignite.testframework.GridTestUtils; +import java.util.Set; + /** * Kernal self test suite. */ @@ -153,8 +152,6 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(ServiceThreadPoolSelfTest.class); suite.addTestSuite(GridServiceProcessorBatchDeploySelfTest.class); suite.addTestSuite(GridServiceDeploymentCompoundFutureSelfTest.class); - suite.addTestSuite(ServiceDeploymentOnActivationTest.class); - suite.addTestSuite(ServiceDeploymentOutsideBaselineTest.class); suite.addTestSuite(SystemCacheNotConfiguredTest.class); suite.addTestSuite(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 0eb50d7..f5e3809 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 @@ -17,7 +17,6 @@ package org.apache.ignite.testsuites; -import java.util.Set; import junit.framework.TestSuite; import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2ByteOrderSelfTest; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerEnumSelfTest; @@ -30,11 +29,12 @@ import org.apache.ignite.internal.marshaller.optimized.OptimizedObjectStreamSelf import org.apache.ignite.internal.util.GridHandleTableSelfTest; import org.apache.ignite.internal.util.io.GridUnsafeDataInputOutputByteOrderSelfTest; import org.apache.ignite.internal.util.io.GridUnsafeDataOutputArraySizingSelfTest; -import org.apache.ignite.marshaller.GridMarshallerMappingConsistencyTest; import org.apache.ignite.marshaller.MarshallerEnumDeadlockMultiJvmTest; import org.apache.ignite.marshaller.jdk.GridJdkMarshallerSelfTest; import org.apache.ignite.testframework.GridTestUtils; +import java.util.Set; + /** * Test suite for all marshallers. */ @@ -67,7 +67,6 @@ public class IgniteMarshallerSelfTestSuite extends TestSuite { GridTestUtils.addTestIfNeeded(suite, DirectByteBufferStreamImplV2ByteOrderSelfTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, GridHandleTableSelfTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, OptimizedMarshallerPooledSelfTest.class, ignoredTests); - GridTestUtils.addTestIfNeeded(suite, GridMarshallerMappingConsistencyTest.class, ignoredTests); GridTestUtils.addTestIfNeeded(suite, MarshallerEnumDeadlockMultiJvmTest.class, ignoredTests); return suite; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/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 791621f..309af8c 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 @@ -17,7 +17,6 @@ package org.apache.ignite.testsuites; -import java.util.Set; import junit.framework.TestSuite; import org.apache.ignite.internal.commandline.CommandHandlerParsingTest; import org.apache.ignite.internal.pagemem.impl.PageIdUtilsSelfTest; @@ -41,9 +40,7 @@ import org.apache.ignite.spi.discovery.ClusterMetricsSnapshotSerializeSelfTest; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.thread.GridThreadPoolExecutorServiceSelfTest; import org.apache.ignite.thread.IgniteThreadPoolSizeTest; -import org.apache.ignite.util.GridCommandHandlerTest; import org.apache.ignite.util.GridIntListSelfTest; -import org.apache.ignite.util.GridInternalTaskUnusedWalSegmentsTest; import org.apache.ignite.util.GridLongListSelfTest; import org.apache.ignite.util.GridMessageCollectionTest; import org.apache.ignite.util.GridPartitionMapSelfTest; @@ -55,6 +52,8 @@ import org.apache.ignite.util.mbeans.GridMBeanExoticNamesSelfTest; import org.apache.ignite.util.mbeans.GridMBeanSelfTest; import org.apache.ignite.util.mbeans.WorkersControlMXBeanTest; +import java.util.Set; + /** * Test suite for Ignite utility classes. */ @@ -118,8 +117,6 @@ public class IgniteUtilSelfTestSuite extends TestSuite { // control.sh suite.addTestSuite(CommandHandlerParsingTest.class); - suite.addTestSuite(GridCommandHandlerTest.class); - suite.addTestSuite(GridInternalTaskUnusedWalSegmentsTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java index 148ecef..a39b0c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java @@ -17,12 +17,7 @@ package org.apache.ignite.util; -import java.io.File; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.DataRegionConfiguration; @@ -40,6 +35,12 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import java.io.File; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import static org.apache.ignite.IgniteSystemProperties.IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE; /** @@ -101,15 +102,17 @@ public class GridInternalTaskUnusedWalSegmentsTest extends GridCommonAbstractTes ig0.cluster().active(true); - IgniteCache cache = ig0.cache(DEFAULT_CACHE_NAME); - - for (int k = 0; k < 10_000; k++) - cache.put(k, new byte[1024]); + try (IgniteDataStreamer streamer = ig0.dataStreamer(DEFAULT_CACHE_NAME)) { + for (int k = 0; k < 10_000; k++) + streamer.addData(k, new byte[1024]); + } forceCheckpoint(); - for (int k = 0; k < 1_000; k++) - cache.put(k, new byte[1024]); + try (IgniteDataStreamer streamer = ig0.dataStreamer(DEFAULT_CACHE_NAME)) { + for (int k = 0; k < 1_000; k++) + streamer.addData(k, new byte[1024]); + } forceCheckpoint(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java new file mode 100644 index 0000000..1bc60f6 --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java @@ -0,0 +1,38 @@ +/* + * 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.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.util.GridCommandHandlerIndexingTest; + +/** + * Cache tests using indexing. + */ +public class IgniteCacheWithIndexingAndPersistenceTestSuite extends TestSuite { + /** + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Ignite Cache With Indexing And Persistence Test Suite"); + + suite.addTestSuite(GridCommandHandlerIndexingTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5e723c5/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java index 0a9d8af..e351cb6 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java @@ -41,7 +41,7 @@ import org.apache.ignite.internal.processors.cache.ttl.CacheTtlTransactionalLoca import org.apache.ignite.internal.processors.cache.ttl.CacheTtlTransactionalPartitionedSelfTest; import org.apache.ignite.internal.processors.client.IgniteDataStreamerTest; import org.apache.ignite.internal.processors.query.h2.database.InlineIndexHelperTest; -import org.apache.ignite.util.GridCommandHandlerIndexingTest; +import org.apache.ignite.testframework.junits.GridAbstractTest; /** * Cache tests using indexing. @@ -52,6 +52,8 @@ public class IgniteCacheWithIndexingTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { + System.setProperty(GridAbstractTest.PERSISTENCE_IN_TESTS_IS_ALLOWED_PROPERTY, "false"); + TestSuite suite = new TestSuite("Ignite Cache With Indexing Test Suite"); suite.addTestSuite(InlineIndexHelperTest.class); @@ -86,8 +88,6 @@ public class IgniteCacheWithIndexingTestSuite extends TestSuite { suite.addTestSuite(IgniteDataStreamerTest.class); - suite.addTestSuite(GridCommandHandlerIndexingTest.class); - suite.addTestSuite(BinaryTypeMismatchLoggingTest.class); return suite;