http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java deleted file mode 100644 index dc1e238..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ /dev/null @@ -1,1648 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.transactions.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jdk8.backport.*; -import org.jetbrains.annotations.*; - -import javax.cache.processor.*; -import java.util.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbstractSelfTest { - /** */ - private static Interceptor interceptor; - - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 3; - } - - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - interceptor = new Interceptor(); - - super.beforeTestsStarted(); - - awaitPartitionMapExchange(); - } - - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { - interceptor.reset(); - - interceptor.disabled = true; - - super.afterTest(); - - interceptor.disabled = false; - - assertEquals(0, interceptor.invokeCnt.get()); - } - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration c = super.getConfiguration(gridName); - - c.getTransactionsConfiguration().setTxSerializableEnabled(true); - - return c; - } - - /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); - - assertNotNull(interceptor); - - ccfg.setInterceptor(interceptor); - - if (ccfg.getAtomicityMode() == ATOMIC) { - assertNotNull(writeOrderMode()); - - ccfg.setAtomicWriteOrderMode(writeOrderMode()); - } - - if (!storeEnabled()) { - ccfg.setCacheStoreFactory(null); - ccfg.setReadThrough(false); - ccfg.setWriteThrough(false); - } - - return ccfg; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return PARTITIONED; - } - - /** - * @return Atomic cache write order mode. - */ - @Nullable protected GridCacheAtomicWriteOrderMode writeOrderMode() { - return null; - } - - /** - * @return {@code True} if cache store is enabled. - */ - protected boolean storeEnabled() { - return false; - } - - /** - * @throws Exception If failed. - */ - public void testGet() throws Exception { - testGet(primaryKey(0)); - - afterTest(); - - if (cacheMode() != LOCAL) - testGet(backupKey(0)); - } - - /** - * @param key Key. - * @throws Exception If failed. - */ - private void testGet(String key) throws Exception { - // Try when value is not in cache. - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - return null; - } - }; - - log.info("Get 1."); - - assertEquals(null, cache(0).get(key)); - - assertEquals(1, interceptor.invokeCnt.get()); - - assertEquals(0, interceptor.getMap.size()); - - interceptor.reset(); - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - return 1; - } - }; - - log.info("Get 2."); - - assertEquals((Integer)1, cache(0).get(key)); - - assertEquals(1, interceptor.invokeCnt.get()); - - assertEquals(0, interceptor.getMap.size()); - - interceptor.reset(); - - // Disable interceptor and update cache. - - interceptor.disabled = true; - - cache(0).put(key, 100); - - interceptor.disabled = false; - - // Try when value is in cache. - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - return null; - } - }; - - log.info("Get 3."); - - assertEquals(null, cache(0).get(key)); - - assertEquals(1, interceptor.invokeCnt.get()); - - assertEquals(1, interceptor.getMap.size()); - - assertEquals(100, interceptor.getMap.get(key)); - - checkCacheValue(key, 100); - - interceptor.reset(); - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - return (Integer)val + 1; - } - }; - - log.info("Get 4."); - - assertEquals((Integer)101, cache(0).get(key)); - - assertEquals(1, interceptor.invokeCnt.get()); - - assertEquals(1, interceptor.getMap.size()); - - assertEquals(100, interceptor.getMap.get(key)); - - checkCacheValue(key, 100); - - interceptor.reset(); - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - return (Integer)val + 1; - } - }; - - log.info("GetAsync 1."); - - assertEquals((Integer)101, cache(0).getAsync(key).get()); - - assertEquals(1, interceptor.invokeCnt.get()); - - assertEquals(1, interceptor.getMap.size()); - - assertEquals(100, interceptor.getMap.get(key)); - - checkCacheValue(key, 100); - } - - /** - * @throws Exception If failed. - */ - public void testGetAll() throws Exception { - List<String> keys = new ArrayList<>(); - - for (int i = 0; i < 1000; i++) - keys.add(String.valueOf(i)); - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - return null; - } - }; - - Map<String, Integer> map = cache(0).getAll(keys); - - for (String key : keys) - assertEquals(null, map.get(key)); - - assertEquals(1000, interceptor.invokeCnt.get()); - - interceptor.reset(); - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - int k = Integer.valueOf((String)key); - - return k % 2 == 0 ? null : (k * 2); - } - }; - - map = cache(0).getAll(keys); - - for (String key : keys) { - int k = Integer.valueOf(key); - - if (k % 2 == 0) - assertEquals(null, map.get(key)); - else - assertEquals((Integer)(k * 2), map.get(key)); - } - - assertEquals(1000, interceptor.invokeCnt.get()); - - // Put some values in cache. - - interceptor.disabled = true; - - for (int i = 0; i < 500; i++) - cache(0).put(String.valueOf(i), i); - - interceptor.disabled = false; - - for (int j = 0; j < 2; j++) { - interceptor.reset(); - - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onGet(Object key, Object val) { - int k = Integer.valueOf((String)key); - - switch (k % 3) { - case 0: - return null; - - case 1: - return val; - - case 2: - return k * 3; - - default: - fail(); - } - - return null; - } - }; - - map = j == 0 ? cache(0).getAll(keys) : cache(0).getAllAsync(keys).get(); - - for (int i = 0; i < keys.size(); i++) { - String key = keys.get(i); - - switch (i % 3) { - case 0: - assertEquals(null, map.get(key)); - - break; - - case 1: - Integer exp = i < 500 ? i : null; - - assertEquals(exp, map.get(key)); - - break; - - case 2: - assertEquals((Integer)(i * 3), map.get(key)); - - break; - - default: - fail(); - } - } - - assertEquals(1000, interceptor.invokeCnt.get()); - } - } - - /** - * @throws Exception If failed. - */ - public void testCancelUpdate() throws Exception { - for (Operation op : Operation.values()) { - testCancelUpdate(primaryKey(0), op); - - afterTest(); - - if (cacheMode() != LOCAL) { - testCancelUpdate(backupKey(0), op); - - afterTest(); - } - } - } - - /** - * @param op Operation type. - * @return {@code True} if this is atomic cache and update is first run on primary node. - */ - private int expectedIgnoreInvokeCount(Operation op) { - int dataNodes = cacheMode() == REPLICATED ? gridCount() : 2; - - if (atomicityMode() == TRANSACTIONAL) - return dataNodes + (storeEnabled() ? 1 : 0); // One call before store is updated. - else { - // If update goes through primary node and it is cancelled then backups aren't updated. - return (writeOrderMode() == PRIMARY || op == Operation.TRANSFORM) ? 1 : dataNodes; - } - } - - /** - * @param op Operation type. - * @return {@code True} if this is atomic cache and update is first run on primary node. - */ - private int expectedInvokeCount(Operation op) { - int dataNodes = cacheMode() == REPLICATED ? gridCount() : 2; - - if (atomicityMode() == TRANSACTIONAL) - // Update + after update + one call before store is updated. - return dataNodes * 2 + (storeEnabled() ? 1 : 0); - else - return (writeOrderMode() == PRIMARY || op == Operation.TRANSFORM) ? 2 : dataNodes * 2; - } - - /** - * @param key Key. - * @param op Operation type. - * @throws Exception If failed. - */ - private void testCancelUpdate(String key, Operation op) throws Exception { - // Interceptor returns null to disabled update. - GridCacheInterceptor retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { - return null; - } - }; - - interceptor.retInterceptor = retInterceptor; - - // Execute update when value is null, it should not change cache value. - - log.info("Update 1 " + op); - - update(0, op, key, 1, null); - - checkCacheValue(key, null); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforePutMap.size()); - - IgniteBiTuple t = interceptor.beforePutMap.get(key); - - assertEquals(null, t.get1()); - assertEquals(1, t.get2()); - - // Disable interceptor and update cache. - - interceptor.reset(); - - interceptor.disabled = true; - - clearCaches(); - - cache(0).put(key, 1); - - checkCacheValue(key, 1); - - // Execute update when value is not null, it should not change cache value. - - interceptor.disabled = false; - interceptor.retInterceptor = retInterceptor; - - log.info("Update 2 " + op); - - update(0, op, key, 2, 1); - - checkCacheValue(key, 1); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforePutMap.size()); - - t = interceptor.beforePutMap.get(key); - - assertEquals(1, t.get1()); - assertEquals(2, t.get2()); - } - - /** - * @throws Exception If failed. - */ - public void testModifyUpdate() throws Exception { - for (Operation op : Operation.values()) { - testModifyUpdate(primaryKey(0), op); - - afterTest(); - - if (cacheMode() != LOCAL) { - testModifyUpdate(backupKey(0), op); - - afterTest(); - } - } - } - - /** - * @param key Key. - * @param op Operation type. - * @throws Exception If failed. - */ - private void testModifyUpdate(String key, Operation op) throws Exception { - // Interceptor returns incremented new value. - GridCacheInterceptor retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { - return (Integer)newVal + 1; - } - }; - - // Execute update when value is null. - - interceptor.retInterceptor = retInterceptor; - - log.info("Update 1 " + op); - - update(0, op, key, 1, null); - - checkCacheValue(key, 2); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforePutMap.size()); - - IgniteBiTuple t = interceptor.beforePutMap.get(key); - - assertEquals(null, t.get1()); - assertEquals(1, t.get2()); - - assertEquals(1, interceptor.afterPutMap.size()); - - assertEquals(2, interceptor.afterPutMap.get(key)); - - // Execute update when value is not null. - - interceptor.reset(); - - interceptor.retInterceptor = retInterceptor; - - log.info("Update 2 " + op); - - update(0, op, key, 3, 2); - - checkCacheValue(key, 4); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforePutMap.size()); - - t = interceptor.beforePutMap.get(key); - - assertEquals(2, t.get1()); - assertEquals(3, t.get2()); - - assertEquals(1, interceptor.afterPutMap.size()); - - assertEquals(4, interceptor.afterPutMap.get(key)); - } - - /** - * @throws Exception If failed. - */ - public void testCancelRemove() throws Exception { - for (Operation op : Operation.values()) { - testCancelRemove(primaryKey(0), op); - - afterTest(); - - if (cacheMode() != LOCAL) { - testCancelRemove(backupKey(0), op); - - afterTest(); - } - } - } - - /** - * @param key Key. - * @param op Operation type. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void testCancelRemove(String key, Operation op) throws Exception { - // Interceptor disables remove and returns null. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(true, null); - } - }; - - // Execute remove when value is null. - - log.info("Remove 1 " + op); - - remove(0, op, key, null, null); - - checkCacheValue(key, null); - - // Check values passed to interceptor. - - assertEquals(0, interceptor.beforeRemoveMap.size()); - - assertEquals(null, interceptor.beforeRemoveMap.get(key)); - - log.info("Remove 2 " + op); - - interceptor.reset(); - - // Interceptor disables remove and changes return value. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(true, 900); - } - }; - - // Execute remove when value is null, interceptor changes return value. - - remove(0, op, key, null, 900); - - checkCacheValue(key, null); - - // Check values passed to interceptor. - - assertEquals(0, interceptor.beforeRemoveMap.size()); - - assertEquals(null, interceptor.beforeRemoveMap.get(key)); - - // Disable interceptor and update cache. - - interceptor.reset(); - - interceptor.disabled = true; - - clearCaches(); - - cache(0).put(key, 1); - - checkCacheValue(key, 1); - - // Execute remove when value is not null, it should not change cache value. - - interceptor.reset(); - - interceptor.disabled = false; - - // Interceptor disables remove and returns null. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(true, null); - } - }; - - log.info("Remove 3 " + op); - - remove(0, op, key, 1, null); - - checkCacheValue(key, 1); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforeRemoveMap.size()); - - assertEquals(1, interceptor.beforeRemoveMap.get(key)); - - interceptor.reset(); - - // Interceptor disables remove and changes return value. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(true, 1000); - } - }; - - log.info("Remove 4 " + op); - - remove(0, op, key, 1, 1000); - - checkCacheValue(key, 1); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforeRemoveMap.size()); - - assertEquals(1, interceptor.beforeRemoveMap.get(key)); - } - - /** - * @throws Exception If failed. - */ - public void testRemove() throws Exception { - for (Operation op : Operation.values()) { - testRemove(primaryKey(0), op); - - afterTest(); - - if (cacheMode() != LOCAL) { - testRemove(backupKey(0), op); - - afterTest(); - } - } - } - - /** - * @param key Key. - * @param op Operation type. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void testRemove(String key, Operation op) throws Exception { - // Interceptor changes return value to null. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(false, null); - } - }; - - // Execute remove when value is null. - - log.info("Remove 1 " + op); - - remove(0, op, key, null, null); - - checkCacheValue(key, null); - - // Check values passed to interceptor. - - assertEquals(0, interceptor.beforeRemoveMap.size()); - - assertEquals(0, interceptor.afterRemoveMap.size()); - - log.info("Remove 2 " + op); - - interceptor.reset(); - - // Interceptor changes return value. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(false, 900); - } - }; - - // Execute remove when value is null. - - remove(0, op, key, null, 900); - - checkCacheValue(key, null); - - // Check values passed to interceptor. - - assertEquals(0, interceptor.beforeRemoveMap.size()); - - assertEquals(0, interceptor.afterRemoveMap.size()); - - // Disable interceptor and update cache. - - interceptor.reset(); - - interceptor.disabled = true; - - clearCaches(); - - cache(0).put(key, 1); - - checkCacheValue(key, 1); - - // Execute remove when value is not null. - - interceptor.reset(); - - interceptor.disabled = false; - - // Interceptor changes return value to null. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(false, null); - } - }; - - log.info("Remove 3 " + op); - - remove(0, op, key, 1, null); - - checkCacheValue(key, null); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforeRemoveMap.size()); - - assertEquals(1, interceptor.beforeRemoveMap.get(key)); - - assertEquals(1, interceptor.afterRemoveMap.size()); - - assertEquals(1, interceptor.afterRemoveMap.get(key)); - - // Disable interceptor and update cache. - - interceptor.disabled = true; - - clearCaches(); - - cache(0).put(key, 2); - - checkCacheValue(key, 2); - - // Execute remove when value is not null. - - interceptor.reset(); - - interceptor.disabled = false; - - // Interceptor changes return value. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(false, 1000); - } - }; - - log.info("Remove 4 " + op); - - remove(0, op, key, 2, 1000); - - checkCacheValue(key, null); - - // Check values passed to interceptor. - - assertEquals(1, interceptor.beforeRemoveMap.size()); - - assertEquals(2, interceptor.beforeRemoveMap.get(key)); - - assertEquals(1, interceptor.afterRemoveMap.size()); - - assertEquals(2, interceptor.afterRemoveMap.get(key)); - } - - /** - * @throws Exception If failed. - */ - public void testNearNodeKey() throws Exception { - if (cacheMode() != PARTITIONED) - return; - - if (atomicityMode() == TRANSACTIONAL) { - for (IgniteTxConcurrency txConcurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation txIsolation : IgniteTxIsolation.values()) { - for (Operation op : Operation.values()) { - testNearNodeKey(txConcurrency, txIsolation, op); - - afterTest(); - } - } - } - } - - testNearNodeKey(null, null, null); - } - - /** - * @param txConcurrency Transaction concurrency. - * @param txIsolation Transaction isolation. - * @param op Operation type. - * @throws Exception If failed. - */ - private void testNearNodeKey(@Nullable IgniteTxConcurrency txConcurrency, - @Nullable IgniteTxIsolation txIsolation, @Nullable Operation op) throws Exception { - // Interceptor returns incremented new value. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { - return (Integer)newVal + 1; - } - }; - - String key1 = primaryKey(0); - String key2 = backupKey(0); - String key3 = nearKey(0); - - interceptor.disabled = true; - - // Put from grid 1 to be sure grid 0 does not have value for near key. - cache(1).putAll(F.asMap(key1, 1, key2, 2, key3, 3)); - - interceptor.disabled = false; - - log.info("Update [op=" + op + ", key1=" + key1 + ", key2=" + key2 + ", key3=" + key3 + - ", txConcurrency=" + txConcurrency + ", txIsolation=" + txIsolation + ']'); - - if (txConcurrency != null) { - assertNotNull(txIsolation); - assertNotNull(op); - - try (IgniteTx tx = cache(0).txStart(txConcurrency, txIsolation)) { - update(0, op, key1, 100, 1); - update(0, op, key2, 200, 2); - update(0, op, key3, 300, 3); - - tx.commit(); - } - } - else - cache(0).putAll(F.asMap(key1, 100, key2, 200, key3, 300)); - - checkCacheValue(key1, 101); - checkCacheValue(key2, 201); - checkCacheValue(key3, 301); - } - - /** - * @throws Exception If failed. - */ - public void testBatchUpdate() throws Exception { - testBatchUpdate(Operation.UPDATE); - - afterTest(); - - testBatchUpdate(Operation.TRANSFORM); - } - - /** - * @param op Operation type. - * @throws Exception If failed. - */ - private void testBatchUpdate(Operation op) throws Exception { - // Interceptor returns incremented new value. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { - return (Integer)newVal + 1; - } - }; - - Map<String, Integer> map = new HashMap<>(); - - final String key1; - String key2; - String key3; - - if (cacheMode() == LOCAL) { - key1 = "1"; - key2 = "2"; - key3 = "3"; - } - else { - List<String> keys = primaryKeys(0, 2); - key1 = keys.get(0); // Need two keys for the same node to test atomic cache batch store upadte. - key2 = keys.get(1); - key3 = backupKey(0); - } - - map.put(key1, 1); - map.put(key2, 2); - map.put(key3, 3); - - log.info("Batch update 1: " + op); - - batchUpdate(0, op, map); - - checkCacheValue(key1, 2); - checkCacheValue(key2, 3); - checkCacheValue(key3, 4); - - assertEquals(3, interceptor.beforePutMap.size()); - - assertBeforePutValue(key1, null, 1); - assertBeforePutValue(key2, null, 2); - assertBeforePutValue(key3, null, 3); - - assertEquals(3, interceptor.afterPutMap.size()); - - assertEquals(2, interceptor.afterPutMap.get(key1)); - assertEquals(3, interceptor.afterPutMap.get(key2)); - assertEquals(4, interceptor.afterPutMap.get(key3)); - - interceptor.reset(); - - // Interceptor returns incremented new value, cancels update for one key. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { - if (key.equals(key1)) - return null; - - return (Integer)newVal + 1; - } - }; - - map.put(key1, 100); - map.put(key2, 200); - map.put(key3, 300); - - log.info("Batch update 2: " + op); - - batchUpdate(0, op, map); - - checkCacheValue(key1, 2); - checkCacheValue(key2, 201); - checkCacheValue(key3, 301); - - assertEquals(3, interceptor.beforePutMap.size()); - - assertBeforePutValue(key1, 2, 100); - assertBeforePutValue(key2, 3, 200); - assertBeforePutValue(key3, 4, 300); - - assertEquals(2, interceptor.afterPutMap.size()); - - assertEquals(201, interceptor.afterPutMap.get(key2)); - assertEquals(301, interceptor.afterPutMap.get(key3)); - } - - /** - * @throws Exception If failed. - */ - public void testBatchRemove() throws Exception { - testBatchRemove(Operation.UPDATE); - - afterTest(); - - testBatchRemove(Operation.TRANSFORM); - } - - /** - * @param op Operation type. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void testBatchRemove(Operation op) throws Exception { - Map<String, Integer> map = new HashMap<>(); - - final String key1; - String key2; - String key3; - - if (cacheMode() == LOCAL) { - key1 = "1"; - key2 = "2"; - key3 = "3"; - } - else { - List<String> keys = primaryKeys(0, 2); - key1 = keys.get(0); - key2 = keys.get(1); - key3 = backupKey(0); - } - - map.put(key1, 1); - map.put(key2, 2); - map.put(key3, 3); - - // Interceptor does not cancel update. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(false, 999); - } - }; - - - log.info("Batch remove 1: " + op); - - batchRemove(0, op, map); - - checkCacheValue(key1, null); - checkCacheValue(key2, null); - checkCacheValue(key3, null); - - assertEquals(0, interceptor.beforeRemoveMap.size()); - - assertEquals(0, interceptor.afterRemoveMap.size()); - - // Disable interceptor and put some values in cache. - - interceptor.disabled = true; - - cache(0).putAll(map); - - interceptor.disabled = false; - - interceptor.reset(); - - // Interceptor does not cancel update. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(false, 999); - } - }; - - log.info("Batch remove 2: " + op); - - batchRemove(0, op, map); - - checkCacheValue(key1, null); - checkCacheValue(key2, null); - checkCacheValue(key3, null); - - assertEquals(3, interceptor.beforeRemoveMap.size()); - - assertEquals(1, interceptor.beforeRemoveMap.get(key1)); - assertEquals(2, interceptor.beforeRemoveMap.get(key2)); - assertEquals(3, interceptor.beforeRemoveMap.get(key3)); - - assertEquals(3, interceptor.afterRemoveMap.size()); - - assertEquals(1, interceptor.afterRemoveMap.get(key1)); - assertEquals(2, interceptor.afterRemoveMap.get(key2)); - assertEquals(3, interceptor.afterRemoveMap.get(key3)); - - // Disable interceptor and put some values in cache. - - interceptor.disabled = true; - - cache(0).putAll(map); - - interceptor.disabled = false; - - interceptor.reset(); - - // Interceptor cancels update for one key. - interceptor.retInterceptor = new InterceptorAdapter() { - @Nullable@Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - return new IgniteBiTuple(key.equals(key1), 999); - } - }; - - log.info("Batch remove 3: " + op); - - batchRemove(0, op, map); - - checkCacheValue(key1, 1); - checkCacheValue(key2, null); - checkCacheValue(key3, null); - - assertEquals(3, interceptor.beforeRemoveMap.size()); - - assertEquals(1, interceptor.beforeRemoveMap.get(key1)); - assertEquals(2, interceptor.beforeRemoveMap.get(key2)); - assertEquals(3, interceptor.beforeRemoveMap.get(key3)); - - assertEquals(2, interceptor.afterRemoveMap.size()); - - assertEquals(2, interceptor.afterRemoveMap.get(key2)); - assertEquals(3, interceptor.afterRemoveMap.get(key3)); - } - - /** - * @param key Key. - * @param oldVal Expected old value. - * @param newVal Expected new value. - */ - private void assertBeforePutValue(String key, @Nullable Object oldVal, @Nullable Object newVal) { - IgniteBiTuple t = interceptor.beforePutMap.get(key); - - assertNotNull(t); - assertEquals(t.get1(), oldVal); - assertEquals(t.get2(), newVal); - } - - /** - * @param grid Grid index. - * @param op Operation type. - * @param key Key. - * @param val Value. - * @param expOld Expected expOld value. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void update(int grid, Operation op, String key, final Integer val, @Nullable final Integer expOld) - throws Exception { - cacheUpdate(grid, false, op, key, val, expOld, null); - } - - /** - * @param grid Grid index. - * @param op Operation type. - * @param key Key. - * @param expOld Expected expOld value. - * @param expRmvRet Expected remove result. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void remove(int grid, Operation op, String key, @Nullable final Integer expOld, - @Nullable final Integer expRmvRet) throws Exception { - cacheUpdate(grid, true, op, key, null, expOld, expRmvRet); - } - - /** - * @param grid Grid index. - * @param rmv If {@code true} then executes remove. - * @param op Operation type. - * @param key Key. - * @param val Value. - * @param expOld Expected expOld value. - * @param expRmvRet Expected remove result. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void cacheUpdate(int grid, boolean rmv, Operation op, String key, final Integer val, - @Nullable final Integer expOld, @Nullable final Integer expRmvRet) - throws Exception { - IgniteCache<String, Integer> cache = jcache(grid); - - if (rmv) { - assertNull(val); - - switch (op) { - case UPDATE: { - assertEquals(expRmvRet, cache.getAndRemove(key)); - - break; - } - - case UPDATEX: { - cache.remove(key); - - break; - } - - case TRANSFORM: { - cache.invoke(key, new EntryProcessor<String, Integer, Void>() { - @Override public Void process(MutableEntry<String, Integer> e, Object... args) { - Integer old = e.getValue(); - - assertEquals(expOld, old); - - e.remove(); - - return null; - } - }); - - break; - } - - default: - fail(); - } - } - else { - switch (op) { - case UPDATE: { - assertEquals(expOld, cache.getAndPut(key, val)); - - break; - } - - case UPDATEX: { - cache.put(key, val); - - break; - } - - case TRANSFORM: { - cache.invoke(key, new EntryProcessor<String, Integer, Void>() { - @Override public Void process(MutableEntry<String, Integer> e, Object... args) { - Integer old = e.getValue(); - - assertEquals(expOld, old); - - e.setValue(val); - - return null; - } - }); - - break; - } - - default: - fail(); - } - } - } - - /** - * @param grid Grid index. - * @param op Operation type. - * @param map Key/values map. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void batchUpdate(int grid, Operation op, final Map<String, Integer> map) throws Exception { - cacheBatchUpdate(grid, false, op, map); - } - - /** - * @param grid Grid index. - * @param op Operation type. - * @param map Key/values map. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void batchRemove(int grid, Operation op, final Map<String, Integer> map) throws Exception { - cacheBatchUpdate(grid, true, op, map); - } - - /** - * @param grid Grid index. - * @param rmv If {@code true} then executes remove. - * @param op Operation type. - * @param map Key/values map. - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - private void cacheBatchUpdate(int grid, boolean rmv, Operation op, final Map<String, Integer> map) - throws Exception { - IgniteCache<String, Integer> cache = jcache(grid); - - if (rmv) { - switch (op) { - case UPDATE: { - cache.removeAll(map.keySet()); - - break; - } - - case TRANSFORM: { - cache.invokeAll(map.keySet(), new EntryProcessor<String, Integer, Void>() { - @Override public Void process(MutableEntry<String, Integer> e, Object... args) { - e.remove(); - - return null; - } - }); - - break; - } - - default: - fail(); - } - } - else { - switch (op) { - case UPDATE: { - cache.putAll(map); - - break; - } - - case TRANSFORM: { - cache.invokeAll(map.keySet(), new EntryProcessor<String, Integer, Void>() { - @Override public Void process(MutableEntry<String, Integer> e, Object... args) { - e.setValue(map.get(e.getKey())); - - return null; - } - }); - - break; - } - - default: - fail(); - } - } - } - - /** - * @param idx Grid index. - * @return Primary key for grid. - */ - private String primaryKey(int idx) { - return primaryKeys(idx, 1).get(0); - } - - /** - * @param idx Grid index. - * @param cnt Number of keys. - * @return Primary keys for grid. - */ - private List<String> primaryKeys(int idx, int cnt) { - assert cnt > 0; - - GridCacheAffinity aff = cache(0).affinity(); - - List<String> keys = new ArrayList<>(cnt); - - for (int i = 0; i < 10_000; i++) { - String key = String.valueOf(i); - - if (aff.isPrimary(grid(idx).localNode(), key)) { - keys.add(key); - - if (keys.size() == cnt) - break; - } - } - - assertEquals(cnt, keys.size()); - - return keys; - } - - /** - * @param idx Grid index. - * @return Primary key for grid. - */ - private String backupKey(int idx) { - GridCacheAffinity aff = cache(0).affinity(); - - String key = null; - - for (int i = 0; i < 10_000; i++) { - if (aff.isBackup(grid(idx).localNode(), String.valueOf(i))) { - key = String.valueOf(i); - - break; - } - } - - assertNotNull(key); - - return key; - } - - /** - * @param idx Grid index. - * @return Key which does not belong to the grid. - */ - private String nearKey(int idx) { - GridCacheAffinity aff = cache(0).affinity(); - - String key = null; - - for (int i = 0; i < 10_000; i++) { - if (!aff.isPrimaryOrBackup(grid(idx).localNode(), String.valueOf(i))) { - key = String.valueOf(i); - - break; - } - } - - assertNotNull(key); - - return key; - } - - /** - * @param key Key. - * @param expVal Expected value. - * @throws Exception If failed. - */ - private void checkCacheValue(Object key, @Nullable Object expVal) throws Exception { - interceptor.disabled = true; - - if (storeEnabled()) - assertEquals("Unexpected store value", expVal, map.get(key)); - - try { - for (int i = 0; i < gridCount(); i++) - assertEquals("Unexpected value for grid " + i, expVal, grid(i).cache(null).get(key)); - } - finally { - interceptor.disabled = false; - } - } - - /** - * @throws Exception If failed. - */ - private void clearCaches() throws Exception { - for (int i = 0; i < gridCount(); i++) - cache(i).removeAll(); - } - - /** - * - */ - private enum Operation { - /** - * - */ - UPDATE, - - /** - * - */ - UPDATEX, - - /** - * - */ - TRANSFORM, - } - - /** - * - */ - private static class InterceptorAdapter implements GridCacheInterceptor { - /** */ - @Nullable @Override public Object onGet(Object key, Object val) { - fail("onGet not expected"); - - return null; - } - - /** */ - @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { - fail("onBeforePut not expected"); - - return null; - } - - /** */ - @Override public void onAfterPut(Object key, Object val) { - fail("onAfterPut not expected"); - } - - /** */ - @Nullable @Override public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - fail("onBeforeRemove not expected"); - - return null; - } - - /** */ - @Override public void onAfterRemove(Object key, Object val) { - fail("onAfterRemove not expected"); - } - } - - /** - * - */ - private class Interceptor implements GridCacheInterceptor { - /** */ - private final Map<Object, Object> getMap = new ConcurrentHashMap8<>(); - - /** */ - private final Map<Object, Object> afterPutMap = new ConcurrentHashMap8<>(); - - /** */ - private final Map<Object, IgniteBiTuple> beforePutMap = new ConcurrentHashMap8<>(); - - /** */ - private final Map<Object, Object> beforeRemoveMap = new ConcurrentHashMap8<>(); - - /** */ - private final Map<Object, Object> afterRemoveMap = new ConcurrentHashMap8<>(); - - /** */ - private final AtomicInteger invokeCnt = new AtomicInteger(); - - /** */ - private volatile boolean disabled; - - /** */ - private volatile GridCacheInterceptor retInterceptor; - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Nullable @Override public Object onGet(Object key, Object val) { - if (disabled) - return val; - - assertNotNull(retInterceptor); - - Object ret = retInterceptor.onGet(key, val); - - log.info("Get [key=" + key + ", val=" + val + ", ret=" + ret + ']'); - - if (val != null) { - Object old = getMap.put(key, val); - - assertNull(old); // Fot get interceptor is called on near node only. - } - - invokeCnt.incrementAndGet(); - - return ret; - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Nullable @Override public Object onBeforePut(Object key, @Nullable Object oldVal, Object newVal) { - if (disabled) - return newVal; - - assertNotNull(retInterceptor); - - Object ret = retInterceptor.onBeforePut(key, oldVal, newVal); - - log.info("Before put [key=" + key + ", oldVal=" + oldVal + ", newVal=" + newVal + ", ret=" + ret + ']'); - - invokeCnt.incrementAndGet(); - - IgniteBiTuple t = beforePutMap.put(key, new IgniteBiTuple(oldVal, newVal)); - - if (t != null) { - assertEquals("Interceptor called with different old values for key " + key, t.get1(), oldVal); - assertEquals("Interceptor called with different new values for key " + key, t.get2(), newVal); - } - - return ret; - } - - /** {@inheritDoc} */ - @Override public void onAfterPut(Object key, Object val) { - if (disabled) - return; - - log.info("After put [key=" + key + ", val=" + val + ']'); - - invokeCnt.incrementAndGet(); - - Object old = afterPutMap.put(key, val); - - if (old != null) - assertEquals(old, val); - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override @Nullable public IgniteBiTuple onBeforeRemove(Object key, @Nullable Object val) { - if (disabled) - return new IgniteBiTuple(false, val); - - assertNotNull(retInterceptor); - - IgniteBiTuple ret = retInterceptor.onBeforeRemove(key, val); - - log.info("Before remove [key=" + key + ", val=" + val + ", ret=" + ret + ']'); - - invokeCnt.incrementAndGet(); - - if (val != null) { - Object old = beforeRemoveMap.put(key, val); - - if (old != null) - assertEquals(old, val); - } - - return ret; - } - - /** {@inheritDoc} */ - @Override public void onAfterRemove(Object key, Object val) { - if (disabled) - return; - - log.info("After remove [key=" + key + ", val=" + val + ']'); - - invokeCnt.incrementAndGet(); - - if (val != null) { - Object old = afterRemoveMap.put(key, val); - - if (old != null) - assertEquals(old, val); - } - } - - /** - * - */ - public void reset() { - invokeCnt.set(0); - - getMap.clear(); - beforePutMap.clear(); - afterPutMap.clear(); - afterRemoveMap.clear(); - beforeRemoveMap.clear(); - - retInterceptor = null; - } - } -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java deleted file mode 100644 index ad86484..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicNearEnabledSelfTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorAtomicNearEnabledSelfTest extends GridCacheInterceptorAtomicSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return NEAR_PARTITIONED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java deleted file mode 100644 index 846672f..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; -import org.jetbrains.annotations.*; - -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Tests {@link org.apache.ignite.cache.GridCacheInterceptor}. - */ -public class GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; - } - - /** {@inheritDoc} */ - @Nullable @Override protected GridCacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java deleted file mode 100644 index 5ee45ce..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; -import org.jetbrains.annotations.*; - -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest - extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return REPLICATED; - } - - /** {@inheritDoc} */ - @Nullable @Override protected GridCacheAtomicWriteOrderMode writeOrderMode() { - return PRIMARY; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java deleted file mode 100644 index 8effec7..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; -import org.jetbrains.annotations.*; - -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorAtomicReplicatedSelfTest extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return REPLICATED; - } - - /** {@inheritDoc} */ - @Nullable @Override protected GridCacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicSelfTest.java deleted file mode 100644 index 8a26a68..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicSelfTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; -import org.jetbrains.annotations.*; - -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorAtomicSelfTest extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return PARTITIONED_ONLY; - } - - /** {@inheritDoc} */ - @Nullable @Override protected GridCacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java deleted file mode 100644 index ea37d7a..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.GridCacheInterceptor; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorAtomicWithStoreReplicatedSelfTest - extends GridCacheInterceptorAtomicReplicatedSelfTest { - /** {@inheritDoc} */ - @Override protected boolean storeEnabled() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java deleted file mode 100644 index 0319bc4..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAtomicWithStoreSelfTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.GridCacheInterceptor; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorAtomicWithStoreSelfTest extends GridCacheInterceptorAtomicSelfTest { - /** {@inheritDoc} */ - @Override protected boolean storeEnabled() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java deleted file mode 100644 index 96bca1d..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; -import org.jetbrains.annotations.*; - -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorLocalAtomicSelfTest extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Nullable @Override protected GridCacheAtomicWriteOrderMode writeOrderMode() { - return CLOCK; - } - - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 1; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return LOCAL; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java deleted file mode 100644 index abbeb3a..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalAtomicWithStoreSelfTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.GridCacheInterceptor; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorLocalAtomicWithStoreSelfTest extends GridCacheInterceptorLocalAtomicSelfTest { - /** {@inheritDoc} */ - @Override protected boolean storeEnabled() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalSelfTest.java deleted file mode 100644 index 492b344..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalSelfTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorLocalSelfTest extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @SuppressWarnings("RedundantMethodOverride") - @Override protected GridCacheAtomicityMode atomicityMode() { - return TRANSACTIONAL; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return LOCAL; - } - - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 1; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java deleted file mode 100644 index 0d013a0..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorLocalWithStoreSelfTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.GridCacheInterceptor; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorLocalWithStoreSelfTest extends GridCacheInterceptorLocalSelfTest { - /** {@inheritDoc} */ - @Override protected boolean storeEnabled() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java deleted file mode 100644 index 2ec1e72..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorNearEnabledSelfTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorNearEnabledSelfTest extends GridCacheInterceptorSelfTest { - /** {@inheritDoc} */ - @Override protected GridCacheDistributionMode distributionMode() { - return GridCacheDistributionMode.NEAR_PARTITIONED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java deleted file mode 100644 index cf930ec..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedSelfTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorReplicatedSelfTest extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @SuppressWarnings("RedundantMethodOverride") - @Override protected GridCacheAtomicityMode atomicityMode() { - return TRANSACTIONAL; - } - - /** {@inheritDoc} */ - @Override protected GridCacheMode cacheMode() { - return REPLICATED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java deleted file mode 100644 index 9c9aba2..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorReplicatedWithStoreSelfTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.GridCacheInterceptor; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorReplicatedWithStoreSelfTest extends GridCacheInterceptorReplicatedSelfTest { - /** {@inheritDoc} */ - @Override protected boolean storeEnabled() { - return true; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTest.java deleted file mode 100644 index 4f63f90..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorSelfTest extends GridCacheInterceptorAbstractSelfTest { - /** {@inheritDoc} */ - @SuppressWarnings("RedundantMethodOverride") - @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/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTestSuite.java deleted file mode 100644 index eee3e76..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorSelfTestSuite.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import junit.framework.*; - -/** - * Cache interceptor suite. - */ -public class GridCacheInterceptorSelfTestSuite extends TestSuite { - /** - * @return Cache API test suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Gridgain CacheInterceptor Test Suite"); - - suite.addTestSuite(GridCacheInterceptorLocalSelfTest.class); - suite.addTestSuite(GridCacheInterceptorLocalWithStoreSelfTest.class); - - suite.addTestSuite(GridCacheInterceptorLocalAtomicSelfTest.class); - suite.addTestSuite(GridCacheInterceptorLocalAtomicWithStoreSelfTest.class); - - suite.addTestSuite(GridCacheInterceptorAtomicSelfTest.class); - suite.addTestSuite(GridCacheInterceptorAtomicNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheInterceptorAtomicWithStoreSelfTest.class); - suite.addTestSuite(GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.class); - - suite.addTestSuite(GridCacheInterceptorAtomicReplicatedSelfTest.class); - suite.addTestSuite(GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.class); - suite.addTestSuite(GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.class); - - suite.addTestSuite(GridCacheInterceptorSelfTest.class); - suite.addTestSuite(GridCacheInterceptorNearEnabledSelfTest.class); -// suite.addTestSuite(GridCacheInterceptorWithStoreSelfTest.class); TODO GG-9141 - suite.addTestSuite(GridCacheInterceptorReplicatedSelfTest.class); - suite.addTestSuite(GridCacheInterceptorReplicatedWithStoreSelfTest.class); - - return suite; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968c3cf8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java deleted file mode 100644 index 5c3c6b0..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorWithStoreSelfTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.cache.GridCacheInterceptor; - -/** - * Tests {@link GridCacheInterceptor}. - */ -public class GridCacheInterceptorWithStoreSelfTest extends GridCacheInterceptorSelfTest { - /** {@inheritDoc} */ - @Override protected boolean storeEnabled() { - return true; - } -}
