http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25d4d8de/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java new file mode 100644 index 0000000..7c781e3 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.integration; + +import org.gridgain.grid.cache.*; + +import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.gridgain.grid.cache.GridCacheMode.*; + +/** + * + */ +public class IgniteCacheTxNoWriteThroughTest extends IgniteCacheNoWriteThroughAbstractTest { + /** {@inheritDoc} */ + @Override protected int gridCount() { + return 3; + } + + /** {@inheritDoc} */ + @Override protected GridCacheMode cacheMode() { + return PARTITIONED; + } + + /** {@inheritDoc} */ + @Override protected GridCacheAtomicityMode atomicityMode() { + return TRANSACTIONAL; + } + + /** {@inheritDoc} */ + @Override protected GridCacheDistributionMode distributionMode() { + return PARTITIONED_ONLY; + } +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25d4d8de/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index db6f67c..302e058 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -979,8 +979,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac aff = new GridCacheConsistentHashAffinityFunction(false, 200); GridTestUtils.assertThrows(log, new Callable<Object>() { - @Override - public Object call() throws Exception { + @Override public Object call() throws Exception { return startGrid(2); } }, IgniteCheckedException.class, "Affinity partitions count mismatch"); @@ -994,14 +993,13 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac checkSecondGridStartFails( new C1<CacheConfiguration, Void>() { - /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { cfg.setInterceptor(new GridCacheInterceptorAdapter() {/*No-op.*/}); + return null; } }, new C1<CacheConfiguration, Void>() { - /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25d4d8de/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index 3688772..a8e686b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -99,6 +99,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); + cacheCfg.setLoadPreviousValue(true); cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setAffinity(aff); cacheCfg.setAtomicityMode(atomicityMode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25d4d8de/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java index 31d7449..677f13c 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java @@ -353,6 +353,20 @@ public class GridDataGridTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheTxNearEnabledNoReadThroughTest.class); suite.addTestSuite(IgniteCacheTxLocalNoReadThroughTest.class); + suite.addTestSuite(IgniteCacheAtomicNoLoadPreviousValueTest.class); + suite.addTestSuite(IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class); + suite.addTestSuite(IgniteCacheAtomicLocalNoLoadPreviousValueTest.class); + suite.addTestSuite(IgniteCacheTxNoLoadPreviousValueTest.class); + suite.addTestSuite(IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class); + suite.addTestSuite(IgniteCacheTxLocalNoLoadPreviousValueTest.class); + + suite.addTestSuite(IgniteCacheAtomicNoWriteThroughTest.class); + suite.addTestSuite(IgniteCacheAtomicNearEnabledNoWriteThroughTest.class); + suite.addTestSuite(IgniteCacheAtomicLocalNoWriteThroughTest.class); + suite.addTestSuite(IgniteCacheTxNoWriteThroughTest.class); + suite.addTestSuite(IgniteCacheTxNearEnabledNoWriteThroughTest.class); + suite.addTestSuite(IgniteCacheTxLocalNoWriteThroughTest.class); + return suite; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25d4d8de/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java index 29dfd45..37046a5 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.cache.spring; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -50,7 +51,7 @@ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridCacheConfiguration cache = new GridCacheConfiguration(); + CacheConfiguration cache = new CacheConfiguration(); cache.setName(DATA_CACHE_NAME);
